diff --git a/Mozu.Api.Test/Factories/AddressValidationFactory.cs b/Mozu.Api.Test/Factories/AddressValidationFactory.cs
deleted file mode 100644
index 0217a9bd..00000000
--- a/Mozu.Api.Test/Factories/AddressValidationFactory.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.     
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-#region Usings Setup
-
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Net;
-using Mozu.Api;
-using Mozu.Api.Security;
-using Mozu.Api.Test.Helpers;
-using System.Diagnostics;
-using Newtonsoft.Json.Linq;
-
-#endregion
-
-namespace Mozu.Api.Test.Factories
-{
-	/// <summary>
-	/// Use the Address Validation resource to validate addresses associated with a customer account contact.
-	/// </summary>
-	public partial class AddressValidationFactory : BaseDataFactory
-	{
-
-		/// <summary> 
-		/// Validates the customer address supplied in the request.
-		/// <example> 
-		///  <code> 
-		/// var result = AddressValidationFactory.ValidateAddress(handler : handler,  addressValidationRequest :  addressValidationRequest,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<AddressValidationResponse/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.Customer.AddressValidationResponse ValidateAddress(ServiceClientMessageHandler handler, 
- 		 Mozu.Api.Contracts.Customer.AddressValidationRequest addressValidationRequest, string responseFields = null, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Commerce.Customer.AddressValidationRequestClient.ValidateAddressClient(
-				 addressValidationRequest :  addressValidationRequest,  responseFields :  responseFields		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-
-	}
-
-}
-
-
diff --git a/Mozu.Api.Test/Factories/AppAuthTicketFactory.cs b/Mozu.Api.Test/Factories/AppAuthTicketFactory.cs
deleted file mode 100644
index 47bc8e08..00000000
--- a/Mozu.Api.Test/Factories/AppAuthTicketFactory.cs
+++ /dev/null
@@ -1,150 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.     
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-#region Usings Setup
-
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Net;
-using Mozu.Api;
-using Mozu.Api.Security;
-using Mozu.Api.Test.Helpers;
-using System.Diagnostics;
-using Newtonsoft.Json.Linq;
-
-#endregion
-
-namespace Mozu.Api.Test.Factories
-{
-	/// <summary>
-	/// Use the Authetickets for applications resource to manage authentication tickets for your apps.
-	/// </summary>
-	public partial class AppAuthTicketFactory : BaseDataFactory
-	{
-
-		/// <summary> 
-		/// Generate an authentication ticket for an application.
-		/// <example> 
-		///  <code> 
-		/// var result = AppAuthTicketFactory.AuthenticateApp(handler : handler,  appAuthInfo :  appAuthInfo,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<AuthTicket/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.AppDev.AuthTicket AuthenticateApp(ServiceClientMessageHandler handler, 
- 		 Mozu.Api.Contracts.AppDev.AppAuthInfo appAuthInfo, string responseFields = null, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Platform.Applications.AuthTicketClient.AuthenticateAppClient(
-				 appAuthInfo :  appAuthInfo,  responseFields :  responseFields		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-		/// <summary> 
-		/// Refreshes the application's authentication ticket and generates a new access token by providing the refresh token string.
-		/// <example> 
-		///  <code> 
-		/// var result = AppAuthTicketFactory.RefreshAppAuthTicket(handler : handler,  authTicketRequest :  authTicketRequest,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<AuthTicket/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.AppDev.AuthTicket RefreshAppAuthTicket(ServiceClientMessageHandler handler, 
- 		 Mozu.Api.Contracts.AppDev.AuthTicketRequest authTicketRequest, string responseFields = null, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Platform.Applications.AuthTicketClient.RefreshAppAuthTicketClient(
-				 authTicketRequest :  authTicketRequest,  responseFields :  responseFields		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-		/// <summary> 
-		/// Deletes an authentication for an application based on the specified refresh token.
-		/// <example> 
-		///  <code> 
-		/// var result = AppAuthTicketFactory.DeleteAppAuthTicket(handler : handler,  refreshToken :  refreshToken,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<void/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static void DeleteAppAuthTicket(ServiceClientMessageHandler handler, 
- 		string refreshToken, 
-		 HttpStatusCode expectedCode = HttpStatusCode.NoContent, HttpStatusCode successCode = HttpStatusCode.NoContent)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Platform.Applications.AuthTicketClient.DeleteAppAuthTicketClient(
-				 refreshToken :  refreshToken		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-			}
-			var noResponse = ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-
-	}
-
-}
-
-
diff --git a/Mozu.Api.Test/Factories/AppAuthTicketsFactory.cs b/Mozu.Api.Test/Factories/AppAuthTicketsFactory.cs
deleted file mode 100644
index 40f29d17..00000000
--- a/Mozu.Api.Test/Factories/AppAuthTicketsFactory.cs
+++ /dev/null
@@ -1,150 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.     
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-#region Usings Setup
-
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Net;
-using Mozu.Api;
-using Mozu.Api.Security;
-using Mozu.Api.Test.Helpers;
-using System.Diagnostics;
-using Newtonsoft.Json.Linq;
-
-#endregion
-
-namespace Mozu.Api.Test.Factories
-{
-	/// <summary>
-	/// Use the Authetickets for applications resource to manage authentication tickets for your apps.
-	/// </summary>
-	public partial class AppAuthTicketsFactory : BaseDataFactory
-	{
-
-		/// <summary> 
-		/// Generate an authentication ticket for an application.
-		/// <example> 
-		///  <code> 
-		/// var result = AppAuthTicketsFactory.AuthenticateApp(handler : handler,  appAuthInfo :  appAuthInfo,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<AuthTicket/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.AppDev.AuthTicket AuthenticateApp(ServiceClientMessageHandler handler, 
- 		 Mozu.Api.Contracts.AppDev.AppAuthInfo appAuthInfo, string responseFields = null, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Platform.Applications.AppAuthTicketsClient.AuthenticateAppClient(
-				 appAuthInfo :  appAuthInfo,  responseFields :  responseFields		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-		/// <summary> 
-		/// Refreshes the application's authentication ticket and generates a new access token by providing the refresh token string.
-		/// <example> 
-		///  <code> 
-		/// var result = AppAuthTicketsFactory.RefreshAppAuthTicket(handler : handler,  authTicketRequest :  authTicketRequest,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<AuthTicket/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.AppDev.AuthTicket RefreshAppAuthTicket(ServiceClientMessageHandler handler, 
- 		 Mozu.Api.Contracts.AppDev.AuthTicketRequest authTicketRequest, string responseFields = null, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Platform.Applications.AppAuthTicketsClient.RefreshAppAuthTicketClient(
-				 authTicketRequest :  authTicketRequest,  responseFields :  responseFields		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-		/// <summary> 
-		/// Deletes an authentication for an application based on the specified refresh token.
-		/// <example> 
-		///  <code> 
-		/// var result = AppAuthTicketsFactory.DeleteAppAuthTicket(handler : handler,  refreshToken :  refreshToken,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<void/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static void DeleteAppAuthTicket(ServiceClientMessageHandler handler, 
- 		string refreshToken, 
-		 HttpStatusCode expectedCode = HttpStatusCode.NoContent, HttpStatusCode successCode = HttpStatusCode.NoContent)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Platform.Applications.AppAuthTicketsClient.DeleteAppAuthTicketClient(
-				 refreshToken :  refreshToken		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-			}
-			var noResponse = ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-
-	}
-
-}
-
-
diff --git a/Mozu.Api.Test/Factories/ApplicationVersionFactory.cs b/Mozu.Api.Test/Factories/ApplicationVersionFactory.cs
deleted file mode 100644
index 20859e31..00000000
--- a/Mozu.Api.Test/Factories/ApplicationVersionFactory.cs
+++ /dev/null
@@ -1,529 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.     
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-#region Usings Setup
-
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Net;
-using Mozu.Api;
-using Mozu.Api.Security;
-using Mozu.Api.Test.Helpers;
-using System.Diagnostics;
-
-#endregion
-
-namespace Mozu.Api.Test.Factories
-{
-	/// <summary>
-	/// Use the Applications resource to manage the applications associated with a developer account.
-	/// </summary>
-	public partial class ApplicationVersionFactory : BaseDataFactory
-	{
-
-		/// <summary> 
-		/// Retrieves the list of applications associated with the developer account scoped to the user claim specified in the request.
-		/// <example> 
-		///  <code> 
-		/// var result = ApplicationVersionFactory.GetAllApplications(handler : handler,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<ApplicationCollection/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.AppDev.ApplicationCollection GetAllApplications(ServiceClientMessageHandler handler, 
- 		 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Platform.Developer.ApplicationVersionClient.GetAllApplicationsClient(
-						);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-		/// <summary> 
-		/// Retrieves the details of the application specified in the request. The application specified in the request must be associated with the developer account scoped to the user claim specified in the request header, otherwise the operation returns an error.
-		/// <example> 
-		///  <code> 
-		/// var result = ApplicationVersionFactory.GetApplication(handler : handler,  applicationId :  applicationId,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<Application/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.AppDev.Application GetApplication(ServiceClientMessageHandler handler, 
- 		 int? applicationId = null, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Platform.Developer.ApplicationVersionClient.GetApplicationClient(
-				 applicationId :  applicationId		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-		/// <summary> 
-		/// Retrieves the details of a specific version of an application associated with the developer account scoped to the user claim specified in the request.
-		/// <example> 
-		///  <code> 
-		/// var result = ApplicationVersionFactory.GetApplicationVersion(handler : handler,  applicationVersionId :  applicationVersionId,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<ApplicationVersion/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.AppDev.ApplicationVersion GetApplicationVersion(ServiceClientMessageHandler handler, 
- 		 int applicationVersionId, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Platform.Developer.ApplicationVersionClient.GetApplicationVersionClient(
-				 applicationVersionId :  applicationVersionId		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-		/// <summary> 
-		/// Retrieves a list of the package definitions created for an application version, including all development packages and release packages. The application must be associated with the developer account scoped to the user claim specified in the request.
-		/// <example> 
-		///  <code> 
-		/// var result = ApplicationVersionFactory.GetPackages(handler : handler,  applicationVersionId :  applicationVersionId,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<PackageCollection/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.AppDev.PackageCollection GetPackages(ServiceClientMessageHandler handler, 
- 		 int applicationVersionId, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Platform.Developer.ApplicationVersionClient.GetPackagesClient(
-				 applicationVersionId :  applicationVersionId		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-		/// <summary> 
-		/// Retrieves the details of a package definition associated with an application version. The application ust be associated with the developer account scoped to the user claim specified in the request. 
-		/// <example> 
-		///  <code> 
-		/// var result = ApplicationVersionFactory.GetPackage(handler : handler,  applicationVersionId :  applicationVersionId,  packageId :  packageId,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<Package/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.AppDev.Package GetPackage(ServiceClientMessageHandler handler, 
- 		 int applicationVersionId, int packageId, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Platform.Developer.ApplicationVersionClient.GetPackageClient(
-				 applicationVersionId :  applicationVersionId,  packageId :  packageId		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-		/// <summary> 
-		/// Retrieves the metadata for items in a package associated with an application version, including a list of all files and subfolders. The application must be associated with the developer account acoped to the user claim specified in the request.
-		/// <example> 
-		///  <code> 
-		/// var result = ApplicationVersionFactory.GetPackageItemsMetadata(handler : handler,  applicationVersionId :  applicationVersionId,  packageId :  packageId,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<FolderMetadata/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.AppDev.FolderMetadata GetPackageItemsMetadata(ServiceClientMessageHandler handler, 
- 		 int applicationVersionId, int packageId, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Platform.Developer.ApplicationVersionClient.GetPackageItemsMetadataClient(
-				 applicationVersionId :  applicationVersionId,  packageId :  packageId		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-		/// <summary> 
-		/// Retrieves the metadata of a file in a package for an application version. The application must be associated with the developer account scoped to the user claim specified in the request.
-		/// <example> 
-		///  <code> 
-		/// var result = ApplicationVersionFactory.GetPackageItemMetadata(handler : handler,  applicationVersionId :  applicationVersionId,  packageId :  packageId,  itempath :  itempath,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<FileMetadata/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.AppDev.FileMetadata GetPackageItemMetadata(ServiceClientMessageHandler handler, 
- 		 int applicationVersionId, int packageId, string itempath, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Platform.Developer.ApplicationVersionClient.GetPackageItemMetadataClient(
-				 applicationVersionId :  applicationVersionId,  packageId :  packageId,  itempath :  itempath		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-		/// <summary> 
-		/// 
-		/// <example> 
-		///  <code> 
-		/// var result = ApplicationVersionFactory.GetPackageFilesZip(handler : handler,  applicationVersionId :  applicationVersionId,  packageId :  packageId,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<Stream/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static System.IO.Stream GetPackageFilesZip(ServiceClientMessageHandler handler, 
- 		 int applicationVersionId, int packageId, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Platform.Developer.ApplicationVersionClient.GetPackageFilesZipClient(
-				 applicationVersionId :  applicationVersionId,  packageId :  packageId		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-		/// <summary> 
-		/// Creates a new development or release package for the application version specified in the request.
-		/// <example> 
-		///  <code> 
-		/// var result = ApplicationVersionFactory.AddPackage(handler : handler,  pkg :  pkg,  applicationVersionId :  applicationVersionId,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<Package/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.AppDev.Package AddPackage(ServiceClientMessageHandler handler, 
- 		 Mozu.Api.Contracts.AppDev.Package pkg, int applicationVersionId, 
-		 HttpStatusCode expectedCode = HttpStatusCode.Created, HttpStatusCode successCode = HttpStatusCode.Created)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Platform.Developer.ApplicationVersionClient.AddPackageClient(
-				 pkg :  pkg,  applicationVersionId :  applicationVersionId		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-		/// <summary> 
-		/// 
-		/// <example> 
-		///  <code> 
-		/// var result = ApplicationVersionFactory.ChangePackageFileNameOrPath(handler : handler,  renameInfo :  renameInfo,  applicationVersionId :  applicationVersionId,  packageId :  packageId,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<FileMetadata/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.AppDev.FileMetadata ChangePackageFileNameOrPath(ServiceClientMessageHandler handler, 
- 		 Mozu.Api.Contracts.AppDev.RenameInfo renameInfo, int applicationVersionId, int packageId, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Platform.Developer.ApplicationVersionClient.ChangePackageFileNameOrPathClient(
-				 renameInfo :  renameInfo,  applicationVersionId :  applicationVersionId,  packageId :  packageId		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-		/// <summary> 
-		/// Uploads a file to a defined package for an application version in the file location specified in the request.
-		/// <example> 
-		///  <code> 
-		/// var result = ApplicationVersionFactory.AddPackageFile(handler : handler,  stream :  stream,  applicationVersionId :  applicationVersionId,  packageId :  packageId,  filepath :  filepath,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<FileMetadata/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.AppDev.FileMetadata AddPackageFile(ServiceClientMessageHandler handler, 
- 		 System.IO.Stream stream, int applicationVersionId, int packageId, string filepath, 
-		 HttpStatusCode expectedCode = HttpStatusCode.Created, HttpStatusCode successCode = HttpStatusCode.Created)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Platform.Developer.ApplicationVersionClient.AddPackageFileClient(
-				 stream :  stream,  applicationVersionId :  applicationVersionId,  packageId :  packageId,  filepath :  filepath		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-		/// <summary> 
-		/// Updates one or more properties of a file in a package associated with an application version.
-		/// <example> 
-		///  <code> 
-		/// var result = ApplicationVersionFactory.UpdatePackageFile(handler : handler,  stream :  stream,  applicationVersionId :  applicationVersionId,  packageId :  packageId,  filepath :  filepath,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<FileMetadata/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.AppDev.FileMetadata UpdatePackageFile(ServiceClientMessageHandler handler, 
- 		 System.IO.Stream stream, int applicationVersionId, int packageId, string filepath, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Platform.Developer.ApplicationVersionClient.UpdatePackageFileClient(
-				 stream :  stream,  applicationVersionId :  applicationVersionId,  packageId :  packageId,  filepath :  filepath		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-		/// <summary> 
-		/// Deletes the specified file from a package associated with an application version.
-		/// <example> 
-		///  <code> 
-		/// var result = ApplicationVersionFactory.DeletePackageFile(handler : handler,  applicationVersionId :  applicationVersionId,  packageId :  packageId,  filepath :  filepath,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<void/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static void DeletePackageFile(ServiceClientMessageHandler handler, 
- 		int applicationVersionId, int packageId, string filepath, 
-		 HttpStatusCode expectedCode = HttpStatusCode.NoContent, HttpStatusCode successCode = HttpStatusCode.NoContent)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Platform.Developer.ApplicationVersionClient.DeletePackageFileClient(
-				 applicationVersionId :  applicationVersionId,  packageId :  packageId,  filepath :  filepath		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-			}
-			var noResponse = ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-
-	}
-
-}
-
-
diff --git a/Mozu.Api.Test/Factories/CheckoutSettingFactory.cs b/Mozu.Api.Test/Factories/CheckoutSettingFactory.cs
deleted file mode 100644
index a42f71d2..00000000
--- a/Mozu.Api.Test/Factories/CheckoutSettingFactory.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.     
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-#region Usings Setup
-
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Net;
-using Mozu.Api;
-using Mozu.Api.Security;
-using Mozu.Api.Test.Helpers;
-using System.Diagnostics;
-using Newtonsoft.Json.Linq;
-
-#endregion
-
-namespace Mozu.Api.Test.Factories
-{
-	/// <summary>
-	/// Use the Checkout Settings resource to specify the site-wide settings that define checkout and order processing behavior. This resource includes subresources for payment settings, customer checkout settings, and order processing settings.
-	/// </summary>
-	public partial class CheckoutSettingFactory : BaseDataFactory
-	{
-
-		/// <summary> 
-		/// Retrieves all checkout settings defined for the site including payment settings (payment gateway ID and credentials), shopper checkout settings (login requirement or guest mode and custom attributes), and order processing settings (when payment is authorized and captured plus any custom attributes).
-		/// <example> 
-		///  <code> 
-		/// var result = CheckoutSettingFactory.GetCheckoutSettings(handler : handler,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<CheckoutSettings/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.SiteSettings.Order.CheckoutSettings GetCheckoutSettings(ServiceClientMessageHandler handler, 
- 		 string responseFields = null, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Commerce.Settings.CheckoutSettingsClient.GetCheckoutSettingsClient(
-				 responseFields :  responseFields		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-
-	}
-
-}
-
-
diff --git a/Mozu.Api.Test/Factories/LocationAdminFactory.cs b/Mozu.Api.Test/Factories/Commerce/Admin/LocationAdminFactory.cs
old mode 100644
new mode 100755
similarity index 92%
rename from Mozu.Api.Test/Factories/LocationAdminFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Admin/LocationAdminFactory.cs
index fe8fa974..2702c1f7
--- a/Mozu.Api.Test/Factories/LocationAdminFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Admin/LocationAdminFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Admin
 {
 	/// <summary>
 	/// Use the Locations resource to manage each physical location associated with a tenant. Locations enable tenants to associate a physical address with product inventory, provide a store finder for in-store pickup, or both. Locations that support inventory can use both direct ship and in-store pickup fulfillment types.
@@ -30,7 +31,7 @@ public partial class LocationAdminFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a list of all locations associated with a tenant, according to any filter and sort criteria specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = LocationFactory.GetLocations(handler : handler,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.Location.LocationCollection GetLocations(Servic
 				 startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.Location.LocationCollection GetLocations(Servic
 		}
   
 		/// <summary> 
-		/// Retrieves the details of the location specified in the request by location code.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = LocationFactory.GetLocation(handler : handler,  locationCode :  locationCode,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.Location.Location GetLocation(ServiceClientMess
 				 locationCode :  locationCode,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.Location.Location GetLocation(ServiceClientMess
 		}
   
 		/// <summary> 
-		/// Creates a new physical location for the tenant specified in the request header.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = LocationFactory.AddLocation(handler : handler,  location :  location,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.Location.Location AddLocation(ServiceClientMess
 				 location :  location,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.Location.Location AddLocation(ServiceClientMess
 		}
   
 		/// <summary> 
-		/// Updates one or more details of a the location specified in the request by location code.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = LocationFactory.UpdateLocation(handler : handler,  location :  location,  locationCode :  locationCode,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static Mozu.Api.Contracts.Location.Location UpdateLocation(ServiceClientM
 				 location :  location,  locationCode :  locationCode,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -182,7 +183,7 @@ public static Mozu.Api.Contracts.Location.Location UpdateLocation(ServiceClientM
 		}
   
 		/// <summary> 
-		/// Deletes the location specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = LocationFactory.DeleteLocation(handler : handler,  locationCode :  locationCode,  expectedCode: expectedCode, successCode: successCode); 
@@ -203,7 +204,7 @@ public static void DeleteLocation(ServiceClientMessageHandler handler,
 				 locationCode :  locationCode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/LocationTypeFactory.cs b/Mozu.Api.Test/Factories/Commerce/Admin/LocationTypeFactory.cs
old mode 100644
new mode 100755
similarity index 93%
rename from Mozu.Api.Test/Factories/LocationTypeFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Admin/LocationTypeFactory.cs
index 413b0b38..80b97711
--- a/Mozu.Api.Test/Factories/LocationTypeFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Admin/LocationTypeFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Admin
 {
 	/// <summary>
 	/// Use the Location Types resource to manage the types of locations your tenant maintains, such as warehouses, physical storefronts, and kiosks.
@@ -30,7 +31,7 @@ public partial class LocationTypeFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieve a list of all location types defined for the tenant.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = LocationTypeFactory.GetLocationTypes(handler : handler,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public partial class LocationTypeFactory : BaseDataFactory
 						);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public partial class LocationTypeFactory : BaseDataFactory
 		}
   
 		/// <summary> 
-		/// Retrieves the details of the location type specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = LocationTypeFactory.GetLocationType(handler : handler,  locationTypeCode :  locationTypeCode,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.Location.LocationType GetLocationType(ServiceCl
 				 locationTypeCode :  locationTypeCode,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.Location.LocationType GetLocationType(ServiceCl
 		}
   
 		/// <summary> 
-		/// Creates a new location type based on the information specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = LocationTypeFactory.AddLocationType(handler : handler,  locationType :  locationType,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.Location.LocationType AddLocationType(ServiceCl
 				 locationType :  locationType,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.Location.LocationType AddLocationType(ServiceCl
 		}
   
 		/// <summary> 
-		/// Updates the name of a defined location type.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = LocationTypeFactory.UpdateLocationType(handler : handler,  locationType :  locationType,  locationTypeCode :  locationTypeCode,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static Mozu.Api.Contracts.Location.LocationType UpdateLocationType(Servic
 				 locationType :  locationType,  locationTypeCode :  locationTypeCode,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -182,7 +183,7 @@ public static Mozu.Api.Contracts.Location.LocationType UpdateLocationType(Servic
 		}
   
 		/// <summary> 
-		/// Deletes the location type specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = LocationTypeFactory.DeleteLocationType(handler : handler,  locationTypeCode :  locationTypeCode,  expectedCode: expectedCode, successCode: successCode); 
@@ -203,7 +204,7 @@ public static void DeleteLocationType(ServiceClientMessageHandler handler,
 				 locationTypeCode :  locationTypeCode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/Commerce/Admin/Locations/Attributedefinition/AttributeFactory.cs b/Mozu.Api.Test/Factories/Commerce/Admin/Locations/Attributedefinition/AttributeFactory.cs
new file mode 100755
index 00000000..266be02f
--- /dev/null
+++ b/Mozu.Api.Test/Factories/Commerce/Admin/Locations/Attributedefinition/AttributeFactory.cs
@@ -0,0 +1,228 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+#region Usings Setup
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Net;
+using Mozu.Api;
+using Mozu.Api.Security;
+using Mozu.Api.Test.Helpers;
+using System.Diagnostics;
+using Newtonsoft.Json.Linq;
+using System.Threading;
+
+#endregion
+
+namespace Mozu.Api.Test.Factories.Commerce.Admin.Locations.Attributedefinition
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	public partial class AttributeFactory : BaseDataFactory
+	{
+
+		/// <summary> 
+		/// 
+		/// <example> 
+		///  <code> 
+		/// var result = AttributeFactory.GetAttributes(handler : handler,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<AttributeCollection/>(result); 
+		/// return optionalCasting;
+		///  </code> 
+		/// </example> 
+		/// </summary>
+		public static Mozu.Api.Contracts.Core.Extensible.AttributeCollection GetAttributes(ServiceClientMessageHandler handler, 
+ 		 int? startIndex = null, int? pageSize = null, string sortBy = null, string filter = null, string responseFields = null, 
+		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
+		{
+			SetSdKparameters();
+			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
+			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
+			var apiClient = Mozu.Api.Clients.Commerce.Admin.Locations.Attributedefinition.AttributeClient.GetAttributesClient(
+				 startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields		);
+			try
+			{
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
+			}
+			catch (ApiException ex)
+			{
+				// Custom error handling for test cases can be placed here
+				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
+				if (customException != null)
+					throw customException;
+				return null;
+			}
+			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
+					 ? (apiClient.Result()) 
+					 : null;
+
+		}
+  
+		/// <summary> 
+		/// 
+		/// <example> 
+		///  <code> 
+		/// var result = AttributeFactory.GetAttributeVocabularyValues(handler : handler,  attributeFQN :  attributeFQN,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<List<AttributeVocabularyValue>/>(result); 
+		/// return optionalCasting;
+		///  </code> 
+		/// </example> 
+		/// </summary>
+		public static List<Mozu.Api.Contracts.Core.Extensible.AttributeVocabularyValue> GetAttributeVocabularyValues(ServiceClientMessageHandler handler, 
+ 		 string attributeFQN, 
+		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
+		{
+			SetSdKparameters();
+			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
+			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
+			var apiClient = Mozu.Api.Clients.Commerce.Admin.Locations.Attributedefinition.AttributeClient.GetAttributeVocabularyValuesClient(
+				 attributeFQN :  attributeFQN		);
+			try
+			{
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
+			}
+			catch (ApiException ex)
+			{
+				// Custom error handling for test cases can be placed here
+				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
+				if (customException != null)
+					throw customException;
+				return null;
+			}
+			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
+					 ? (apiClient.Result()) 
+					 : null;
+
+		}
+  
+		/// <summary> 
+		/// 
+		/// <example> 
+		///  <code> 
+		/// var result = AttributeFactory.GetAttribute(handler : handler,  attributeFQN :  attributeFQN,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<Attribute/>(result); 
+		/// return optionalCasting;
+		///  </code> 
+		/// </example> 
+		/// </summary>
+		public static Mozu.Api.Contracts.Core.Extensible.Attribute GetAttribute(ServiceClientMessageHandler handler, 
+ 		 string attributeFQN, string responseFields = null, 
+		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
+		{
+			SetSdKparameters();
+			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
+			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
+			var apiClient = Mozu.Api.Clients.Commerce.Admin.Locations.Attributedefinition.AttributeClient.GetAttributeClient(
+				 attributeFQN :  attributeFQN,  responseFields :  responseFields		);
+			try
+			{
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
+			}
+			catch (ApiException ex)
+			{
+				// Custom error handling for test cases can be placed here
+				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
+				if (customException != null)
+					throw customException;
+				return null;
+			}
+			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
+					 ? (apiClient.Result()) 
+					 : null;
+
+		}
+  
+		/// <summary> 
+		/// 
+		/// <example> 
+		///  <code> 
+		/// var result = AttributeFactory.CreateAttribute(handler : handler,  attribute :  attribute,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<Attribute/>(result); 
+		/// return optionalCasting;
+		///  </code> 
+		/// </example> 
+		/// </summary>
+		public static Mozu.Api.Contracts.Core.Extensible.Attribute CreateAttribute(ServiceClientMessageHandler handler, 
+ 		 Mozu.Api.Contracts.Core.Extensible.Attribute attribute, string responseFields = null, 
+		 HttpStatusCode expectedCode = HttpStatusCode.Created, HttpStatusCode successCode = HttpStatusCode.Created)
+		{
+			SetSdKparameters();
+			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
+			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
+			var apiClient = Mozu.Api.Clients.Commerce.Admin.Locations.Attributedefinition.AttributeClient.CreateAttributeClient(
+				 attribute :  attribute,  responseFields :  responseFields		);
+			try
+			{
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
+			}
+			catch (ApiException ex)
+			{
+				// Custom error handling for test cases can be placed here
+				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
+				if (customException != null)
+					throw customException;
+				return null;
+			}
+			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
+					 ? (apiClient.Result()) 
+					 : null;
+
+		}
+  
+		/// <summary> 
+		/// 
+		/// <example> 
+		///  <code> 
+		/// var result = AttributeFactory.UpdateAttribute(handler : handler,  attribute :  attribute,  attributeFQN :  attributeFQN,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<Attribute/>(result); 
+		/// return optionalCasting;
+		///  </code> 
+		/// </example> 
+		/// </summary>
+		public static Mozu.Api.Contracts.Core.Extensible.Attribute UpdateAttribute(ServiceClientMessageHandler handler, 
+ 		 Mozu.Api.Contracts.Core.Extensible.Attribute attribute, string attributeFQN, string responseFields = null, 
+		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
+		{
+			SetSdKparameters();
+			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
+			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
+			var apiClient = Mozu.Api.Clients.Commerce.Admin.Locations.Attributedefinition.AttributeClient.UpdateAttributeClient(
+				 attribute :  attribute,  attributeFQN :  attributeFQN,  responseFields :  responseFields		);
+			try
+			{
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
+			}
+			catch (ApiException ex)
+			{
+				// Custom error handling for test cases can be placed here
+				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
+				if (customException != null)
+					throw customException;
+				return null;
+			}
+			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
+					 ? (apiClient.Result()) 
+					 : null;
+
+		}
+  
+
+	}
+
+}
+
+
diff --git a/Mozu.Api.Test/Factories/CartFactory.cs b/Mozu.Api.Test/Factories/Commerce/CartFactory.cs
old mode 100644
new mode 100755
similarity index 88%
rename from Mozu.Api.Test/Factories/CartFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/CartFactory.cs
index a8a11a88..0c599de6
--- a/Mozu.Api.Test/Factories/CartFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/CartFactory.cs
@@ -18,19 +18,20 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce
 {
 	/// <summary>
-	/// Use this resource to manage storefront shopping carts as shoppers add and remove items for purchase. Each time a shopper's cart is modified, the Carts resource updates the estimated total with any applicable discounts.
+	/// Use the Carts resource to manage storefront shopping carts as items are added and removed. Each time a shopper's cart is modified, the Carts resource updates the estimated total with any applicable discounts.
 	/// </summary>
 	public partial class CartFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves the cart specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CartFactory.GetCart(handler : handler,  cartId :  cartId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Carts.Cart GetCart(ServiceClien
 				 cartId :  cartId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Carts.Cart GetCart(ServiceClien
 		}
   
 		/// <summary> 
-		/// Retrieves a cart's contents for the current shopper. If the shopper does not have an active cart on the site, the service creates one.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CartFactory.GetOrCreateCart(handler : handler,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Carts.Cart GetOrCreateCart(Serv
 				 responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Carts.Cart GetOrCreateCart(Serv
 		}
   
 		/// <summary> 
-		/// Retrieves summary information associated with the cart of the current shopper, including the number of items, the current total, and whether the cart has expired. All anonymous idle carts that do not proceed to checkout expire after 14 days.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CartFactory.GetCartSummary(handler : handler,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Carts.CartSummary GetCartSummar
 				 responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Carts.CartSummary GetCartSummar
 		}
   
 		/// <summary> 
-		/// Retrieves summary information associated with the cart of user specified in the request, including the number of items in the cart, the current total, and whether the cart has expired. All anonymous idle carts that do not proceed to checkout expire after 14 days.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CartFactory.GetUserCartSummary(handler : handler,  userId :  userId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Carts.CartSummary GetUserCartSu
 				 userId :  userId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -182,7 +183,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Carts.CartSummary GetUserCartSu
 		}
   
 		/// <summary> 
-		/// Retrieves the cart of the user specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CartFactory.GetUserCart(handler : handler,  userId :  userId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -203,7 +204,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Carts.Cart GetUserCart(ServiceC
 				 userId :  userId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -220,7 +221,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Carts.Cart GetUserCart(ServiceC
 		}
   
 		/// <summary> 
-		/// Update the current shopper's cart.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CartFactory.UpdateCart(handler : handler,  cart :  cart,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -241,7 +242,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Carts.Cart UpdateCart(ServiceCl
 				 cart :  cart,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -258,7 +259,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Carts.Cart UpdateCart(ServiceCl
 		}
   
 		/// <summary> 
-		/// Deletes the cart specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CartFactory.DeleteCart(handler : handler,  cartId :  cartId,  expectedCode: expectedCode, successCode: successCode); 
@@ -279,7 +280,7 @@ public static void DeleteCart(ServiceClientMessageHandler handler,
 				 cartId :  cartId		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -295,7 +296,7 @@ public static void DeleteCart(ServiceClientMessageHandler handler,
 		}
   
 		/// <summary> 
-		/// Deletes the cart of the currently active shopper.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CartFactory.DeleteCurrentCart(handler : handler,  expectedCode: expectedCode, successCode: successCode); 
@@ -316,7 +317,7 @@ public static void DeleteCurrentCart(ServiceClientMessageHandler handler,
 						);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/AppliedDiscountCartsFactory.cs b/Mozu.Api.Test/Factories/Commerce/Carts/AppliedDiscountCartsFactory.cs
old mode 100644
new mode 100755
similarity index 89%
rename from Mozu.Api.Test/Factories/AppliedDiscountCartsFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Carts/AppliedDiscountCartsFactory.cs
index 17b84c96..0c07f1c1
--- a/Mozu.Api.Test/Factories/AppliedDiscountCartsFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Carts/AppliedDiscountCartsFactory.cs
@@ -18,19 +18,20 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Carts
 {
 	/// <summary>
-	/// Use the Cart Coupons subresource to apply a coupon to a defined cart or remove a coupon from a cart. When the shopper proceeds to checkout, the coupons applied to the cart apply to the order.
+	/// Use the Cart Coupons resource to apply a coupon to a defined cart or remove a coupon from a cart. When the shopper proceeds to checkout, the coupons applied to the cart apply to the order.
 	/// </summary>
 	public partial class AppliedDiscountCartsFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Applies a defined coupon to the cart specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = AppliedDiscountFactory.ApplyCoupon(handler : handler,  cartId :  cartId,  couponCode :  couponCode,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Carts.Cart ApplyCoupon(ServiceC
 				 cartId :  cartId,  couponCode :  couponCode,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Carts.Cart ApplyCoupon(ServiceC
 		}
   
 		/// <summary> 
-		/// Removes all coupons from the cart specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = AppliedDiscountFactory.RemoveCoupons(handler : handler,  cartId :  cartId,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Carts.Cart RemoveCoupons(Servic
 				 cartId :  cartId		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Carts.Cart RemoveCoupons(Servic
 		}
   
 		/// <summary> 
-		/// Removes an applied coupon from the cart specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = AppliedDiscountFactory.RemoveCoupon(handler : handler,  cartId :  cartId,  couponCode :  couponCode,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Carts.Cart RemoveCoupon(Service
 				 cartId :  cartId,  couponCode :  couponCode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/CartItemFactory.cs b/Mozu.Api.Test/Factories/Commerce/Carts/CartItemFactory.cs
old mode 100644
new mode 100755
similarity index 92%
rename from Mozu.Api.Test/Factories/CartItemFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Carts/CartItemFactory.cs
index 498adce8..950178c0
--- a/Mozu.Api.Test/Factories/CartItemFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Carts/CartItemFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Carts
 {
 	/// <summary>
 	/// Use the Cart Items subresource to manage a collection of items in an active shopping cart.
@@ -30,7 +31,7 @@ public partial class CartItemFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a particular cart item by providing the cart item ID.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CartItemFactory.GetCartItem(handler : handler,  cartItemId :  cartItemId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Carts.CartItem GetCartItem(Serv
 				 cartItemId :  cartItemId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Carts.CartItem GetCartItem(Serv
 		}
   
 		/// <summary> 
-		/// Retrieves a list of cart items including the total number of items in the cart.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CartItemFactory.GetCartItems(handler : handler,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Carts.CartItemCollection GetCar
 				 responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Carts.CartItemCollection GetCar
 		}
   
 		/// <summary> 
-		/// Adds a product to the current shopper's cart.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CartItemFactory.AddItemToCart(handler : handler,  cartItem :  cartItem,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Carts.CartItem AddItemToCart(Se
 				 cartItem :  cartItem,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Carts.CartItem AddItemToCart(Se
 		}
   
 		/// <summary> 
-		/// Update the quantity of an individual cart item in the cart of the current shopper.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CartItemFactory.UpdateCartItemQuantity(handler : handler,  cartItemId :  cartItemId,  quantity :  quantity,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Carts.CartItem UpdateCartItemQu
 				 cartItemId :  cartItemId,  quantity :  quantity,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -182,7 +183,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Carts.CartItem UpdateCartItemQu
 		}
   
 		/// <summary> 
-		/// Update the product or product quantity of an item in the current shopper's cart.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CartItemFactory.UpdateCartItem(handler : handler,  cartItem :  cartItem,  cartItemId :  cartItemId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -203,7 +204,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Carts.CartItem UpdateCartItem(S
 				 cartItem :  cartItem,  cartItemId :  cartItemId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -220,7 +221,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Carts.CartItem UpdateCartItem(S
 		}
   
 		/// <summary> 
-		/// Removes all items in the current shopper's active cart.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CartItemFactory.RemoveAllCartItems(handler : handler,  expectedCode: expectedCode, successCode: successCode); 
@@ -241,7 +242,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Carts.Cart RemoveAllCartItems(S
 						);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -258,7 +259,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Carts.Cart RemoveAllCartItems(S
 		}
   
 		/// <summary> 
-		/// Deletes a specific cart item by providing the cart item ID.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CartItemFactory.DeleteCartItem(handler : handler,  cartItemId :  cartItemId,  expectedCode: expectedCode, successCode: successCode); 
@@ -279,7 +280,7 @@ public static void DeleteCartItem(ServiceClientMessageHandler handler,
 				 cartItemId :  cartItemId		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/ChangeMessageFactory.cs b/Mozu.Api.Test/Factories/Commerce/Carts/ChangeMessageFactory.cs
old mode 100644
new mode 100755
similarity index 92%
rename from Mozu.Api.Test/Factories/ChangeMessageFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Carts/ChangeMessageFactory.cs
index 19031a11..b7844a97
--- a/Mozu.Api.Test/Factories/ChangeMessageFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Carts/ChangeMessageFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Carts
 {
 	/// <summary>
 	/// Use the Cart Messages resource to retrieve messages for live carts that the system logs when a product's price or inventory level changes.
@@ -30,7 +31,7 @@ public partial class ChangeMessageFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves the messages associated with the current shopper's cart.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ChangeMessageFactory.GetMessages(handler : handler,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Carts.CartChangeMessageCollecti
 				 responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Carts.CartChangeMessageCollecti
 		}
   
 		/// <summary> 
-		/// Deletes all messages associated with the cart of the current shopper.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ChangeMessageFactory.RemoveAllMessages(handler : handler,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static void RemoveAllMessages(ServiceClientMessageHandler handler,
 						);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -105,7 +106,7 @@ public static void RemoveAllMessages(ServiceClientMessageHandler handler,
 		}
   
 		/// <summary> 
-		/// Removes a single message associated with the cart of the current shopper.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ChangeMessageFactory.RemoveMessage(handler : handler,  messageId :  messageId,  expectedCode: expectedCode, successCode: successCode); 
@@ -126,7 +127,7 @@ public static void RemoveMessage(ServiceClientMessageHandler handler,
 				 messageId :  messageId		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/ExtendedPropertyFactory.cs b/Mozu.Api.Test/Factories/Commerce/Carts/ExtendedPropertyFactory.cs
old mode 100644
new mode 100755
similarity index 87%
rename from Mozu.Api.Test/Factories/ExtendedPropertyFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Carts/ExtendedPropertyFactory.cs
index 6208fd10..359356f9
--- a/Mozu.Api.Test/Factories/ExtendedPropertyFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Carts/ExtendedPropertyFactory.cs
@@ -18,19 +18,20 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Carts
 {
 	/// <summary>
-	/// Use the Cart Extended Properties subresource to store an arbitrary number of cart extended properties such as tracking strings, marketing sources, affiliates, sales personnel/data, and so on, on a per cart basis. Each cart may have none, one, or more than one entry in the extended properties collection, and all values in the extended properties collection are represented as strings. When you create an order from a cart, all extended properties are retained from the cart and copied to the order. Refer to the subresource for more information about order extended properties.
+	/// 
 	/// </summary>
 	public partial class ExtendedPropertyFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a list of cart extended properties specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ExtendedPropertyFactory.GetExtendedProperties(handler : handler,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public partial class ExtendedPropertyFactory : BaseDataFactory
 						);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public partial class ExtendedPropertyFactory : BaseDataFactory
 		}
   
 		/// <summary> 
-		/// Adds one or more specified extended properties to the carts extended properties collection.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ExtendedPropertyFactory.AddExtendedProperties(handler : handler,  extendedProperties :  extendedProperties,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public partial class ExtendedPropertyFactory : BaseDataFactory
 				 extendedProperties :  extendedProperties		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public partial class ExtendedPropertyFactory : BaseDataFactory
 		}
   
 		/// <summary> 
-		/// Updates one or more details of the extended property specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ExtendedPropertyFactory.UpdateExtendedProperty(handler : handler,  extendedProperty :  extendedProperty,  key :  key,  upsert :  upsert,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty Updat
 				 extendedProperty :  extendedProperty,  key :  key,  upsert :  upsert,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty Updat
 		}
   
 		/// <summary> 
-		/// Updates one or more details of the extended properties specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ExtendedPropertyFactory.UpdateExtendedProperties(handler : handler,  extendedProperties :  extendedProperties,  upsert :  upsert,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty Updat
 				 extendedProperties :  extendedProperties,  upsert :  upsert		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -182,7 +183,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty Updat
 		}
   
 		/// <summary> 
-		/// Deletes the extended properties cart extended properties collection.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ExtendedPropertyFactory.DeleteExtendedProperties(handler : handler,  keys :  keys,  expectedCode: expectedCode, successCode: successCode); 
@@ -203,7 +204,7 @@ public static void DeleteExtendedProperties(ServiceClientMessageHandler handler,
 				 keys :  keys		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -219,7 +220,7 @@ public static void DeleteExtendedProperties(ServiceClientMessageHandler handler,
 		}
   
 		/// <summary> 
-		/// Deletes a specific extended property from the cart extended property collection.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ExtendedPropertyFactory.DeleteExtendedProperty(handler : handler,  key :  key,  expectedCode: expectedCode, successCode: successCode); 
@@ -240,7 +241,7 @@ public static void DeleteExtendedProperty(ServiceClientMessageHandler handler,
 				 key :  key		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/AttributeFactory.cs b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/Attributedefinition/AttributeFactory.cs
old mode 100644
new mode 100755
similarity index 86%
rename from Mozu.Api.Test/Factories/AttributeFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Catalog/Admin/Attributedefinition/AttributeFactory.cs
index 627ba760..2e14e87b
--- a/Mozu.Api.Test/Factories/AttributeFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/Attributedefinition/AttributeFactory.cs
@@ -18,21 +18,20 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Catalog.Admin.Attributedefinition
 {
 	/// <summary>
-	/// Attributes are used to add custom definitions and characteristics to the following objects:
-
-
+	/// Use the Attribute Definition resource to manage the properties, options, and extras that uniquely describe products of a specific type. Attributes can be associated with a product type, assigned values by a client or shopper, and added as faceted search filters for a product category. Options are product attributes that describe unique configurations made by the shopper, such as size or color, and generate a new product variation (or unique SKU). Properties are product attributes that describe aspects of the product that do not represent an option configurable by the shopper, such as screen resolution or brand. Extras are product attributes that describe add-on configurations made by the shopper that do not represent a product variation, such as a monogram.
 	/// </summary>
 	public partial class AttributeFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a paged list of attributes according to any specified filter criteria and sort options.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = AttributeFactory.GetAttributes(handler : handler,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -53,7 +52,7 @@ public static Mozu.Api.Contracts.ProductAdmin.AttributeCollection GetAttributes(
 				 startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -70,7 +69,7 @@ public static Mozu.Api.Contracts.ProductAdmin.AttributeCollection GetAttributes(
 		}
   
 		/// <summary> 
-		/// Retrieves the details of the specified product attribute.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = AttributeFactory.GetAttribute(handler : handler,  attributeFQN :  attributeFQN,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -91,7 +90,7 @@ public static Mozu.Api.Contracts.ProductAdmin.Attribute GetAttribute(ServiceClie
 				 attributeFQN :  attributeFQN,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -108,7 +107,7 @@ public static Mozu.Api.Contracts.ProductAdmin.Attribute GetAttribute(ServiceClie
 		}
   
 		/// <summary> 
-		/// Creates a new attribute to describe one aspect of a product such as color or size, based on its defined product type. The attribute name, attribute type, input type, and data type are required.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = AttributeFactory.AddAttribute(handler : handler,  attribute :  attribute,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -129,7 +128,7 @@ public static Mozu.Api.Contracts.ProductAdmin.Attribute AddAttribute(ServiceClie
 				 attribute :  attribute,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -146,7 +145,7 @@ public static Mozu.Api.Contracts.ProductAdmin.Attribute AddAttribute(ServiceClie
 		}
   
 		/// <summary> 
-		/// Updates an existing attribute with attribute properties to set.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = AttributeFactory.UpdateAttribute(handler : handler,  attribute :  attribute,  attributeFQN :  attributeFQN,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -167,7 +166,7 @@ public static Mozu.Api.Contracts.ProductAdmin.Attribute UpdateAttribute(ServiceC
 				 attribute :  attribute,  attributeFQN :  attributeFQN,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -184,7 +183,7 @@ public static Mozu.Api.Contracts.ProductAdmin.Attribute UpdateAttribute(ServiceC
 		}
   
 		/// <summary> 
-		/// Deletes a defined product attribute. You cannot delete an attribute assigned a value for a product.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = AttributeFactory.DeleteAttribute(handler : handler,  attributeFQN :  attributeFQN,  expectedCode: expectedCode, successCode: successCode); 
@@ -205,7 +204,7 @@ public static void DeleteAttribute(ServiceClientMessageHandler handler,
 				 attributeFQN :  attributeFQN		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/AttributeLocalizedContentFactory.cs b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/Attributedefinition/Attributes/AttributeLocalizedContentFactory.cs
old mode 100644
new mode 100755
similarity index 90%
rename from Mozu.Api.Test/Factories/AttributeLocalizedContentFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Catalog/Admin/Attributedefinition/Attributes/AttributeLocalizedContentFactory.cs
index 02671aa9..e7c52f73
--- a/Mozu.Api.Test/Factories/AttributeLocalizedContentFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/Attributedefinition/Attributes/AttributeLocalizedContentFactory.cs
@@ -18,19 +18,20 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Catalog.Admin.Attributedefinition.Attributes
 {
 	/// <summary>
-	/// Properties of localized content for attributes, based on a `localeCode` at a site/tenant level. This content supports translated text for product, product options, and additional objects. 
+	/// 
 	/// </summary>
 	public partial class AttributeLocalizedContentFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a collection of localized content for attributes based on a `localeCode`.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = AttributeLocalizedContentFactory.GetAttributeLocalizedContents(handler : handler,  attributeFQN :  attributeFQN,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public partial class AttributeLocalizedContentFactory : BaseDataFactory
 				 attributeFQN :  attributeFQN		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public partial class AttributeLocalizedContentFactory : BaseDataFactory
 		}
   
 		/// <summary> 
-		/// Retrieves the localized content for an attribute based on a `localeCode`.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = AttributeLocalizedContentFactory.GetAttributeLocalizedContent(handler : handler,  attributeFQN :  attributeFQN,  localeCode :  localeCode,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent GetAttri
 				 attributeFQN :  attributeFQN,  localeCode :  localeCode,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent GetAttri
 		}
   
 		/// <summary> 
-		/// Adds new localized content for an attribute based on a `localeCode`.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = AttributeLocalizedContentFactory.AddLocalizedContent(handler : handler,  localizedContent :  localizedContent,  attributeFQN :  attributeFQN,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent AddLocal
 				 localizedContent :  localizedContent,  attributeFQN :  attributeFQN,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent AddLocal
 		}
   
 		/// <summary> 
-		/// Updates the localized content for a collection of existing attributes based on a `localeCode`.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = AttributeLocalizedContentFactory.UpdateLocalizedContents(handler : handler,  localizedContent :  localizedContent,  attributeFQN :  attributeFQN,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent AddLocal
 				 localizedContent :  localizedContent,  attributeFQN :  attributeFQN		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -182,7 +183,7 @@ public static Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent AddLocal
 		}
   
 		/// <summary> 
-		/// Updates the localized content for an existing attribute based on a `localeCode`.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = AttributeLocalizedContentFactory.UpdateLocalizedContent(handler : handler,  localizedContent :  localizedContent,  attributeFQN :  attributeFQN,  localeCode :  localeCode,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -203,7 +204,7 @@ public static Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent UpdateLo
 				 localizedContent :  localizedContent,  attributeFQN :  attributeFQN,  localeCode :  localeCode,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -220,7 +221,7 @@ public static Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent UpdateLo
 		}
   
 		/// <summary> 
-		/// Removes all localized content. Localized content is translated text information and data based on a `localeCode`. 
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = AttributeLocalizedContentFactory.DeleteLocalizedContent(handler : handler,  attributeFQN :  attributeFQN,  localeCode :  localeCode,  expectedCode: expectedCode, successCode: successCode); 
@@ -241,7 +242,7 @@ public static void DeleteLocalizedContent(ServiceClientMessageHandler handler,
 				 attributeFQN :  attributeFQN,  localeCode :  localeCode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/AttributeTypeRuleFactory.cs b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/Attributedefinition/Attributes/AttributeTypeRuleFactory.cs
old mode 100644
new mode 100755
similarity index 91%
rename from Mozu.Api.Test/Factories/AttributeTypeRuleFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Catalog/Admin/Attributedefinition/Attributes/AttributeTypeRuleFactory.cs
index 8e6796f2..ab15ea8d
--- a/Mozu.Api.Test/Factories/AttributeTypeRuleFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/Attributedefinition/Attributes/AttributeTypeRuleFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Catalog.Admin.Attributedefinition.Attributes
 {
 	/// <summary>
 	/// Type rules are subresources of product attributes which could be specifications that can be shared across products in a store or assigned to specific products. Attribute type rules provide definitions of how attribute types will appear on the user interface.
@@ -30,7 +31,7 @@ public partial class AttributeTypeRuleFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a list of attribute type rules according to optional filter criteria and sort options. Attribute type rules help drive the behavior of attributes on a storefront page.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = AttributeTypeRuleFactory.GetAttributeTypeRules(handler : handler,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.ProductAdmin.AttributeTypeRuleCollection GetAtt
 				 startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/AttributeVocabularyValueFactory.cs b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/Attributedefinition/Attributes/AttributeVocabularyValueFactory.cs
old mode 100644
new mode 100755
similarity index 92%
rename from Mozu.Api.Test/Factories/AttributeVocabularyValueFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Catalog/Admin/Attributedefinition/Attributes/AttributeVocabularyValueFactory.cs
index 0762852e..6c7d1fba
--- a/Mozu.Api.Test/Factories/AttributeVocabularyValueFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/Attributedefinition/Attributes/AttributeVocabularyValueFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Catalog.Admin.Attributedefinition.Attributes
 {
 	/// <summary>
 	/// Vocabulary values are predefined for an attribute.
@@ -30,7 +31,7 @@ public partial class AttributeVocabularyValueFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a list of vocabulary values defined for the attribute specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = AttributeVocabularyValueFactory.GetAttributeVocabularyValues(handler : handler,  attributeFQN :  attributeFQN,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public partial class AttributeVocabularyValueFactory : BaseDataFactory
 				 attributeFQN :  attributeFQN		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public partial class AttributeVocabularyValueFactory : BaseDataFactory
 		}
   
 		/// <summary> 
-		/// Retrieves a collection of localized content for vocabulary value attributes based on a `localeCode`. 
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = AttributeVocabularyValueFactory.GetAttributeVocabularyValueLocalizedContents(handler : handler,  attributeFQN :  attributeFQN,  value :  value,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public partial class AttributeVocabularyValueFactory : BaseDataFactory
 				 attributeFQN :  attributeFQN,  value :  value		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public partial class AttributeVocabularyValueFactory : BaseDataFactory
 		}
   
 		/// <summary> 
-		/// Retrieves the localized content for a vocabulary value attribute based on a `localeCode`. 
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = AttributeVocabularyValueFactory.GetAttributeVocabularyValueLocalizedContent(handler : handler,  attributeFQN :  attributeFQN,  value :  value,  localeCode :  localeCode,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValueLocalizedC
 				 attributeFQN :  attributeFQN,  value :  value,  localeCode :  localeCode,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValueLocalizedC
 		}
   
 		/// <summary> 
-		/// Retrieves the details of a vocabulary value defined for an attribute by providing the attribute's fully qualified name and the value to retrieve.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = AttributeVocabularyValueFactory.GetAttributeVocabularyValue(handler : handler,  attributeFQN :  attributeFQN,  value :  value,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue GetAttrib
 				 attributeFQN :  attributeFQN,  value :  value,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -182,7 +183,7 @@ public static Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue GetAttrib
 		}
   
 		/// <summary> 
-		/// Creates and saves localized vocabulary value content for an attribute, based on the `localeCode`.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = AttributeVocabularyValueFactory.AddAttributeVocabularyValueLocalizedContent(handler : handler,  localizedContent :  localizedContent,  attributeFQN :  attributeFQN,  value :  value,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -203,7 +204,7 @@ public static Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValueLocalizedC
 				 localizedContent :  localizedContent,  attributeFQN :  attributeFQN,  value :  value,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -220,7 +221,7 @@ public static Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValueLocalizedC
 		}
   
 		/// <summary> 
-		/// Creates a vocabulary value for a defined product attribute.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = AttributeVocabularyValueFactory.AddAttributeVocabularyValue(handler : handler,  attributeVocabularyValue :  attributeVocabularyValue,  attributeFQN :  attributeFQN,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -241,7 +242,7 @@ public static Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue AddAttrib
 				 attributeVocabularyValue :  attributeVocabularyValue,  attributeFQN :  attributeFQN,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -258,7 +259,7 @@ public static Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue AddAttrib
 		}
   
 		/// <summary> 
-		/// Update existing vocabulary values for an attribute.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = AttributeVocabularyValueFactory.UpdateAttributeVocabularyValues(handler : handler,  vocabularyValues :  vocabularyValues,  attributeFQN :  attributeFQN,  expectedCode: expectedCode, successCode: successCode); 
@@ -279,7 +280,7 @@ public static Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue AddAttrib
 				 vocabularyValues :  vocabularyValues,  attributeFQN :  attributeFQN		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -296,7 +297,7 @@ public static Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue AddAttrib
 		}
   
 		/// <summary> 
-		/// Updates a collection of localized vocabulary value content for existing attributes, based on the `localeCode`.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = AttributeVocabularyValueFactory.UpdateAttributeVocabularyValueLocalizedContents(handler : handler,  localizedContent :  localizedContent,  attributeFQN :  attributeFQN,  value :  value,  expectedCode: expectedCode, successCode: successCode); 
@@ -317,7 +318,7 @@ public static Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue AddAttrib
 				 localizedContent :  localizedContent,  attributeFQN :  attributeFQN,  value :  value		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -334,7 +335,7 @@ public static Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue AddAttrib
 		}
   
 		/// <summary> 
-		/// Updates localized vocabulary value content for an existing attribute, based on the `localeCode`.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = AttributeVocabularyValueFactory.UpdateAttributeVocabularyValueLocalizedContent(handler : handler,  localizedContent :  localizedContent,  attributeFQN :  attributeFQN,  value :  value,  localeCode :  localeCode,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -355,7 +356,7 @@ public static Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValueLocalizedC
 				 localizedContent :  localizedContent,  attributeFQN :  attributeFQN,  value :  value,  localeCode :  localeCode,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -372,7 +373,7 @@ public static Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValueLocalizedC
 		}
   
 		/// <summary> 
-		/// Updates existing attribute vocabulary values.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = AttributeVocabularyValueFactory.UpdateAttributeVocabularyValue(handler : handler,  attributeVocabularyValue :  attributeVocabularyValue,  attributeFQN :  attributeFQN,  value :  value,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -393,7 +394,7 @@ public static Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue UpdateAtt
 				 attributeVocabularyValue :  attributeVocabularyValue,  attributeFQN :  attributeFQN,  value :  value,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -410,7 +411,7 @@ public static Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue UpdateAtt
 		}
   
 		/// <summary> 
-		/// Deletes an attribute's vocabulary value.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = AttributeVocabularyValueFactory.DeleteAttributeVocabularyValue(handler : handler,  attributeFQN :  attributeFQN,  value :  value,  expectedCode: expectedCode, successCode: successCode); 
@@ -431,7 +432,7 @@ public static void DeleteAttributeVocabularyValue(ServiceClientMessageHandler ha
 				 attributeFQN :  attributeFQN,  value :  value		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -447,7 +448,7 @@ public static void DeleteAttributeVocabularyValue(ServiceClientMessageHandler ha
 		}
   
 		/// <summary> 
-		/// Removes localized content for a vocabulary value attribute. 
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = AttributeVocabularyValueFactory.DeleteAttributeVocabularyValueLocalizedContent(handler : handler,  attributeFQN :  attributeFQN,  value :  value,  localeCode :  localeCode,  expectedCode: expectedCode, successCode: successCode); 
@@ -468,7 +469,7 @@ public static void DeleteAttributeVocabularyValueLocalizedContent(ServiceClientM
 				 attributeFQN :  attributeFQN,  value :  value,  localeCode :  localeCode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/ProductTypeFactory.cs b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/Attributedefinition/ProductTypeFactory.cs
old mode 100644
new mode 100755
similarity index 93%
rename from Mozu.Api.Test/Factories/ProductTypeFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Catalog/Admin/Attributedefinition/ProductTypeFactory.cs
index 8ff4725a..27459d1c
--- a/Mozu.Api.Test/Factories/ProductTypeFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/Attributedefinition/ProductTypeFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Catalog.Admin.Attributedefinition
 {
 	/// <summary>
 	/// Use the Product Types resource to manage the types for your product catalog. Product types act as configuration templates, which store a set of attributes common to all products associated with that type. Unlike categories, products can only be associated with a single product type.
@@ -30,7 +31,7 @@ public partial class ProductTypeFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a list of product types according to any specified filter criteria and sort options.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductTypeFactory.GetProductTypes(handler : handler,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductTypeCollection GetProductTy
 				 startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductTypeCollection GetProductTy
 		}
   
 		/// <summary> 
-		/// Retrieves the details of the product type specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductTypeFactory.GetProductType(handler : handler,  productTypeId :  productTypeId,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductType GetProductType(Service
 				 productTypeId :  productTypeId,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductType GetProductType(Service
 		}
   
 		/// <summary> 
-		/// Creates a new product type based on the information supplied in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductTypeFactory.AddProductType(handler : handler,  productType :  productType,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductType AddProductType(Service
 				 productType :  productType,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductType AddProductType(Service
 		}
   
 		/// <summary> 
-		/// Updates one or more properties of a product type.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductTypeFactory.UpdateProductType(handler : handler,  productType :  productType,  productTypeId :  productTypeId,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductType UpdateProductType(Serv
 				 productType :  productType,  productTypeId :  productTypeId,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -182,7 +183,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductType UpdateProductType(Serv
 		}
   
 		/// <summary> 
-		/// Deletes the product type by providing the product type ID.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductTypeFactory.DeleteProductType(handler : handler,  productTypeId :  productTypeId,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -203,7 +204,7 @@ public static void DeleteProductType(ServiceClientMessageHandler handler,
 				 productTypeId :  productTypeId, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/ProductTypeExtraFactory.cs b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypeExtraFactory.cs
old mode 100644
new mode 100755
similarity index 92%
rename from Mozu.Api.Test/Factories/ProductTypeExtraFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypeExtraFactory.cs
index f51999df..3f8678bd
--- a/Mozu.Api.Test/Factories/ProductTypeExtraFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypeExtraFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Catalog.Admin.Attributedefinition.Producttypes
 {
 	/// <summary>
 	/// Use the Extras subresource to define how a product attribute classified as an "extra" is used for a specific product type. Product attribute defintions are unique for each associated product type.
@@ -30,7 +31,7 @@ public partial class ProductTypeExtraFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a list of extra attributes defined for the specified product type.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductTypeExtraFactory.GetExtras(handler : handler,  productTypeId :  productTypeId,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public partial class ProductTypeExtraFactory : BaseDataFactory
 				 productTypeId :  productTypeId, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public partial class ProductTypeExtraFactory : BaseDataFactory
 		}
   
 		/// <summary> 
-		/// Retrieves the details of an extra attribute definition for the specified product type.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductTypeExtraFactory.GetExtra(handler : handler,  productTypeId :  productTypeId,  attributeFQN :  attributeFQN,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.ProductAdmin.AttributeInProductType GetExtra(Se
 				 productTypeId :  productTypeId,  attributeFQN :  attributeFQN,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.ProductAdmin.AttributeInProductType GetExtra(Se
 		}
   
 		/// <summary> 
-		/// Assigns a defined extra attribute to the product type based on the information supplied in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductTypeExtraFactory.AddExtra(handler : handler,  attributeInProductType :  attributeInProductType,  productTypeId :  productTypeId,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.ProductAdmin.AttributeInProductType AddExtra(Se
 				 attributeInProductType :  attributeInProductType,  productTypeId :  productTypeId,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.ProductAdmin.AttributeInProductType AddExtra(Se
 		}
   
 		/// <summary> 
-		/// Update the definition of an extra attribute for the specified product type.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductTypeExtraFactory.UpdateExtra(handler : handler,  attributeInProductType :  attributeInProductType,  productTypeId :  productTypeId,  attributeFQN :  attributeFQN,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static Mozu.Api.Contracts.ProductAdmin.AttributeInProductType UpdateExtra
 				 attributeInProductType :  attributeInProductType,  productTypeId :  productTypeId,  attributeFQN :  attributeFQN,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -182,7 +183,7 @@ public static Mozu.Api.Contracts.ProductAdmin.AttributeInProductType UpdateExtra
 		}
   
 		/// <summary> 
-		/// Removes an extra attribute definition from the specified product type.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductTypeExtraFactory.DeleteExtra(handler : handler,  productTypeId :  productTypeId,  attributeFQN :  attributeFQN,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -203,7 +204,7 @@ public static void DeleteExtra(ServiceClientMessageHandler handler,
 				 productTypeId :  productTypeId,  attributeFQN :  attributeFQN, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/ProductTypeOptionFactory.cs b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypeOptionFactory.cs
old mode 100644
new mode 100755
similarity index 92%
rename from Mozu.Api.Test/Factories/ProductTypeOptionFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypeOptionFactory.cs
index 9bca9636..c16da545
--- a/Mozu.Api.Test/Factories/ProductTypeOptionFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypeOptionFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Catalog.Admin.Attributedefinition.Producttypes
 {
 	/// <summary>
 	/// Use the Options subresource to define how an option attribute is used for a specific product type. Product attribute definitions are unique for each associated product type.
@@ -30,7 +31,7 @@ public partial class ProductTypeOptionFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a list of option product attributes defined for the specified product type.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductTypeOptionFactory.GetOptions(handler : handler,  productTypeId :  productTypeId,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public partial class ProductTypeOptionFactory : BaseDataFactory
 				 productTypeId :  productTypeId, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public partial class ProductTypeOptionFactory : BaseDataFactory
 		}
   
 		/// <summary> 
-		/// Retrieves the details of an option attribute defined for the specified product type.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductTypeOptionFactory.GetOption(handler : handler,  productTypeId :  productTypeId,  attributeFQN :  attributeFQN,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.ProductAdmin.AttributeInProductType GetOption(S
 				 productTypeId :  productTypeId,  attributeFQN :  attributeFQN,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.ProductAdmin.AttributeInProductType GetOption(S
 		}
   
 		/// <summary> 
-		/// Assigns an option attribute to the product type based on the information supplied in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductTypeOptionFactory.AddOption(handler : handler,  attributeInProductType :  attributeInProductType,  productTypeId :  productTypeId,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.ProductAdmin.AttributeInProductType AddOption(S
 				 attributeInProductType :  attributeInProductType,  productTypeId :  productTypeId,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.ProductAdmin.AttributeInProductType AddOption(S
 		}
   
 		/// <summary> 
-		/// Updates an option attribute definition for the specified product type.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductTypeOptionFactory.UpdateOption(handler : handler,  attributeInProductType :  attributeInProductType,  productTypeId :  productTypeId,  attributeFQN :  attributeFQN,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static Mozu.Api.Contracts.ProductAdmin.AttributeInProductType UpdateOptio
 				 attributeInProductType :  attributeInProductType,  productTypeId :  productTypeId,  attributeFQN :  attributeFQN,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -182,7 +183,7 @@ public static Mozu.Api.Contracts.ProductAdmin.AttributeInProductType UpdateOptio
 		}
   
 		/// <summary> 
-		/// Removes an option attribute definition for the specified product type.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductTypeOptionFactory.DeleteOption(handler : handler,  productTypeId :  productTypeId,  attributeFQN :  attributeFQN,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -203,7 +204,7 @@ public static void DeleteOption(ServiceClientMessageHandler handler,
 				 productTypeId :  productTypeId,  attributeFQN :  attributeFQN, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/ProductTypePropertyFactory.cs b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypePropertyFactory.cs
old mode 100644
new mode 100755
similarity index 92%
rename from Mozu.Api.Test/Factories/ProductTypePropertyFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypePropertyFactory.cs
index e23c26a6..742bd9b4
--- a/Mozu.Api.Test/Factories/ProductTypePropertyFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypePropertyFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Catalog.Admin.Attributedefinition.Producttypes
 {
 	/// <summary>
 	/// Use the Properties subresource to define how property product attributes are used for a specific product type. Product attribute definitions are unique for each associated product type.
@@ -30,7 +31,7 @@ public partial class ProductTypePropertyFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a list of product property attributes defined for a product type.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductTypePropertyFactory.GetProperties(handler : handler,  productTypeId :  productTypeId,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public partial class ProductTypePropertyFactory : BaseDataFactory
 				 productTypeId :  productTypeId, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public partial class ProductTypePropertyFactory : BaseDataFactory
 		}
   
 		/// <summary> 
-		/// Retrieves a product property attribute definition for the specified product type.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductTypePropertyFactory.GetProperty(handler : handler,  productTypeId :  productTypeId,  attributeFQN :  attributeFQN,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.ProductAdmin.AttributeInProductType GetProperty
 				 productTypeId :  productTypeId,  attributeFQN :  attributeFQN,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.ProductAdmin.AttributeInProductType GetProperty
 		}
   
 		/// <summary> 
-		/// Assigns a property attribute to the specified product type, according to the information defined in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductTypePropertyFactory.AddProperty(handler : handler,  attributeInProductType :  attributeInProductType,  productTypeId :  productTypeId,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.ProductAdmin.AttributeInProductType AddProperty
 				 attributeInProductType :  attributeInProductType,  productTypeId :  productTypeId,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.ProductAdmin.AttributeInProductType AddProperty
 		}
   
 		/// <summary> 
-		/// Updates the definition of a property attribute for the specified product type.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductTypePropertyFactory.UpdateProperty(handler : handler,  attributeInProductType :  attributeInProductType,  productTypeId :  productTypeId,  attributeFQN :  attributeFQN,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static Mozu.Api.Contracts.ProductAdmin.AttributeInProductType UpdatePrope
 				 attributeInProductType :  attributeInProductType,  productTypeId :  productTypeId,  attributeFQN :  attributeFQN,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -182,7 +183,7 @@ public static Mozu.Api.Contracts.ProductAdmin.AttributeInProductType UpdatePrope
 		}
   
 		/// <summary> 
-		/// Removes a property attribute previously defined for the specified product type.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductTypePropertyFactory.DeleteProperty(handler : handler,  productTypeId :  productTypeId,  attributeFQN :  attributeFQN,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -203,7 +204,7 @@ public static void DeleteProperty(ServiceClientMessageHandler handler,
 				 productTypeId :  productTypeId,  attributeFQN :  attributeFQN, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/ProductTypeVariationFactory.cs b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypeVariationFactory.cs
old mode 100644
new mode 100755
similarity index 93%
rename from Mozu.Api.Test/Factories/ProductTypeVariationFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypeVariationFactory.cs
index 7aaa062c..36b5da7e
--- a/Mozu.Api.Test/Factories/ProductTypeVariationFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypeVariationFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Catalog.Admin.Attributedefinition.Producttypes
 {
 	/// <summary>
 	/// Use the variations resource to preview possible product variations for a specific product type based on the option attributes defined for the product type, such as size or color.
@@ -30,7 +31,7 @@ public partial class ProductTypeVariationFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Generates the variations possible for a product associated with the product type based on the option values supplied in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductTypeVariationFactory.GenerateProductVariations(handler : handler,  productOptionsIn :  productOptionsIn,  productTypeId :  productTypeId,  productCode :  productCode,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductVariationPagedCollection Ge
 				 productOptionsIn :  productOptionsIn,  productTypeId :  productTypeId,  productCode :  productCode,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/CategoryFactory.cs b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/CategoryFactory.cs
old mode 100644
new mode 100755
similarity index 91%
rename from Mozu.Api.Test/Factories/CategoryFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Catalog/Admin/CategoryFactory.cs
index ccbd6ff5..afacff53
--- a/Mozu.Api.Test/Factories/CategoryFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/CategoryFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Catalog.Admin
 {
 	/// <summary>
 	/// Use the Categories resource to organize products and control where they appear on the storefront. Create and maintain a hierarchy of categories and subcategories where the site will store properties.
@@ -30,7 +31,7 @@ public partial class CategoryFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a list of categories according to any specified filter criteria and sort options.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CategoryFactory.GetCategories(handler : handler,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.ProductAdmin.CategoryPagedCollection GetCategor
 				 startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.ProductAdmin.CategoryPagedCollection GetCategor
 		}
   
 		/// <summary> 
-		/// Retrieves the list of subcategories within a category.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CategoryFactory.GetChildCategories(handler : handler,  categoryId :  categoryId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.ProductAdmin.CategoryCollection GetChildCategor
 				 categoryId :  categoryId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.ProductAdmin.CategoryCollection GetChildCategor
 		}
   
 		/// <summary> 
-		/// Retrieves the details of a single category.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CategoryFactory.GetCategory(handler : handler,  categoryId :  categoryId,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.ProductAdmin.Category GetCategory(ServiceClient
 				 categoryId :  categoryId,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.ProductAdmin.Category GetCategory(ServiceClient
 		}
   
 		/// <summary> 
-		/// Adds a new category to the site's category hierarchy.Specify a  to determine where to place the category in the hierarchy. If no  is specified, the new category is a top-level category.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CategoryFactory.AddCategory(handler : handler,  category :  category,  incrementSequence :  incrementSequence,  useProvidedId :  useProvidedId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static Mozu.Api.Contracts.ProductAdmin.Category AddCategory(ServiceClient
 				 category :  category,  incrementSequence :  incrementSequence,  useProvidedId :  useProvidedId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -182,7 +183,7 @@ public static Mozu.Api.Contracts.ProductAdmin.Category AddCategory(ServiceClient
 		}
   
 		/// <summary> 
-		/// Validate the precomputed dynamic category expression for correctness.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CategoryFactory.ValidateDynamicExpression(handler : handler,  dynamicExpressionIn :  dynamicExpressionIn,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -203,7 +204,7 @@ public static Mozu.Api.Contracts.ProductAdmin.DynamicExpression ValidateDynamicE
 				 dynamicExpressionIn :  dynamicExpressionIn,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -220,7 +221,7 @@ public static Mozu.Api.Contracts.ProductAdmin.DynamicExpression ValidateDynamicE
 		}
   
 		/// <summary> 
-		/// Validates the readltime dynamic category expression for correctness.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CategoryFactory.ValidateRealTimeDynamicExpression(handler : handler,  dynamicExpressionIn :  dynamicExpressionIn,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -241,7 +242,7 @@ public static Mozu.Api.Contracts.ProductAdmin.DynamicExpression ValidateRealTime
 				 dynamicExpressionIn :  dynamicExpressionIn,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -258,7 +259,7 @@ public static Mozu.Api.Contracts.ProductAdmin.DynamicExpression ValidateRealTime
 		}
   
 		/// <summary> 
-		/// Update the properties of a defined category or move it to another location in the category hierarchy. Because this operation replaces the defined resource,include all the information to maintain for the category in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CategoryFactory.UpdateCategory(handler : handler,  category :  category,  categoryId :  categoryId,  cascadeVisibility :  cascadeVisibility,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -279,7 +280,7 @@ public static Mozu.Api.Contracts.ProductAdmin.Category UpdateCategory(ServiceCli
 				 category :  category,  categoryId :  categoryId,  cascadeVisibility :  cascadeVisibility,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -296,7 +297,7 @@ public static Mozu.Api.Contracts.ProductAdmin.Category UpdateCategory(ServiceCli
 		}
   
 		/// <summary> 
-		/// Deletes the specified category. Use the categoryId parameter to specify the category.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CategoryFactory.DeleteCategoryById(handler : handler,  categoryId :  categoryId,  cascadeDelete :  cascadeDelete,  forceDelete :  forceDelete,  reassignToParent :  reassignToParent,  expectedCode: expectedCode, successCode: successCode); 
@@ -317,7 +318,7 @@ public static void DeleteCategoryById(ServiceClientMessageHandler handler,
 				 categoryId :  categoryId,  cascadeDelete :  cascadeDelete,  forceDelete :  forceDelete,  reassignToParent :  reassignToParent		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/CouponSetFactory.cs b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/CouponSetFactory.cs
old mode 100644
new mode 100755
similarity index 88%
rename from Mozu.Api.Test/Factories/CouponSetFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Catalog/Admin/CouponSetFactory.cs
index e341a8a0..b3addadd
--- a/Mozu.Api.Test/Factories/CouponSetFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/CouponSetFactory.cs
@@ -18,19 +18,20 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Catalog.Admin
 {
 	/// <summary>
-	/// Use the Coupon Sets resource to view and create coupon sets. You can use coupon sets to group multiple coupon codes together and associate them with one or more discounts. Use the  subresource to manage the coupon codes within manual coupon sets. Use the  subresource to mange the discounts assigned to coupon sets.
+	/// 
 	/// </summary>
 	public partial class CouponSetFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a list of coupon sets in the catalog according to any specified filter criteria and sort options.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CouponSetFactory.GetCouponSets(handler : handler,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  includeCounts :  includeCounts,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.ProductAdmin.CouponSetCollection GetCouponSets(
 				 startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  includeCounts :  includeCounts,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.ProductAdmin.CouponSetCollection GetCouponSets(
 		}
   
 		/// <summary> 
-		/// Retrieves the details of a single coupon set. Use the couponSetCode parameter to specify the coupon set. Use the includeCounts parameter to specify whether to include the number of redeemed coupons, existing coupon codes, and assigned discounts.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CouponSetFactory.GetCouponSet(handler : handler,  couponSetCode :  couponSetCode,  includeCounts :  includeCounts,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.ProductAdmin.CouponSet GetCouponSet(ServiceClie
 				 couponSetCode :  couponSetCode,  includeCounts :  includeCounts,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.ProductAdmin.CouponSet GetCouponSet(ServiceClie
 		}
   
 		/// <summary> 
-		/// Returns a unique, random four character code to use for the couponSetCode.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CouponSetFactory.GetUniqueCouponSetCode(handler : handler,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static string GetUniqueCouponSetCode(ServiceClientMessageHandler handler,
 				 responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static string GetUniqueCouponSetCode(ServiceClientMessageHandler handler,
 		}
   
 		/// <summary> 
-		/// Adds a single coupon set to the catalog.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CouponSetFactory.AddCouponSet(handler : handler,  couponSet :  couponSet,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static Mozu.Api.Contracts.ProductAdmin.CouponSet AddCouponSet(ServiceClie
 				 couponSet :  couponSet,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -182,7 +183,7 @@ public static Mozu.Api.Contracts.ProductAdmin.CouponSet AddCouponSet(ServiceClie
 		}
   
 		/// <summary> 
-		/// Validates the couponSetCode and tests it for uniqueness.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CouponSetFactory.ValidateUniqueCouponSetCode(handler : handler,  code :  code,  expectedCode: expectedCode, successCode: successCode); 
@@ -203,7 +204,7 @@ public static void ValidateUniqueCouponSetCode(ServiceClientMessageHandler handl
 				 code :  code		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -219,7 +220,7 @@ public static void ValidateUniqueCouponSetCode(ServiceClientMessageHandler handl
 		}
   
 		/// <summary> 
-		/// Updates one or more properties of a coupon set in the catalog.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CouponSetFactory.UpdateCouponSet(handler : handler,  couponSet :  couponSet,  couponSetCode :  couponSetCode,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -240,7 +241,7 @@ public static Mozu.Api.Contracts.ProductAdmin.CouponSet UpdateCouponSet(ServiceC
 				 couponSet :  couponSet,  couponSetCode :  couponSetCode,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -257,7 +258,7 @@ public static Mozu.Api.Contracts.ProductAdmin.CouponSet UpdateCouponSet(ServiceC
 		}
   
 		/// <summary> 
-		/// Deletes a specified coupon set from the catalog. Use the couponSetCode parameter to specify the coupon set to delete.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CouponSetFactory.DeleteCouponSet(handler : handler,  couponSetCode :  couponSetCode,  expectedCode: expectedCode, successCode: successCode); 
@@ -278,7 +279,7 @@ public static void DeleteCouponSet(ServiceClientMessageHandler handler,
 				 couponSetCode :  couponSetCode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/AssignedDiscountFactory.cs b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/Couponsets/AssignedDiscountFactory.cs
old mode 100644
new mode 100755
similarity index 90%
rename from Mozu.Api.Test/Factories/AssignedDiscountFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Catalog/Admin/Couponsets/AssignedDiscountFactory.cs
index bb40f639..627b0ba8
--- a/Mozu.Api.Test/Factories/AssignedDiscountFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/Couponsets/AssignedDiscountFactory.cs
@@ -18,19 +18,20 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Catalog.Admin.Couponsets
 {
 	/// <summary>
-	/// Use the AssignedDiscounts resource to manage the discounts assigned to coupon sets.
+	/// 
 	/// </summary>
 	public partial class AssignedDiscountFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves the discountIds of any assigned discounts for the specified coupon set.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = AssignedDiscountFactory.GetAssignedDiscounts(handler : handler,  couponSetCode :  couponSetCode,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public partial class AssignedDiscountFactory : BaseDataFactory
 				 couponSetCode :  couponSetCode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public partial class AssignedDiscountFactory : BaseDataFactory
 		}
   
 		/// <summary> 
-		/// Assigns or associates an existing discount to a specified coupon set. Use the couponSetCode parameter to specify the coupon set.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = AssignedDiscountFactory.AssignDiscount(handler : handler,  assignedDiscount :  assignedDiscount,  couponSetCode :  couponSetCode,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static void AssignDiscount(ServiceClientMessageHandler handler,
 				 assignedDiscount :  assignedDiscount,  couponSetCode :  couponSetCode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -105,7 +106,7 @@ public static void AssignDiscount(ServiceClientMessageHandler handler,
 		}
   
 		/// <summary> 
-		/// Unassigns or disassociates the specified discount with the specified coupon set.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = AssignedDiscountFactory.UnAssignDiscount(handler : handler,  couponSetCode :  couponSetCode,  discountId :  discountId,  expectedCode: expectedCode, successCode: successCode); 
@@ -126,7 +127,7 @@ public static void UnAssignDiscount(ServiceClientMessageHandler handler,
 				 couponSetCode :  couponSetCode,  discountId :  discountId		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/CouponFactory.cs b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/Couponsets/CouponFactory.cs
old mode 100644
new mode 100755
similarity index 87%
rename from Mozu.Api.Test/Factories/CouponFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Catalog/Admin/Couponsets/CouponFactory.cs
index 51d58b85..14d00808
--- a/Mozu.Api.Test/Factories/CouponFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/Couponsets/CouponFactory.cs
@@ -18,19 +18,20 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Catalog.Admin.Couponsets
 {
 	/// <summary>
-	/// Use the Coupons subresource to manage coupons within manual coupon sets.
+	/// 
 	/// </summary>
 	public partial class CouponFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves the details of the specified coupon. Use the couponSetCode and the couponCode parameter to specify the coupon within a coupon set. Use the includeCounts paramter to specify whether to return the redemptionCount property in the response body object.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CouponFactory.GetCoupon(handler : handler,  couponSetCode :  couponSetCode,  couponCode :  couponCode,  includeCounts :  includeCounts,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.ProductAdmin.Coupon GetCoupon(ServiceClientMess
 				 couponSetCode :  couponSetCode,  couponCode :  couponCode,  includeCounts :  includeCounts,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.ProductAdmin.Coupon GetCoupon(ServiceClientMess
 		}
   
 		/// <summary> 
-		/// Retrieves a list of coupons in a specified coupon set according to any specified filter criteria and sort options.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CouponFactory.GetCoupons(handler : handler,  couponSetCode :  couponSetCode,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  includeCounts :  includeCounts,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.ProductAdmin.CouponCollection GetCoupons(Servic
 				 couponSetCode :  couponSetCode,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  includeCounts :  includeCounts,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.ProductAdmin.CouponCollection GetCoupons(Servic
 		}
   
 		/// <summary> 
-		/// Adds coupons  to a specified manual coupon set. Use the couponSetCode parameter to specify the manual coupon set.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CouponFactory.AddCoupons(handler : handler,  coupons :  coupons,  couponSetCode :  couponSetCode,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static void AddCoupons(ServiceClientMessageHandler handler,
 				 coupons :  coupons,  couponSetCode :  couponSetCode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -143,7 +144,7 @@ public static void AddCoupons(ServiceClientMessageHandler handler,
 		}
   
 		/// <summary> 
-		/// Deletes the specified coupons and removes them from the coupon set. You can only delete a coupon if it has not been redeemed. Use the canBeDeleted property to determine whether a coupon can be deleted.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CouponFactory.DeleteCoupons(handler : handler,  couponCodes :  couponCodes,  couponSetCode :  couponSetCode,  expectedCode: expectedCode, successCode: successCode); 
@@ -164,7 +165,7 @@ public static void DeleteCoupons(ServiceClientMessageHandler handler,
 				 couponCodes :  couponCodes,  couponSetCode :  couponSetCode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -180,7 +181,7 @@ public static void DeleteCoupons(ServiceClientMessageHandler handler,
 		}
   
 		/// <summary> 
-		/// Deletes the specified coupon and remove it from the coupon set. You can only delete a coupon if it has not been redeemed. Use the canBeDeleted property to determine whether a coupon can be deleted.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CouponFactory.DeleteCoupon(handler : handler,  couponSetCode :  couponSetCode,  couponCode :  couponCode,  expectedCode: expectedCode, successCode: successCode); 
@@ -201,7 +202,7 @@ public static void DeleteCoupon(ServiceClientMessageHandler handler,
 				 couponSetCode :  couponSetCode,  couponCode :  couponCode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/DiscountFactory.cs b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/DiscountFactory.cs
old mode 100644
new mode 100755
similarity index 90%
rename from Mozu.Api.Test/Factories/DiscountFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Catalog/Admin/DiscountFactory.cs
index 2bec585e..8c6a0d8a
--- a/Mozu.Api.Test/Factories/DiscountFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/DiscountFactory.cs
@@ -18,19 +18,20 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Catalog.Admin
 {
 	/// <summary>
-	/// Use the Discounts resource to define and manage discounts to apply to products, product categories, or orders. The discounts can be a specified amount off the price, percentage off the price, or for free shipping. You can create a coupon code that shoppers can use to redeem the discount.
+	/// Define and manage discounts to apply to products, product categories, or orders. The discounts can be a specified amount off the price, percentage off the price, or for free shipping. Create a coupon code that shoppers can use to redeem the discount.
 	/// </summary>
 	public partial class DiscountFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a list of discounts according to any specified filter criteria and sort options.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = DiscountFactory.GetDiscounts(handler : handler,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.ProductAdmin.DiscountCollection GetDiscounts(Se
 				 startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.ProductAdmin.DiscountCollection GetDiscounts(Se
 		}
   
 		/// <summary> 
-		/// Retrieves the localized content specified for the specified discount.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = DiscountFactory.GetDiscountContent(handler : handler,  discountId :  discountId,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.ProductAdmin.DiscountLocalizedContent GetDiscou
 				 discountId :  discountId,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.ProductAdmin.DiscountLocalizedContent GetDiscou
 		}
   
 		/// <summary> 
-		/// Retrieves the details of a single discount.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = DiscountFactory.GetDiscount(handler : handler,  discountId :  discountId,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.ProductAdmin.Discount GetDiscount(ServiceClient
 				 discountId :  discountId,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.ProductAdmin.Discount GetDiscount(ServiceClient
 		}
   
 		/// <summary> 
-		/// Generates a random code for a coupon.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = DiscountFactory.GenerateRandomCoupon(handler : handler,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static string GenerateRandomCoupon(ServiceClientMessageHandler handler,
 				 responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -182,7 +183,7 @@ public static string GenerateRandomCoupon(ServiceClientMessageHandler handler,
 		}
   
 		/// <summary> 
-		/// Creates a new discount or coupon to apply to a product, category, order, or shipping.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = DiscountFactory.CreateDiscount(handler : handler,  discount :  discount,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -203,7 +204,7 @@ public static Mozu.Api.Contracts.ProductAdmin.Discount CreateDiscount(ServiceCli
 				 discount :  discount,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -220,7 +221,7 @@ public static Mozu.Api.Contracts.ProductAdmin.Discount CreateDiscount(ServiceCli
 		}
   
 		/// <summary> 
-		/// Updates the localizable content for the specified discount or renames the discount without modifying its other properties.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = DiscountFactory.UpdateDiscountContent(handler : handler,  content :  content,  discountId :  discountId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -241,7 +242,7 @@ public static Mozu.Api.Contracts.ProductAdmin.DiscountLocalizedContent UpdateDis
 				 content :  content,  discountId :  discountId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -258,7 +259,7 @@ public static Mozu.Api.Contracts.ProductAdmin.DiscountLocalizedContent UpdateDis
 		}
   
 		/// <summary> 
-		/// Updates one or more properties of the specified discount.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = DiscountFactory.UpdateDiscount(handler : handler,  discount :  discount,  discountId :  discountId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -279,7 +280,7 @@ public static Mozu.Api.Contracts.ProductAdmin.Discount UpdateDiscount(ServiceCli
 				 discount :  discount,  discountId :  discountId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -296,7 +297,7 @@ public static Mozu.Api.Contracts.ProductAdmin.Discount UpdateDiscount(ServiceCli
 		}
   
 		/// <summary> 
-		/// Deletes a discount specified by its discount ID.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = DiscountFactory.DeleteDiscount(handler : handler,  discountId :  discountId,  expectedCode: expectedCode, successCode: successCode); 
@@ -317,7 +318,7 @@ public static void DeleteDiscount(ServiceClientMessageHandler handler,
 				 discountId :  discountId		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/EventFactory.cs b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/DiscountSettingsFactory.cs
old mode 100644
new mode 100755
similarity index 59%
rename from Mozu.Api.Test/Factories/EventFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Catalog/Admin/DiscountSettingsFactory.cs
index bbd6b5f4..022cd9ac
--- a/Mozu.Api.Test/Factories/EventFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/DiscountSettingsFactory.cs
@@ -18,40 +18,41 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Catalog.Admin
 {
 	/// <summary>
-	/// Events are notifications Mozu publishes to the application when a create, read, update, or delete operation is performed. If the application subscribes to the event, you can use the Events resource to query for recent events Mozu published to your application or events that were not published successfully.
+	/// 
 	/// </summary>
-	public partial class EventFactory : BaseDataFactory
+	public partial class DiscountSettingsFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a list of events.
+		/// 
 		/// <example> 
 		///  <code> 
-		/// var result = EventFactory.GetEvents(handler : handler,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<EventCollection/>(result); 
+		/// var result = DiscountSettingsFactory.GetDiscountSettings(handler : handler,  catalogId :  catalogId,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<DiscountSettings/>(result); 
 		/// return optionalCasting;
 		///  </code> 
 		/// </example> 
 		/// </summary>
-		public static Mozu.Api.Contracts.Event.EventCollection GetEvents(ServiceClientMessageHandler handler, 
- 		 int? startIndex = null, int? pageSize = null, string sortBy = null, string filter = null, string responseFields = null, 
+		public static Mozu.Api.Contracts.ProductAdmin.DiscountSettings GetDiscountSettings(ServiceClientMessageHandler handler, 
+ 		 int catalogId, string responseFields = null,  DataViewMode dataViewMode= DataViewMode.Live, 
 		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
 		{
 			SetSdKparameters();
 			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
 			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
 			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Event.EventNotificationClient.GetEventsClient(
-				 startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields		);
+			var apiClient = Mozu.Api.Clients.Commerce.Catalog.Admin.DiscountSettingsClient.GetDiscountSettingsClient(
+				 catalogId :  catalogId,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,28 +69,28 @@ public static Mozu.Api.Contracts.Event.EventCollection GetEvents(ServiceClientMe
 		}
   
 		/// <summary> 
-		/// Retrieves an event by providing the event ID.
+		/// 
 		/// <example> 
 		///  <code> 
-		/// var result = EventFactory.GetEvent(handler : handler,  eventId :  eventId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<Event/>(result); 
+		/// var result = DiscountSettingsFactory.UpdateDiscountSettings(handler : handler,  discountSettings :  discountSettings,  catalogId :  catalogId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<DiscountSettings/>(result); 
 		/// return optionalCasting;
 		///  </code> 
 		/// </example> 
 		/// </summary>
-		public static Mozu.Api.Contracts.Event.Event GetEvent(ServiceClientMessageHandler handler, 
- 		 string eventId, string responseFields = null, 
+		public static Mozu.Api.Contracts.ProductAdmin.DiscountSettings UpdateDiscountSettings(ServiceClientMessageHandler handler, 
+ 		 Mozu.Api.Contracts.ProductAdmin.DiscountSettings discountSettings, int catalogId, string responseFields = null, 
 		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
 		{
 			SetSdKparameters();
 			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
 			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
 			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Event.EventNotificationClient.GetEventClient(
-				 eventId :  eventId,  responseFields :  responseFields		);
+			var apiClient = Mozu.Api.Clients.Commerce.Catalog.Admin.DiscountSettingsClient.UpdateDiscountSettingsClient(
+				 discountSettings :  discountSettings,  catalogId :  catalogId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/DiscountTargetFactory.cs b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/Discounts/DiscountTargetFactory.cs
old mode 100644
new mode 100755
similarity index 91%
rename from Mozu.Api.Test/Factories/DiscountTargetFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Catalog/Admin/Discounts/DiscountTargetFactory.cs
index 7d7802b7..b8c48109
--- a/Mozu.Api.Test/Factories/DiscountTargetFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/Discounts/DiscountTargetFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Catalog.Admin.Discounts
 {
 	/// <summary>
 	/// Retrieves and modifies the products, categories, and shipping methods eligible for discounts in the form of a fixed dollar amount, percentage off a product price, or free shipping.
@@ -30,7 +31,7 @@ public partial class DiscountTargetFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves the discount target, that is which products, categories, or shipping methods are eligible for the discount.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = DiscountTargetFactory.GetDiscountTarget(handler : handler,  discountId :  discountId,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.ProductAdmin.DiscountTarget GetDiscountTarget(S
 				 discountId :  discountId,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.ProductAdmin.DiscountTarget GetDiscountTarget(S
 		}
   
 		/// <summary> 
-		/// Modifies properties of the discount target, for example, the dollar amount, or precentage off the price.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = DiscountTargetFactory.UpdateDiscountTarget(handler : handler,  discountTarget :  discountTarget,  discountId :  discountId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.ProductAdmin.DiscountTarget UpdateDiscountTarge
 				 discountTarget :  discountTarget,  discountId :  discountId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/FacetAdminFactory.cs b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/FacetAdminFactory.cs
old mode 100644
new mode 100755
similarity index 92%
rename from Mozu.Api.Test/Factories/FacetAdminFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Catalog/Admin/FacetAdminFactory.cs
index 3b3cdada..8fc70bd2
--- a/Mozu.Api.Test/Factories/FacetAdminFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/FacetAdminFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Catalog.Admin
 {
 	/// <summary>
 	/// Use the Facets resource to manage the facets shoppers use to filter product display results on a storefront. Facets can include categories, product attributes, or prices, and use either a range of values or discrete values.
@@ -30,7 +31,7 @@ public partial class FacetAdminFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a facet specified by its unique identifier and displays its properties.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = FacetFactory.GetFacet(handler : handler,  facetId :  facetId,  validate :  validate,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.ProductAdmin.Facet GetFacet(ServiceClientMessag
 				 facetId :  facetId,  validate :  validate,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.ProductAdmin.Facet GetFacet(ServiceClientMessag
 		}
   
 		/// <summary> 
-		/// Retrieves a list of the facets defined for the specified category.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = FacetFactory.GetFacetCategoryList(handler : handler,  categoryId :  categoryId,  includeAvailable :  includeAvailable,  validate :  validate,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.ProductAdmin.FacetSet GetFacetCategoryList(Serv
 				 categoryId :  categoryId,  includeAvailable :  includeAvailable,  validate :  validate,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.ProductAdmin.FacetSet GetFacetCategoryList(Serv
 		}
   
 		/// <summary> 
-		/// Creates a new category, price, or attribute facet. Define the category or attribute source to use for the facet values.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = FacetFactory.AddFacet(handler : handler,  facet :  facet,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.ProductAdmin.Facet AddFacet(ServiceClientMessag
 				 facet :  facet,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.ProductAdmin.Facet AddFacet(ServiceClientMessag
 		}
   
 		/// <summary> 
-		/// Modifies one or more properties of a defined facet.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = FacetFactory.UpdateFacet(handler : handler,  facet :  facet,  facetId :  facetId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static Mozu.Api.Contracts.ProductAdmin.Facet UpdateFacet(ServiceClientMes
 				 facet :  facet,  facetId :  facetId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -182,7 +183,7 @@ public static Mozu.Api.Contracts.ProductAdmin.Facet UpdateFacet(ServiceClientMes
 		}
   
 		/// <summary> 
-		/// Deletes the facet specified by its unique identifier.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = FacetFactory.DeleteFacetById(handler : handler,  facetId :  facetId,  expectedCode: expectedCode, successCode: successCode); 
@@ -203,7 +204,7 @@ public static void DeleteFacetById(ServiceClientMessageHandler handler,
 				 facetId :  facetId		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/LocationInventoryFactory.cs b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/LocationInventoryFactory.cs
old mode 100644
new mode 100755
similarity index 91%
rename from Mozu.Api.Test/Factories/LocationInventoryFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Catalog/Admin/LocationInventoryFactory.cs
index 09c33136..aa5a4f86
--- a/Mozu.Api.Test/Factories/LocationInventoryFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/LocationInventoryFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Catalog.Admin
 {
 	/// <summary>
 	/// Use the Location Inventory resource to manage the level of active product inventory maintained at each defined location, at the location level.
@@ -30,7 +31,7 @@ public partial class LocationInventoryFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves the details of a product's active inventory at the location specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = LocationInventoryFactory.GetLocationInventory(handler : handler,  locationCode :  locationCode,  productCode :  productCode,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.ProductAdmin.LocationInventory GetLocationInven
 				 locationCode :  locationCode,  productCode :  productCode,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.ProductAdmin.LocationInventory GetLocationInven
 		}
   
 		/// <summary> 
-		/// Retrieves a list of all product inventory definitions for the location code specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = LocationInventoryFactory.GetLocationInventories(handler : handler,  locationCode :  locationCode,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  filterFunctions :  filterFunctions,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.ProductAdmin.LocationInventoryCollection GetLoc
 				 locationCode :  locationCode,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  filterFunctions :  filterFunctions,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.ProductAdmin.LocationInventoryCollection GetLoc
 		}
   
 		/// <summary> 
-		/// Creates an array of product inventory definitions for the location specified in the request. When adding a new inventory definition, you must specify the productCode and stockOnHand value in each array you define. All other properties are system-supplied and read only.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = LocationInventoryFactory.AddLocationInventory(handler : handler,  locationInventoryList :  locationInventoryList,  locationCode :  locationCode,  performUpserts :  performUpserts,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.ProductAdmin.LocationInventoryCollection GetLoc
 				 locationInventoryList :  locationInventoryList,  locationCode :  locationCode,  performUpserts :  performUpserts, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.ProductAdmin.LocationInventoryCollection GetLoc
 		}
   
 		/// <summary> 
-		/// Updates the active stock on hand inventory of products for the location code specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = LocationInventoryFactory.UpdateLocationInventory(handler : handler,  locationInventoryAdjustments :  locationInventoryAdjustments,  locationCode :  locationCode,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static Mozu.Api.Contracts.ProductAdmin.LocationInventoryCollection GetLoc
 				 locationInventoryAdjustments :  locationInventoryAdjustments,  locationCode :  locationCode, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -182,7 +183,7 @@ public static Mozu.Api.Contracts.ProductAdmin.LocationInventoryCollection GetLoc
 		}
   
 		/// <summary> 
-		/// Deletes the product code inventory definition for the location specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = LocationInventoryFactory.DeleteLocationInventory(handler : handler,  locationCode :  locationCode,  productCode :  productCode,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -203,7 +204,7 @@ public static void DeleteLocationInventory(ServiceClientMessageHandler handler,
 				 locationCode :  locationCode,  productCode :  productCode, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/MasterCatalogFactory.cs b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/MasterCatalogFactory.cs
old mode 100644
new mode 100755
similarity index 92%
rename from Mozu.Api.Test/Factories/MasterCatalogFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Catalog/Admin/MasterCatalogFactory.cs
index ee6a798d..033d1107
--- a/Mozu.Api.Test/Factories/MasterCatalogFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/MasterCatalogFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Catalog.Admin
 {
 	/// <summary>
 	/// Use the Master Catalog resource to view details of the master catalogs associated with a tenant and to manage the product publishing mode for each master catalog.
@@ -30,7 +31,7 @@ public partial class MasterCatalogFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieve the details of all master catalog associated with a tenant.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = MasterCatalogFactory.GetMasterCatalogs(handler : handler,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.ProductAdmin.MasterCatalogCollection GetMasterC
 				 responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.ProductAdmin.MasterCatalogCollection GetMasterC
 		}
   
 		/// <summary> 
-		/// Retrieve the details of the master catalog specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = MasterCatalogFactory.GetMasterCatalog(handler : handler,  masterCatalogId :  masterCatalogId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.ProductAdmin.MasterCatalog GetMasterCatalog(Ser
 				 masterCatalogId :  masterCatalogId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.ProductAdmin.MasterCatalog GetMasterCatalog(Ser
 		}
   
 		/// <summary> 
-		/// Updates the product publishing mode for the master catalog specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = MasterCatalogFactory.UpdateMasterCatalog(handler : handler,  masterCatalog :  masterCatalog,  masterCatalogId :  masterCatalogId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.ProductAdmin.MasterCatalog UpdateMasterCatalog(
 				 masterCatalog :  masterCatalog,  masterCatalogId :  masterCatalogId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/PriceListFactory.cs b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/PriceListFactory.cs
old mode 100644
new mode 100755
similarity index 90%
rename from Mozu.Api.Test/Factories/PriceListFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Catalog/Admin/PriceListFactory.cs
index d16d787c..f4cb320c
--- a/Mozu.Api.Test/Factories/PriceListFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/PriceListFactory.cs
@@ -18,19 +18,20 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Catalog.Admin
 {
 	/// <summary>
-	/// Use the Price Lists resource to view and create price lists. You can use price lists to override the catalog pricing of products for specific customer segments and/or sites. You can override products' list price, sale price, advanced pricing information such as MSRP, cost, MAP, and the catalog price of any extras associated with the product in a price list. You can also restrict discounts from applying to the overridden product pricing in a price list. Refer to [Price Lists](../../../guides/catalog/price-lists.htm) in the Guides section for more information about price lists.
+	/// 
 	/// </summary>
 	public partial class PriceListFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a list of price lists according to any specified facets, filter criteria, and sort options.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = PriceListFactory.GetPriceLists(handler : handler,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.ProductAdmin.PriceListCollection GetPriceLists(
 				 startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.ProductAdmin.PriceListCollection GetPriceLists(
 		}
   
 		/// <summary> 
-		/// Retrieves the details of the specified price list.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = PriceListFactory.GetPriceList(handler : handler,  priceListCode :  priceListCode,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.ProductAdmin.PriceList GetPriceList(ServiceClie
 				 priceListCode :  priceListCode,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.ProductAdmin.PriceList GetPriceList(ServiceClie
 		}
   
 		/// <summary> 
-		/// Adds a new price list to the tenant.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = PriceListFactory.AddPriceList(handler : handler,  priceList :  priceList,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.ProductAdmin.PriceList AddPriceList(ServiceClie
 				 priceList :  priceList,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.ProductAdmin.PriceList AddPriceList(ServiceClie
 		}
   
 		/// <summary> 
-		/// Adds up to 5000 new price list entries in bulk.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = PriceListFactory.BulkAddPriceListEntries(handler : handler,  priceListEntriesIn :  priceListEntriesIn,  publishEvents :  publishEvents,  invalidateCache :  invalidateCache,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static void BulkAddPriceListEntries(ServiceClientMessageHandler handler,
 				 priceListEntriesIn :  priceListEntriesIn,  publishEvents :  publishEvents,  invalidateCache :  invalidateCache		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -181,7 +182,7 @@ public static void BulkAddPriceListEntries(ServiceClientMessageHandler handler,
 		}
   
 		/// <summary> 
-		/// Deletes up to 5000 price list entries in bulk.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = PriceListFactory.BulkDeletePriceListEntries(handler : handler,  priceListEntriesIn :  priceListEntriesIn,  publishEvents :  publishEvents,  invalidateCache :  invalidateCache,  expectedCode: expectedCode, successCode: successCode); 
@@ -202,7 +203,7 @@ public static void BulkDeletePriceListEntries(ServiceClientMessageHandler handle
 				 priceListEntriesIn :  priceListEntriesIn,  publishEvents :  publishEvents,  invalidateCache :  invalidateCache		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -218,7 +219,7 @@ public static void BulkDeletePriceListEntries(ServiceClientMessageHandler handle
 		}
   
 		/// <summary> 
-		/// Updates up to 5000 price list entries in bulk.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = PriceListFactory.BulkUpdatePriceListEntries(handler : handler,  priceListEntriesIn :  priceListEntriesIn,  publishEvents :  publishEvents,  invalidateCache :  invalidateCache,  expectedCode: expectedCode, successCode: successCode); 
@@ -239,7 +240,7 @@ public static void BulkUpdatePriceListEntries(ServiceClientMessageHandler handle
 				 priceListEntriesIn :  priceListEntriesIn,  publishEvents :  publishEvents,  invalidateCache :  invalidateCache		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -255,7 +256,7 @@ public static void BulkUpdatePriceListEntries(ServiceClientMessageHandler handle
 		}
   
 		/// <summary> 
-		/// Updates the details of the specified price list.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = PriceListFactory.UpdatePriceList(handler : handler,  priceList :  priceList,  priceListCode :  priceListCode,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -276,7 +277,7 @@ public static Mozu.Api.Contracts.ProductAdmin.PriceList UpdatePriceList(ServiceC
 				 priceList :  priceList,  priceListCode :  priceListCode,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -293,7 +294,7 @@ public static Mozu.Api.Contracts.ProductAdmin.PriceList UpdatePriceList(ServiceC
 		}
   
 		/// <summary> 
-		/// Deletes the specified price list from the tenant.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = PriceListFactory.DeletePriceList(handler : handler,  priceListCode :  priceListCode,  cascadeDeleteEntries :  cascadeDeleteEntries,  expectedCode: expectedCode, successCode: successCode); 
@@ -314,7 +315,7 @@ public static void DeletePriceList(ServiceClientMessageHandler handler,
 				 priceListCode :  priceListCode,  cascadeDeleteEntries :  cascadeDeleteEntries		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/PriceListEntryFactory.cs b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/Pricelists/PriceListEntryFactory.cs
old mode 100644
new mode 100755
similarity index 90%
rename from Mozu.Api.Test/Factories/PriceListEntryFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Catalog/Admin/Pricelists/PriceListEntryFactory.cs
index 30f1bcb9..21cc9b94
--- a/Mozu.Api.Test/Factories/PriceListEntryFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/Pricelists/PriceListEntryFactory.cs
@@ -18,19 +18,20 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Catalog.Admin.Pricelists
 {
 	/// <summary>
-	/// Use the Entries sub-resource to interact with price list entries. Price list entries enable you to override product pricing as well as control what products shoppers can view and purchase when the price list is exclusive. Refer to the [Price Lists](../../../guides/catalog/price-lists.htm) guides topic for more information.
+	/// 
 	/// </summary>
 	public partial class PriceListEntryFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves the details of a price list entry.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = PriceListEntryFactory.GetPriceListEntry(handler : handler,  priceListCode :  priceListCode,  productCode :  productCode,  currencyCode :  currencyCode,  startDate :  startDate,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.ProductAdmin.PriceListEntry GetPriceListEntry(S
 				 priceListCode :  priceListCode,  productCode :  productCode,  currencyCode :  currencyCode,  startDate :  startDate,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.ProductAdmin.PriceListEntry GetPriceListEntry(S
 		}
   
 		/// <summary> 
-		/// Retrieves a list of price list entries associated with the specified price list according to any specified facets, filter criteria, and sort options.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = PriceListEntryFactory.GetPriceListEntries(handler : handler,  priceListCode :  priceListCode,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.ProductAdmin.PriceListEntryCollection GetPriceL
 				 priceListCode :  priceListCode,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.ProductAdmin.PriceListEntryCollection GetPriceL
 		}
   
 		/// <summary> 
-		/// Adds a new price list entry to the specified price list.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = PriceListEntryFactory.AddPriceListEntry(handler : handler,  priceListEntryIn :  priceListEntryIn,  priceListCode :  priceListCode,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.ProductAdmin.PriceListEntry AddPriceListEntry(S
 				 priceListEntryIn :  priceListEntryIn,  priceListCode :  priceListCode,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.ProductAdmin.PriceListEntry AddPriceListEntry(S
 		}
   
 		/// <summary> 
-		/// Updates the details of a price list entry.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = PriceListEntryFactory.UpdatePriceListEntry(handler : handler,  priceListEntryIn :  priceListEntryIn,  priceListCode :  priceListCode,  productCode :  productCode,  currencyCode :  currencyCode,  startDate :  startDate,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static Mozu.Api.Contracts.ProductAdmin.PriceListEntry UpdatePriceListEntr
 				 priceListEntryIn :  priceListEntryIn,  priceListCode :  priceListCode,  productCode :  productCode,  currencyCode :  currencyCode,  startDate :  startDate,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -182,7 +183,7 @@ public static Mozu.Api.Contracts.ProductAdmin.PriceListEntry UpdatePriceListEntr
 		}
   
 		/// <summary> 
-		/// Deletes a price list entry.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = PriceListEntryFactory.DeletePriceListEntry(handler : handler,  priceListCode :  priceListCode,  productCode :  productCode,  currencyCode :  currencyCode,  startDate :  startDate,  expectedCode: expectedCode, successCode: successCode); 
@@ -203,7 +204,7 @@ public static void DeletePriceListEntry(ServiceClientMessageHandler handler,
 				 priceListCode :  priceListCode,  productCode :  productCode,  currencyCode :  currencyCode,  startDate :  startDate		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/ProductFactory.cs b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/ProductFactory.cs
old mode 100644
new mode 100755
similarity index 92%
rename from Mozu.Api.Test/Factories/ProductFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Catalog/Admin/ProductFactory.cs
index 75e67a13..5f2d0c7c
--- a/Mozu.Api.Test/Factories/ProductFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/ProductFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Catalog.Admin
 {
 	/// <summary>
 	/// Use the Product Administration resource to create new product definitions in the master catalog and determine which catalogs will feature products. You can also assign attribute values for defined products, manage product-level location inventory, and configure the variations of a product.
@@ -30,7 +31,7 @@ public partial class ProductFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a list of products according to any specified facets, filter criteria, and sort options.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductFactory.GetProducts(handler : handler,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  q :  q,  qLimit :  qLimit,  noCount :  noCount,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductCollection GetProducts(Serv
 				 startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  q :  q,  qLimit :  qLimit,  noCount :  noCount,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductCollection GetProducts(Serv
 		}
   
 		/// <summary> 
-		/// Retrieves a product that is associated with one or more specific catalogs.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductFactory.GetProductInCatalogs(handler : handler,  productCode :  productCode,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductCollection GetProducts(Serv
 				 productCode :  productCode, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductCollection GetProducts(Serv
 		}
   
 		/// <summary> 
-		/// Retrieves the details of a product associated with a specific catalog.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductFactory.GetProductInCatalog(handler : handler,  productCode :  productCode,  catalogId :  catalogId,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductInCatalogInfo GetProductInC
 				 productCode :  productCode,  catalogId :  catalogId,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductInCatalogInfo GetProductInC
 		}
   
 		/// <summary> 
-		/// Retrieves the details of a product definition.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductFactory.GetProduct(handler : handler,  productCode :  productCode,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static Mozu.Api.Contracts.ProductAdmin.Product GetProduct(ServiceClientMe
 				 productCode :  productCode,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -182,7 +183,7 @@ public static Mozu.Api.Contracts.ProductAdmin.Product GetProduct(ServiceClientMe
 		}
   
 		/// <summary> 
-		/// Creates a new product definition in the specified master catalog.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductFactory.AddProduct(handler : handler,  product :  product,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -203,7 +204,7 @@ public static Mozu.Api.Contracts.ProductAdmin.Product AddProduct(ServiceClientMe
 				 product :  product,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -220,7 +221,7 @@ public static Mozu.Api.Contracts.ProductAdmin.Product AddProduct(ServiceClientMe
 		}
   
 		/// <summary> 
-		/// Associates a new product defined in the master catalog with a specific catalog.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductFactory.AddProductInCatalog(handler : handler,  productInCatalogInfoIn :  productInCatalogInfoIn,  productCode :  productCode,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -241,7 +242,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductInCatalogInfo AddProductInC
 				 productInCatalogInfoIn :  productInCatalogInfoIn,  productCode :  productCode,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -258,7 +259,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductInCatalogInfo AddProductInC
 		}
   
 		/// <summary> 
-		/// Performs an update to a product code by renaming or replacing the current product code with a new one.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductFactory.RenameProductCodes(handler : handler,  productCodeRenames :  productCodeRenames,  expectedCode: expectedCode, successCode: successCode); 
@@ -279,7 +280,7 @@ public static void RenameProductCodes(ServiceClientMessageHandler handler,
 				 productCodeRenames :  productCodeRenames		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -295,7 +296,7 @@ public static void RenameProductCodes(ServiceClientMessageHandler handler,
 		}
   
 		/// <summary> 
-		/// Updates the properties of a product specific to each catalog associated with the product.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductFactory.UpdateProductInCatalogs(handler : handler,  productInCatalogsIn :  productInCatalogsIn,  productCode :  productCode,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -316,7 +317,7 @@ public static void RenameProductCodes(ServiceClientMessageHandler handler,
 				 productInCatalogsIn :  productInCatalogsIn,  productCode :  productCode, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -333,7 +334,7 @@ public static void RenameProductCodes(ServiceClientMessageHandler handler,
 		}
   
 		/// <summary> 
-		/// Updates one or more properties of a product associated with a specific catalog.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductFactory.UpdateProductInCatalog(handler : handler,  productInCatalogInfoIn :  productInCatalogInfoIn,  productCode :  productCode,  catalogId :  catalogId,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -354,7 +355,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductInCatalogInfo UpdateProduct
 				 productInCatalogInfoIn :  productInCatalogInfoIn,  productCode :  productCode,  catalogId :  catalogId,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -371,7 +372,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductInCatalogInfo UpdateProduct
 		}
   
 		/// <summary> 
-		/// Updates one or more properties of a product definition in a master catalog.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductFactory.UpdateProduct(handler : handler,  product :  product,  productCode :  productCode,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -392,7 +393,7 @@ public static Mozu.Api.Contracts.ProductAdmin.Product UpdateProduct(ServiceClien
 				 product :  product,  productCode :  productCode,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -409,7 +410,7 @@ public static Mozu.Api.Contracts.ProductAdmin.Product UpdateProduct(ServiceClien
 		}
   
 		/// <summary> 
-		/// Deletes the specified product from a master catalog.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductFactory.DeleteProduct(handler : handler,  productCode :  productCode,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -430,7 +431,7 @@ public static void DeleteProduct(ServiceClientMessageHandler handler,
 				 productCode :  productCode, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -446,7 +447,7 @@ public static void DeleteProduct(ServiceClientMessageHandler handler,
 		}
   
 		/// <summary> 
-		/// Removes the product association defined for a specific catalog.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductFactory.DeleteProductInCatalog(handler : handler,  productCode :  productCode,  catalogId :  catalogId,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -467,7 +468,7 @@ public static void DeleteProductInCatalog(ServiceClientMessageHandler handler,
 				 productCode :  productCode,  catalogId :  catalogId, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/ProductReservationFactory.cs b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/ProductReservationFactory.cs
old mode 100644
new mode 100755
similarity index 89%
rename from Mozu.Api.Test/Factories/ProductReservationFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Catalog/Admin/ProductReservationFactory.cs
index f738b23a..063c9827
--- a/Mozu.Api.Test/Factories/ProductReservationFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/ProductReservationFactory.cs
@@ -18,19 +18,20 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Catalog.Admin
 {
 	/// <summary>
-	/// Use the Product Reservations resource to temporarily hold a product from inventory while a shopper is filling out payment information. You can create a product reservation when a shopper proceeds to check out and then release the reservation when the order process is complete.
+	/// Temporarily hold a product from inventory while a shopper is filling out payment information. Create a product reservation when a shopper proceeds to check out and then release the reservation when the order process is complete.
 	/// </summary>
 	public partial class ProductReservationFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a list of product reservations according to any specified filter criteria and sort options.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductReservationFactory.GetProductReservations(handler : handler,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductReservationCollection GetPr
 				 startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductReservationCollection GetPr
 		}
   
 		/// <summary> 
-		/// Retrieves the details of a product reservation.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductReservationFactory.GetProductReservation(handler : handler,  productReservationId :  productReservationId,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductReservation GetProductReser
 				 productReservationId :  productReservationId,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductReservation GetProductReser
 		}
   
 		/// <summary> 
-		/// Creates a new product reservation for a product. This action places a hold on the product inventory for the quantity specified during the ordering process.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductReservationFactory.AddProductReservations(handler : handler,  productReservations :  productReservations,  skipInventoryCheck :  skipInventoryCheck,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductReservation GetProductReser
 				 productReservations :  productReservations,  skipInventoryCheck :  skipInventoryCheck, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductReservation GetProductReser
 		}
   
 		/// <summary> 
-		/// Commits a product reservation to decrement the product's inventory by the quantity specified then release the reservation once the order process completed successfully.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductReservationFactory.CommitReservations(handler : handler,  productReservations :  productReservations, dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static void CommitReservations(ServiceClientMessageHandler handler,
 				 productReservations :  productReservations, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -181,7 +182,7 @@ public static void CommitReservations(ServiceClientMessageHandler handler,
 		}
   
 		/// <summary> 
-		/// Updates an existing product reservation for a product.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductReservationFactory.UpdateProductReservations(handler : handler,  productReservations :  productReservations,  skipInventoryCheck :  skipInventoryCheck,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -202,7 +203,7 @@ public static void CommitReservations(ServiceClientMessageHandler handler,
 				 productReservations :  productReservations,  skipInventoryCheck :  skipInventoryCheck, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -219,7 +220,7 @@ public static void CommitReservations(ServiceClientMessageHandler handler,
 		}
   
 		/// <summary> 
-		/// Deletes a product reservation. For example, delete a reservation when an order is not processed to return the product quantity back to inventory.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductReservationFactory.DeleteProductReservation(handler : handler,  productReservationId :  productReservationId,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -240,7 +241,7 @@ public static void DeleteProductReservation(ServiceClientMessageHandler handler,
 				 productReservationId :  productReservationId, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/LocationInventoryProductsFactory.cs b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/Products/LocationInventoryProductsFactory.cs
old mode 100644
new mode 100755
similarity index 92%
rename from Mozu.Api.Test/Factories/LocationInventoryProductsFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Catalog/Admin/Products/LocationInventoryProductsFactory.cs
index 1dee1d6b..a4d7c2f6
--- a/Mozu.Api.Test/Factories/LocationInventoryProductsFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/Products/LocationInventoryProductsFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Catalog.Admin.Products
 {
 	/// <summary>
 	/// Use the Product Location Inventory resource to manage the levels of active product inventory to maintain across defined locations at the product level.
@@ -30,7 +31,7 @@ public partial class LocationInventoryProductsFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves all locations for which a product has inventory defined and displays the inventory definition properties of each location.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = LocationInventoryFactory.GetLocationInventories(handler : handler,  productCode :  productCode,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.ProductAdmin.LocationInventoryCollection GetLoc
 				 productCode :  productCode,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.ProductAdmin.LocationInventoryCollection GetLoc
 		}
   
 		/// <summary> 
-		/// Retrieves the details of the inventory of the product in the location specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = LocationInventoryFactory.GetLocationInventory(handler : handler,  productCode :  productCode,  locationCode :  locationCode,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.ProductAdmin.LocationInventory GetLocationInven
 				 productCode :  productCode,  locationCode :  locationCode,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.ProductAdmin.LocationInventory GetLocationInven
 		}
   
 		/// <summary> 
-		/// Creates a new location inventory definition for the product code specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = LocationInventoryFactory.AddLocationInventory(handler : handler,  locationInventoryList :  locationInventoryList,  productCode :  productCode,  performUpserts :  performUpserts,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.ProductAdmin.LocationInventory GetLocationInven
 				 locationInventoryList :  locationInventoryList,  productCode :  productCode,  performUpserts :  performUpserts, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.ProductAdmin.LocationInventory GetLocationInven
 		}
   
 		/// <summary> 
-		/// Updates the current level of stock at each location associated with the product code specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = LocationInventoryFactory.UpdateLocationInventory(handler : handler,  locationInventoryAdjustments :  locationInventoryAdjustments,  productCode :  productCode,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static Mozu.Api.Contracts.ProductAdmin.LocationInventory GetLocationInven
 				 locationInventoryAdjustments :  locationInventoryAdjustments,  productCode :  productCode, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -182,7 +183,7 @@ public static Mozu.Api.Contracts.ProductAdmin.LocationInventory GetLocationInven
 		}
   
 		/// <summary> 
-		/// Deletes the location inventory definition for the product code specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = LocationInventoryFactory.DeleteLocationInventory(handler : handler,  productCode :  productCode,  locationCode :  locationCode,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -203,7 +204,7 @@ public static void DeleteLocationInventory(ServiceClientMessageHandler handler,
 				 productCode :  productCode,  locationCode :  locationCode, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/ProductExtraFactory.cs b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/Products/ProductExtraFactory.cs
old mode 100644
new mode 100755
similarity index 90%
rename from Mozu.Api.Test/Factories/ProductExtraFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Catalog/Admin/Products/ProductExtraFactory.cs
index 64d5c4c6..03e3f9c9
--- a/Mozu.Api.Test/Factories/ProductExtraFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/Products/ProductExtraFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Catalog.Admin.Products
 {
 	/// <summary>
 	/// Use the Extras resource to configure an extra product attribute for products associated with the product type that uses the extra attribute.
@@ -30,7 +31,7 @@ public partial class ProductExtraFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a list of extras configured for the product according to any defined filter and sort criteria.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductExtraFactory.GetExtras(handler : handler,  productCode :  productCode,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public partial class ProductExtraFactory : BaseDataFactory
 				 productCode :  productCode, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public partial class ProductExtraFactory : BaseDataFactory
 		}
   
 		/// <summary> 
-		/// Retrieves a collection of all localized delta price values for a product extra. Localized delta prices are deltas between two differing monetary conversion amounts between countries, such as US Dollar vs Euro.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductExtraFactory.GetExtraValueLocalizedDeltaPrices(handler : handler,  productCode :  productCode,  attributeFQN :  attributeFQN,  value :  value,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public partial class ProductExtraFactory : BaseDataFactory
 				 productCode :  productCode,  attributeFQN :  attributeFQN,  value :  value, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public partial class ProductExtraFactory : BaseDataFactory
 		}
   
 		/// <summary> 
-		/// Retrieves the localized delta price value for a product extra. Localized delta prices are deltas between two differing monetary conversion amounts between countries, such as US Dollar vs Euro.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductExtraFactory.GetExtraValueLocalizedDeltaPrice(handler : handler,  productCode :  productCode,  attributeFQN :  attributeFQN,  value :  value,  currencyCode :  currencyCode,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductExtraValueDeltaPrice GetExt
 				 productCode :  productCode,  attributeFQN :  attributeFQN,  value :  value,  currencyCode :  currencyCode,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductExtraValueDeltaPrice GetExt
 		}
   
 		/// <summary> 
-		/// Retrieves the details of an extra attribute configuration for the product specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductExtraFactory.GetExtra(handler : handler,  productCode :  productCode,  attributeFQN :  attributeFQN,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductExtra GetExtra(ServiceClien
 				 productCode :  productCode,  attributeFQN :  attributeFQN,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -182,7 +183,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductExtra GetExtra(ServiceClien
 		}
   
 		/// <summary> 
-		/// Adds a localized delta price value for a product extra. Localized delta prices are deltas between two differing monetary conversion amounts between countries, such as US Dollar vs Euro.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductExtraFactory.AddExtraValueLocalizedDeltaPrice(handler : handler,  localizedDeltaPrice :  localizedDeltaPrice,  productCode :  productCode,  attributeFQN :  attributeFQN,  value :  value,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -203,7 +204,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductExtraValueDeltaPrice AddExt
 				 localizedDeltaPrice :  localizedDeltaPrice,  productCode :  productCode,  attributeFQN :  attributeFQN,  value :  value,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -220,7 +221,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductExtraValueDeltaPrice AddExt
 		}
   
 		/// <summary> 
-		/// Configure an extra attribute for the product specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductExtraFactory.AddExtra(handler : handler,  productExtra :  productExtra,  productCode :  productCode,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -241,7 +242,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductExtra AddExtra(ServiceClien
 				 productExtra :  productExtra,  productCode :  productCode,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -258,7 +259,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductExtra AddExtra(ServiceClien
 		}
   
 		/// <summary> 
-		/// Updates all localized delta price values for a product extra. Localized delta prices are deltas between two differing monetary conversion amounts between countries, such as US Dollar vs Euro.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductExtraFactory.UpdateExtraValueLocalizedDeltaPrices(handler : handler,  localizedDeltaPrice :  localizedDeltaPrice,  productCode :  productCode,  attributeFQN :  attributeFQN,  value :  value,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -279,7 +280,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductExtra AddExtra(ServiceClien
 				 localizedDeltaPrice :  localizedDeltaPrice,  productCode :  productCode,  attributeFQN :  attributeFQN,  value :  value, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -296,7 +297,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductExtra AddExtra(ServiceClien
 		}
   
 		/// <summary> 
-		/// Updates the localized delta price value for a product extra. Localized delta prices are deltas between two differing monetary conversion amounts between countries, such as US Dollar vs Euro.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductExtraFactory.UpdateExtraValueLocalizedDeltaPrice(handler : handler,  localizedDeltaPrice :  localizedDeltaPrice,  productCode :  productCode,  attributeFQN :  attributeFQN,  value :  value,  currencyCode :  currencyCode,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -317,7 +318,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductExtraValueDeltaPrice Update
 				 localizedDeltaPrice :  localizedDeltaPrice,  productCode :  productCode,  attributeFQN :  attributeFQN,  value :  value,  currencyCode :  currencyCode,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -334,7 +335,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductExtraValueDeltaPrice Update
 		}
   
 		/// <summary> 
-		/// Updates the configuration of an extra attribute for the product specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductExtraFactory.UpdateExtra(handler : handler,  productExtra :  productExtra,  productCode :  productCode,  attributeFQN :  attributeFQN,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -355,7 +356,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductExtra UpdateExtra(ServiceCl
 				 productExtra :  productExtra,  productCode :  productCode,  attributeFQN :  attributeFQN,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -372,7 +373,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductExtra UpdateExtra(ServiceCl
 		}
   
 		/// <summary> 
-		/// Delete a product extra configuration for the product specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductExtraFactory.DeleteExtra(handler : handler,  productCode :  productCode,  attributeFQN :  attributeFQN,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -393,7 +394,7 @@ public static void DeleteExtra(ServiceClientMessageHandler handler,
 				 productCode :  productCode,  attributeFQN :  attributeFQN, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -409,7 +410,7 @@ public static void DeleteExtra(ServiceClientMessageHandler handler,
 		}
   
 		/// <summary> 
-		/// Deletes the localized delta price value for a product extra. Localized delta prices are deltas between two differing monetary conversion amounts between countries, such as US Dollar vs Euro.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductExtraFactory.DeleteExtraValueLocalizedDeltaPrice(handler : handler,  productCode :  productCode,  attributeFQN :  attributeFQN,  value :  value,  currencyCode :  currencyCode,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -430,7 +431,7 @@ public static void DeleteExtraValueLocalizedDeltaPrice(ServiceClientMessageHandl
 				 productCode :  productCode,  attributeFQN :  attributeFQN,  value :  value,  currencyCode :  currencyCode, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/ProductOptionFactory.cs b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/Products/ProductOptionFactory.cs
old mode 100644
new mode 100755
similarity index 92%
rename from Mozu.Api.Test/Factories/ProductOptionFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Catalog/Admin/Products/ProductOptionFactory.cs
index 34b621b2..51e60eee
--- a/Mozu.Api.Test/Factories/ProductOptionFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/Products/ProductOptionFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Catalog.Admin.Products
 {
 	/// <summary>
 	/// Use the Options resource to configure the option attributes and vocabulary values for an individual product associated with the product type that uses the option attribute. Options are used to generate variations of a product.
@@ -30,7 +31,7 @@ public partial class ProductOptionFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a list of all option attributes configured for the product specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductOptionFactory.GetOptions(handler : handler,  productCode :  productCode,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public partial class ProductOptionFactory : BaseDataFactory
 				 productCode :  productCode, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public partial class ProductOptionFactory : BaseDataFactory
 		}
   
 		/// <summary> 
-		/// Retrieves the details of an option attribute configuration for the specified product.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductOptionFactory.GetOption(handler : handler,  productCode :  productCode,  attributeFQN :  attributeFQN,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductOption GetOption(ServiceCli
 				 productCode :  productCode,  attributeFQN :  attributeFQN,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductOption GetOption(ServiceCli
 		}
   
 		/// <summary> 
-		/// Configures an option attribute for the product specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductOptionFactory.AddOption(handler : handler,  productOption :  productOption,  productCode :  productCode,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductOption AddOption(ServiceCli
 				 productOption :  productOption,  productCode :  productCode,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductOption AddOption(ServiceCli
 		}
   
 		/// <summary> 
-		/// Updates one or more properties of an option attribute configured for a product.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductOptionFactory.UpdateOption(handler : handler,  productOption :  productOption,  productCode :  productCode,  attributeFQN :  attributeFQN,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductOption UpdateOption(Service
 				 productOption :  productOption,  productCode :  productCode,  attributeFQN :  attributeFQN,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -182,7 +183,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductOption UpdateOption(Service
 		}
   
 		/// <summary> 
-		/// Deletes the configuration of an option attribute for the product specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductOptionFactory.DeleteOption(handler : handler,  productCode :  productCode,  attributeFQN :  attributeFQN,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -203,7 +204,7 @@ public static void DeleteOption(ServiceClientMessageHandler handler,
 				 productCode :  productCode,  attributeFQN :  attributeFQN, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/ProductPropertyFactory.cs b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/Products/ProductPropertyFactory.cs
old mode 100644
new mode 100755
similarity index 92%
rename from Mozu.Api.Test/Factories/ProductPropertyFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Catalog/Admin/Products/ProductPropertyFactory.cs
index 4390cb10..1c99557b
--- a/Mozu.Api.Test/Factories/ProductPropertyFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/Products/ProductPropertyFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Catalog.Admin.Products
 {
 	/// <summary>
 	/// Use the Properties resource to configure a property attribute for an individual product associated with a product type that uses the property attribute, as well as set property values for the product.
@@ -30,7 +31,7 @@ public partial class ProductPropertyFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a list of the property attributes configured for the product specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductPropertyFactory.GetProperties(handler : handler,  productCode :  productCode,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public partial class ProductPropertyFactory : BaseDataFactory
 				 productCode :  productCode, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public partial class ProductPropertyFactory : BaseDataFactory
 		}
   
 		/// <summary> 
-		/// Retrieves a collection of property values for localized content. This content is set by the locale code. 
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductPropertyFactory.GetPropertyValueLocalizedContents(handler : handler,  productCode :  productCode,  attributeFQN :  attributeFQN,  value :  value,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public partial class ProductPropertyFactory : BaseDataFactory
 				 productCode :  productCode,  attributeFQN :  attributeFQN,  value :  value, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public partial class ProductPropertyFactory : BaseDataFactory
 		}
   
 		/// <summary> 
-		/// Retrieves the property value for localized content. This content is set by the locale code. 
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductPropertyFactory.GetPropertyValueLocalizedContent(handler : handler,  productCode :  productCode,  attributeFQN :  attributeFQN,  value :  value,  localeCode :  localeCode,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductPropertyValueLocalizedConte
 				 productCode :  productCode,  attributeFQN :  attributeFQN,  value :  value,  localeCode :  localeCode,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductPropertyValueLocalizedConte
 		}
   
 		/// <summary> 
-		/// Retrieves the details of a property attribute configuration for the product specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductPropertyFactory.GetProperty(handler : handler,  productCode :  productCode,  attributeFQN :  attributeFQN,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductProperty GetProperty(Servic
 				 productCode :  productCode,  attributeFQN :  attributeFQN,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -182,7 +183,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductProperty GetProperty(Servic
 		}
   
 		/// <summary> 
-		/// Adds a property value for localized content. This content is set by the locale code. 
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductPropertyFactory.AddPropertyValueLocalizedContent(handler : handler,  localizedContent :  localizedContent,  productCode :  productCode,  attributeFQN :  attributeFQN,  value :  value,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -203,7 +204,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductPropertyValueLocalizedConte
 				 localizedContent :  localizedContent,  productCode :  productCode,  attributeFQN :  attributeFQN,  value :  value,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -220,7 +221,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductPropertyValueLocalizedConte
 		}
   
 		/// <summary> 
-		/// Configures a property attribute for the product specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductPropertyFactory.AddProperty(handler : handler,  productProperty :  productProperty,  productCode :  productCode,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -241,7 +242,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductProperty AddProperty(Servic
 				 productProperty :  productProperty,  productCode :  productCode,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -258,7 +259,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductProperty AddProperty(Servic
 		}
   
 		/// <summary> 
-		/// Updates all property values for localized content. This content is set by the locale code. 
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductPropertyFactory.UpdatePropertyValueLocalizedContents(handler : handler,  localizedContent :  localizedContent,  productCode :  productCode,  attributeFQN :  attributeFQN,  value :  value,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -279,7 +280,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductProperty AddProperty(Servic
 				 localizedContent :  localizedContent,  productCode :  productCode,  attributeFQN :  attributeFQN,  value :  value, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -296,7 +297,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductProperty AddProperty(Servic
 		}
   
 		/// <summary> 
-		/// Updates the property value for localized content. This content is set by the locale code. 
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductPropertyFactory.UpdatePropertyValueLocalizedContent(handler : handler,  localizedContent :  localizedContent,  productCode :  productCode,  attributeFQN :  attributeFQN,  value :  value,  localeCode :  localeCode,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -317,7 +318,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductPropertyValueLocalizedConte
 				 localizedContent :  localizedContent,  productCode :  productCode,  attributeFQN :  attributeFQN,  value :  value,  localeCode :  localeCode,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -334,7 +335,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductPropertyValueLocalizedConte
 		}
   
 		/// <summary> 
-		/// Update one or more details of a property attribute configuration for the product specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductPropertyFactory.UpdateProperty(handler : handler,  productProperty :  productProperty,  productCode :  productCode,  attributeFQN :  attributeFQN,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -355,7 +356,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductProperty UpdateProperty(Ser
 				 productProperty :  productProperty,  productCode :  productCode,  attributeFQN :  attributeFQN,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -372,7 +373,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductProperty UpdateProperty(Ser
 		}
   
 		/// <summary> 
-		/// Deletes the configuration of a property attribute for the product specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductPropertyFactory.DeleteProperty(handler : handler,  productCode :  productCode,  attributeFQN :  attributeFQN,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -393,7 +394,7 @@ public static void DeleteProperty(ServiceClientMessageHandler handler,
 				 productCode :  productCode,  attributeFQN :  attributeFQN, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -409,7 +410,7 @@ public static void DeleteProperty(ServiceClientMessageHandler handler,
 		}
   
 		/// <summary> 
-		/// Deletes the property value for localized content. This content is set by the locale code. 
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductPropertyFactory.DeletePropertyValueLocalizedContent(handler : handler,  productCode :  productCode,  attributeFQN :  attributeFQN,  value :  value,  localeCode :  localeCode,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -430,7 +431,7 @@ public static void DeletePropertyValueLocalizedContent(ServiceClientMessageHandl
 				 productCode :  productCode,  attributeFQN :  attributeFQN,  value :  value,  localeCode :  localeCode, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/ProductVariationFactory.cs b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/Products/ProductVariationFactory.cs
old mode 100644
new mode 100755
similarity index 90%
rename from Mozu.Api.Test/Factories/ProductVariationFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Catalog/Admin/Products/ProductVariationFactory.cs
index c50c8b29..dfa3109c
--- a/Mozu.Api.Test/Factories/ProductVariationFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/Products/ProductVariationFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Catalog.Admin.Products
 {
 	/// <summary>
 	/// Use the product variations sub-resource to manage the variations of a product based on its attributes. For example, a t-shirt product could be offered in six variations: Small Black, Medium Black, Large Black, Small White, Medium White, and Large White.
@@ -30,7 +31,7 @@ public partial class ProductVariationFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a collection of the localized delta price values for a product variation. Localized delta prices are deltas between two differing monetary conversion amounts between countries, such as US Dollar vs Euro.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductVariationFactory.GetProductVariationLocalizedDeltaPrices(handler : handler,  productCode :  productCode,  variationKey :  variationKey,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public partial class ProductVariationFactory : BaseDataFactory
 				 productCode :  productCode,  variationKey :  variationKey, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public partial class ProductVariationFactory : BaseDataFactory
 		}
   
 		/// <summary> 
-		/// Retrieves the localized delta price value for a product variation. Localized delta prices are deltas between two differing monetary conversion amounts between countries, such as US Dollar vs Euro.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductVariationFactory.GetProductVariationLocalizedDeltaPrice(handler : handler,  productCode :  productCode,  variationKey :  variationKey,  currencyCode :  currencyCode,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice GetProd
 				 productCode :  productCode,  variationKey :  variationKey,  currencyCode :  currencyCode,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice GetProd
 		}
   
 		/// <summary> 
-		/// Retrieves a list of details of the localized price values for a product variation.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductVariationFactory.GetProductVariationLocalizedPrices(handler : handler,  productCode :  productCode,  variationKey :  variationKey,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice GetProd
 				 productCode :  productCode,  variationKey :  variationKey, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice GetProd
 		}
   
 		/// <summary> 
-		/// Retrieves the details of the localized price value for a product variation and a specific localized currency.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductVariationFactory.GetProductVariationLocalizedPrice(handler : handler,  productCode :  productCode,  variationKey :  variationKey,  currencyCode :  currencyCode,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice GetProd
 				 productCode :  productCode,  variationKey :  variationKey,  currencyCode :  currencyCode,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -182,7 +183,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice GetProd
 		}
   
 		/// <summary> 
-		/// Retrieves the details of a product variation based on the supplied product code and variation key.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductVariationFactory.GetProductVariation(handler : handler,  productCode :  productCode,  variationKey :  variationKey,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -203,7 +204,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductVariation GetProductVariati
 				 productCode :  productCode,  variationKey :  variationKey,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -220,7 +221,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductVariation GetProductVariati
 		}
   
 		/// <summary> 
-		/// Retrieves a list of the product variations configured for the specified product code.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductVariationFactory.GetProductVariations(handler : handler,  productCode :  productCode,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -241,7 +242,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductVariationPagedCollection Ge
 				 productCode :  productCode,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -258,7 +259,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductVariationPagedCollection Ge
 		}
   
 		/// <summary> 
-		/// Adds the localized delta price value for a product variation. Localized delta prices are deltas between two differing monetary conversion amounts between countries, such as US Dollar vs Euro.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductVariationFactory.AddProductVariationLocalizedDeltaPrice(handler : handler,  localizedDeltaPrice :  localizedDeltaPrice,  productCode :  productCode,  variationKey :  variationKey,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -279,7 +280,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice AddProd
 				 localizedDeltaPrice :  localizedDeltaPrice,  productCode :  productCode,  variationKey :  variationKey,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -296,7 +297,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice AddProd
 		}
   
 		/// <summary> 
-		/// Adds the localized price value for a product variation and a specific localized currency.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductVariationFactory.AddProductVariationLocalizedPrice(handler : handler,  localizedPrice :  localizedPrice,  productCode :  productCode,  variationKey :  variationKey,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -317,7 +318,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice AddProd
 				 localizedPrice :  localizedPrice,  productCode :  productCode,  variationKey :  variationKey,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -334,7 +335,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice AddProd
 		}
   
 		/// <summary> 
-		/// Updates all localized delta price values for a product variation. Localized delta prices are deltas between two differing monetary conversion amounts between countries, such as US Dollar vs Euro.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductVariationFactory.UpdateProductVariationLocalizedDeltaPrices(handler : handler,  localizedDeltaPrice :  localizedDeltaPrice,  productCode :  productCode,  variationKey :  variationKey,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -355,7 +356,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice AddProd
 				 localizedDeltaPrice :  localizedDeltaPrice,  productCode :  productCode,  variationKey :  variationKey, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -372,7 +373,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice AddProd
 		}
   
 		/// <summary> 
-		/// Updates the localized delta price value for a product variation. Localized delta prices are deltas between two differing monetary conversion amounts between countries, such as US Dollar vs Euro.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductVariationFactory.UpdateProductVariationLocalizedDeltaPrice(handler : handler,  localizedDeltaPrice :  localizedDeltaPrice,  productCode :  productCode,  variationKey :  variationKey,  currencyCode :  currencyCode,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -393,7 +394,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice UpdateP
 				 localizedDeltaPrice :  localizedDeltaPrice,  productCode :  productCode,  variationKey :  variationKey,  currencyCode :  currencyCode,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -410,7 +411,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice UpdateP
 		}
   
 		/// <summary> 
-		/// Updates a list of localized price values for a product variation.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductVariationFactory.UpdateProductVariationLocalizedPrices(handler : handler,  localizedPrice :  localizedPrice,  productCode :  productCode,  variationKey :  variationKey,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -431,7 +432,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice UpdateP
 				 localizedPrice :  localizedPrice,  productCode :  productCode,  variationKey :  variationKey, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -448,7 +449,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice UpdateP
 		}
   
 		/// <summary> 
-		/// Updates the localized price value for a product variation and a specific localized currency.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductVariationFactory.UpdateProductVariationLocalizedPrice(handler : handler,  localizedPrice :  localizedPrice,  productCode :  productCode,  variationKey :  variationKey,  currencyCode :  currencyCode,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -469,7 +470,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice UpdateP
 				 localizedPrice :  localizedPrice,  productCode :  productCode,  variationKey :  variationKey,  currencyCode :  currencyCode,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -486,7 +487,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice UpdateP
 		}
   
 		/// <summary> 
-		/// Modifies the details of a variation, based on the supplied variation key, for the specified product code.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductVariationFactory.UpdateProductVariation(handler : handler,  productVariation :  productVariation,  productCode :  productCode,  variationKey :  variationKey,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -507,7 +508,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductVariation UpdateProductVari
 				 productVariation :  productVariation,  productCode :  productCode,  variationKey :  variationKey,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -524,7 +525,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductVariation UpdateProductVari
 		}
   
 		/// <summary> 
-		/// Modifies the collection of variations for the specified product code. Because this PUT replaces the existing resource, supply all information necessary to maintain for the product variation.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductVariationFactory.UpdateProductVariations(handler : handler,  productVariations :  productVariations,  productCode :  productCode,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -545,7 +546,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductVariationCollection UpdateP
 				 productVariations :  productVariations,  productCode :  productCode,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -562,7 +563,7 @@ public static Mozu.Api.Contracts.ProductAdmin.ProductVariationCollection UpdateP
 		}
   
 		/// <summary> 
-		/// Deletes a variation, based on the supplied variation key, for the specified product code.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductVariationFactory.DeleteProductVariation(handler : handler,  productCode :  productCode,  variationKey :  variationKey,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -583,7 +584,7 @@ public static void DeleteProductVariation(ServiceClientMessageHandler handler,
 				 productCode :  productCode,  variationKey :  variationKey, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -599,7 +600,7 @@ public static void DeleteProductVariation(ServiceClientMessageHandler handler,
 		}
   
 		/// <summary> 
-		/// Deletes the localized delta price value for a product variation. Localized delta prices are deltas between two differing monetary conversion amounts between countries, such as US Dollar vs Euro.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductVariationFactory.DeleteProductVariationLocalizedDeltaPrice(handler : handler,  productCode :  productCode,  variationKey :  variationKey,  currencyCode :  currencyCode,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -620,7 +621,7 @@ public static void DeleteProductVariationLocalizedDeltaPrice(ServiceClientMessag
 				 productCode :  productCode,  variationKey :  variationKey,  currencyCode :  currencyCode, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -636,7 +637,7 @@ public static void DeleteProductVariationLocalizedDeltaPrice(ServiceClientMessag
 		}
   
 		/// <summary> 
-		/// Deletes the localized price value for a product variation and a specific localized currency.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductVariationFactory.DeleteProductVariationLocalizedPrice(handler : handler,  productCode :  productCode,  variationKey :  variationKey,  currencyCode :  currencyCode,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -657,7 +658,7 @@ public static void DeleteProductVariationLocalizedPrice(ServiceClientMessageHand
 				 productCode :  productCode,  variationKey :  variationKey,  currencyCode :  currencyCode, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/PublishingScopeFactory.cs b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/PublishingScopeFactory.cs
old mode 100644
new mode 100755
similarity index 87%
rename from Mozu.Api.Test/Factories/PublishingScopeFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Catalog/Admin/PublishingScopeFactory.cs
index e1748fcb..9ca61746
--- a/Mozu.Api.Test/Factories/PublishingScopeFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/PublishingScopeFactory.cs
@@ -18,19 +18,20 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Catalog.Admin
 {
 	/// <summary>
-	/// Use the Product Publishing resource to publish or discard pending changes to products in a master catalog, or to add or remove pending changes to and from product publish sets.You can use product publish sets to group pending product changes together and publish them all at the same time.
+	/// Use the Product Publishing resource to publish or discard pending changes to product definitions in the master catalog.
 	/// </summary>
 	public partial class PublishingScopeFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves the details of the specified product publish set.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = PublishingScopeFactory.GetPublishSet(handler : handler,  publishSetCode :  publishSetCode,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.ProductAdmin.PublishSet GetPublishSet(ServiceCl
 				 publishSetCode :  publishSetCode,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.ProductAdmin.PublishSet GetPublishSet(ServiceCl
 		}
   
 		/// <summary> 
-		/// Retrieves a list of product publish sets and their properties, including the amount of pending product changes that are included in each one.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = PublishingScopeFactory.GetPublishSets(handler : handler,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.ProductAdmin.PublishSetCollection GetPublishSet
 				 responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.ProductAdmin.PublishSetCollection GetPublishSet
 		}
   
 		/// <summary> 
-		/// Deletes the draft version of product changes (pending product changes) for each product code specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = PublishingScopeFactory.DiscardDrafts(handler : handler,  publishScope :  publishScope, dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static void DiscardDrafts(ServiceClientMessageHandler handler,
 				 publishScope :  publishScope, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -143,7 +144,7 @@ public static void DiscardDrafts(ServiceClientMessageHandler handler,
 		}
   
 		/// <summary> 
-		/// Publishes the draft version of product changes (pending product changes) for each product code specified in the request, and changes the product publish state to "live".
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = PublishingScopeFactory.PublishDrafts(handler : handler,  publishScope :  publishScope, dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -164,7 +165,7 @@ public static void PublishDrafts(ServiceClientMessageHandler handler,
 				 publishScope :  publishScope, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -180,7 +181,7 @@ public static void PublishDrafts(ServiceClientMessageHandler handler,
 		}
   
 		/// <summary> 
-		/// Assigns pending product changes to a specified product publish set. Use the code field to specify the product publish set.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = PublishingScopeFactory.AssignProductsToPublishSet(handler : handler,  publishSet :  publishSet,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -201,7 +202,7 @@ public static Mozu.Api.Contracts.ProductAdmin.PublishSet AssignProductsToPublish
 				 publishSet :  publishSet,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -218,7 +219,7 @@ public static Mozu.Api.Contracts.ProductAdmin.PublishSet AssignProductsToPublish
 		}
   
 		/// <summary> 
-		/// Deletes the specified product publish set. If you set the discardDrafts parameter to true, this operation also deletes the product drafts assigned to the publish set.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = PublishingScopeFactory.DeletePublishSet(handler : handler,  publishSetCode :  publishSetCode,  discardDrafts :  discardDrafts,  expectedCode: expectedCode, successCode: successCode); 
@@ -239,7 +240,7 @@ public static void DeletePublishSet(ServiceClientMessageHandler handler,
 				 publishSetCode :  publishSetCode,  discardDrafts :  discardDrafts		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/SearchFactory.cs b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/SearchFactory.cs
old mode 100644
new mode 100755
similarity index 87%
rename from Mozu.Api.Test/Factories/SearchFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Catalog/Admin/SearchFactory.cs
index 95141fd6..d8efef63
--- a/Mozu.Api.Test/Factories/SearchFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/SearchFactory.cs
@@ -18,19 +18,20 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Catalog.Admin
 {
 	/// <summary>
-	/// Use the Search resource to manage all settings and options for providing product search on your site, as well as search tuning rules.
+	/// 
 	/// </summary>
 	public partial class SearchFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves the details of the specified search tuning rule.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = SearchFactory.GetSearchTuningRule(handler : handler,  searchTuningRuleCode :  searchTuningRuleCode,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRule GetSearchT
 				 searchTuningRuleCode :  searchTuningRuleCode,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRule GetSearchT
 		}
   
 		/// <summary> 
-		/// Retrieves a list of search tuning rules and their properties.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = SearchFactory.GetSearchTuningRules(handler : handler,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRuleCollection
 				 startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRuleCollection
 		}
   
 		/// <summary> 
-		/// Retrieves the details of the specified search tuning rule sort fields. Sort fields allow you to control the product relevance whenver shoppers sort products on a page. For more information about sort relevance, refer to [Search Tuning Rules and Sorting](../../../developer/api-guides/search-tuning-rules.htm#search_tuning_rules_and_sorting).
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = SearchFactory.GetSearchTuningRuleSortFields(handler : handler,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRuleSortFields
 				 responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRuleSortFields
 		}
   
 		/// <summary> 
-		/// Retrieves the search settings for the specified site.Refer to [Search Settings API Overview](../../../../developer/api-guides/search-settings.htm) for more information about 's search settings.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = SearchFactory.GetSettings(handler : handler,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static Mozu.Api.Contracts.ProductAdmin.SearchSettings GetSettings(Service
 				 responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -182,7 +183,7 @@ public static Mozu.Api.Contracts.ProductAdmin.SearchSettings GetSettings(Service
 		}
   
 		/// <summary> 
-		/// Retrieves a collection of synonyms definitions for product searches.Refer to [Search Synonyms](../../../../developer/api-guides/search-settings.htm#search_synonyms) for more information about search synonyms.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = SearchFactory.GetSynonymDefinitionCollection(handler : handler,  localeCode :  localeCode,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -203,7 +204,7 @@ public static Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinitionCollection
 				 localeCode :  localeCode,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -220,7 +221,7 @@ public static Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinitionCollection
 		}
   
 		/// <summary> 
-		/// Retrieves a list of synonym definitions according to any specified filter criteria and sort options.Refer to [Search Synonyms](../../../../developer/api-guides/search-settings.htm#search_synonyms) for more information about search synonyms.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = SearchFactory.GetSynonymDefinitions(handler : handler,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -241,7 +242,7 @@ public static Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinitionPagedColle
 				 startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -258,7 +259,7 @@ public static Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinitionPagedColle
 		}
   
 		/// <summary> 
-		/// Retrieves the details of the specified synonym defintion.Refer to [Search Synonyms](../../../../developer/api-guides/search-settings.htm#search_synonyms) for more information about search synonyms.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = SearchFactory.GetSynonymDefinition(handler : handler,  synonymId :  synonymId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -279,7 +280,7 @@ public static Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinition GetSynony
 				 synonymId :  synonymId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -296,7 +297,7 @@ public static Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinition GetSynony
 		}
   
 		/// <summary> 
-		/// Creates a search tuning rule for your site. You can use search tuning rules to fine tune the product search results that appear when a shopper searches for a specific keyword, or navigates to a category page.For more information on search tuning rules, refer to [Search Tuning Rules](../../../../developer/api-guides/search-tuning-rules.htm).
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = SearchFactory.AddSearchTuningRule(handler : handler,  searchTuningRuleIn :  searchTuningRuleIn,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -317,7 +318,7 @@ public static Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRule AddSearchT
 				 searchTuningRuleIn :  searchTuningRuleIn,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -334,7 +335,7 @@ public static Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRule AddSearchT
 		}
   
 		/// <summary> 
-		/// Updates the details of the search tuning rule sort fields.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = SearchFactory.UpdateSearchTuningRuleSortFields(handler : handler,  searchTuningRuleSortFieldsIn :  searchTuningRuleSortFieldsIn,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -355,7 +356,7 @@ public static Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRuleSortFields
 				 searchTuningRuleSortFieldsIn :  searchTuningRuleSortFieldsIn,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -372,7 +373,7 @@ public static Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRuleSortFields
 		}
   
 		/// <summary> 
-		/// Updates a collection of synonym definitions.Refer to [Search Synonyms](../../../../developer/api-guides/search-settings.htm#search_synonyms) for more information about search synonyms.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = SearchFactory.UpdateSynonymDefinitionCollection(handler : handler,  collection :  collection,  localeCode :  localeCode,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -393,7 +394,7 @@ public static Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinitionCollection
 				 collection :  collection,  localeCode :  localeCode,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -410,7 +411,7 @@ public static Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinitionCollection
 		}
   
 		/// <summary> 
-		/// Creates a new synonym definition.Refer to [Search Synonyms](../../../../developer/api-guides/search-settings.htm#search_synonyms) for more information about search synonyms.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = SearchFactory.AddSynonymDefinition(handler : handler,  synonymDefinition :  synonymDefinition,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -431,7 +432,7 @@ public static Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinition AddSynony
 				 synonymDefinition :  synonymDefinition,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -448,7 +449,7 @@ public static Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinition AddSynony
 		}
   
 		/// <summary> 
-		/// Updates the details of the specified search tuning rule.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = SearchFactory.UpdateSearchTuningRule(handler : handler,  searchTuningRuleIn :  searchTuningRuleIn,  searchTuningRuleCode :  searchTuningRuleCode,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -469,7 +470,7 @@ public static Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRule UpdateSear
 				 searchTuningRuleIn :  searchTuningRuleIn,  searchTuningRuleCode :  searchTuningRuleCode,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -486,7 +487,7 @@ public static Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRule UpdateSear
 		}
   
 		/// <summary> 
-		/// Updates the search setting properties for a specific site.Refer to [Search Settings API Overview](../../../../developer/api-guides/search-settings.htm) for more information about 's search settings.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = SearchFactory.UpdateSettings(handler : handler,  settings :  settings,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -507,7 +508,7 @@ public static Mozu.Api.Contracts.ProductAdmin.SearchSettings UpdateSettings(Serv
 				 settings :  settings,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -524,7 +525,7 @@ public static Mozu.Api.Contracts.ProductAdmin.SearchSettings UpdateSettings(Serv
 		}
   
 		/// <summary> 
-		/// Updates the details of a synonym definition.Refer to [Search Synonyms](../../../../developer/api-guides/search-settings.htm#search_synonyms) for more information about search synonyms.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = SearchFactory.UpdateSynonymDefinition(handler : handler,  synonymDefinition :  synonymDefinition,  synonymId :  synonymId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -545,7 +546,7 @@ public static Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinition UpdateSyn
 				 synonymDefinition :  synonymDefinition,  synonymId :  synonymId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -562,7 +563,7 @@ public static Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinition UpdateSyn
 		}
   
 		/// <summary> 
-		/// Deletes the specified search tuning rule from the site.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = SearchFactory.DeleteSearchTuningRule(handler : handler,  searchTuningRuleCode :  searchTuningRuleCode,  expectedCode: expectedCode, successCode: successCode); 
@@ -583,7 +584,7 @@ public static void DeleteSearchTuningRule(ServiceClientMessageHandler handler,
 				 searchTuningRuleCode :  searchTuningRuleCode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -599,7 +600,7 @@ public static void DeleteSearchTuningRule(ServiceClientMessageHandler handler,
 		}
   
 		/// <summary> 
-		/// Deletes the specified synonym definition.Refer to [Search Synonyms](../../../../developer/api-guides/search-settings.htm#search_synonyms) for more information about search synonyms.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = SearchFactory.DeleteSynonymDefinition(handler : handler,  synonymId :  synonymId,  expectedCode: expectedCode, successCode: successCode); 
@@ -620,7 +621,7 @@ public static void DeleteSynonymDefinition(ServiceClientMessageHandler handler,
 				 synonymId :  synonymId		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/SoftAllocationFactory.cs b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/SoftAllocationFactory.cs
old mode 100644
new mode 100755
similarity index 88%
rename from Mozu.Api.Test/Factories/SoftAllocationFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Catalog/Admin/SoftAllocationFactory.cs
index 85177305..c794943e
--- a/Mozu.Api.Test/Factories/SoftAllocationFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Catalog/Admin/SoftAllocationFactory.cs
@@ -18,19 +18,20 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Catalog.Admin
 {
 	/// <summary>
-	/// The Soft Allocations resource allows you to temporarily hold a product from inventory while a shopper is filling out payment information. You create a product reservation when a shopper proceeds to check out and then release the reservation when the order process is complete.
+	/// 
 	/// </summary>
 	public partial class SoftAllocationFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a list of sof allocations according to any specified filter criteria and sort options.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = SoftAllocationFactory.GetSoftAllocations(handler : handler,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.ProductAdmin.SoftAllocationCollection GetSoftAl
 				 startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.ProductAdmin.SoftAllocationCollection GetSoftAl
 		}
   
 		/// <summary> 
-		/// Retrieves the details of a soft allocation.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = SoftAllocationFactory.GetSoftAllocation(handler : handler,  softAllocationId :  softAllocationId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.ProductAdmin.SoftAllocation GetSoftAllocation(S
 				 softAllocationId :  softAllocationId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.ProductAdmin.SoftAllocation GetSoftAllocation(S
 		}
   
 		/// <summary> 
-		/// Creates a new soft allocation for a product. This places a hold on the product inventory for the quantity specified during the ordering process.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = SoftAllocationFactory.AddSoftAllocations(handler : handler,  softAllocationsIn :  softAllocationsIn,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.ProductAdmin.SoftAllocation GetSoftAllocation(S
 				 softAllocationsIn :  softAllocationsIn		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.ProductAdmin.SoftAllocation GetSoftAllocation(S
 		}
   
 		/// <summary> 
-		/// Converts a set of existing soft product allocations into product reservations.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = SoftAllocationFactory.ConvertToProductReservation(handler : handler,  softAllocations :  softAllocations,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static Mozu.Api.Contracts.ProductAdmin.SoftAllocation GetSoftAllocation(S
 				 softAllocations :  softAllocations		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -182,7 +183,7 @@ public static Mozu.Api.Contracts.ProductAdmin.SoftAllocation GetSoftAllocation(S
 		}
   
 		/// <summary> 
-		/// Updates the expiration time for a set of soft allocations in a non-transactional batch.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = SoftAllocationFactory.RenewSoftAllocations(handler : handler,  softAllocationRenew :  softAllocationRenew,  expectedCode: expectedCode, successCode: successCode); 
@@ -203,7 +204,7 @@ public static Mozu.Api.Contracts.ProductAdmin.SoftAllocation GetSoftAllocation(S
 				 softAllocationRenew :  softAllocationRenew		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -220,7 +221,7 @@ public static Mozu.Api.Contracts.ProductAdmin.SoftAllocation GetSoftAllocation(S
 		}
   
 		/// <summary> 
-		/// Updates a soft allocation. This updates a hold on the product inventory for the quantity specified during the ordering process.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = SoftAllocationFactory.UpdateSoftAllocations(handler : handler,  softAllocations :  softAllocations,  expectedCode: expectedCode, successCode: successCode); 
@@ -241,7 +242,7 @@ public static Mozu.Api.Contracts.ProductAdmin.SoftAllocation GetSoftAllocation(S
 				 softAllocations :  softAllocations		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -258,7 +259,7 @@ public static Mozu.Api.Contracts.ProductAdmin.SoftAllocation GetSoftAllocation(S
 		}
   
 		/// <summary> 
-		/// Deletes a soft allocation. You might delete a soft allocation when an order or cart is not processed in order to return the product quantity back to inventory.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = SoftAllocationFactory.DeleteSoftAllocation(handler : handler,  softAllocationId :  softAllocationId,  expectedCode: expectedCode, successCode: successCode); 
@@ -279,7 +280,7 @@ public static void DeleteSoftAllocation(ServiceClientMessageHandler handler,
 				 softAllocationId :  softAllocationId		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/StorefrontCategoryFactory.cs b/Mozu.Api.Test/Factories/Commerce/Catalog/Storefront/StorefrontCategoryFactory.cs
old mode 100644
new mode 100755
similarity index 92%
rename from Mozu.Api.Test/Factories/StorefrontCategoryFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Catalog/Storefront/StorefrontCategoryFactory.cs
index 4a650817..3ad8c9b2
--- a/Mozu.Api.Test/Factories/StorefrontCategoryFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Catalog/Storefront/StorefrontCategoryFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Catalog.Storefront
 {
 	/// <summary>
 	/// Use the Storefront Categories resource to view the product category hierarchy as it appears to shoppers who are browsing the storefront. The hierarchy can be returned as a flat list or as a category tree.
@@ -30,7 +31,7 @@ public partial class StorefrontCategoryFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a list of categories according to any specified filter criteria and sort options.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CategoryFactory.GetCategories(handler : handler,  filter :  filter,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.ProductRuntime.CategoryPagedCollection GetCateg
 				 filter :  filter,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.ProductRuntime.CategoryPagedCollection GetCateg
 		}
   
 		/// <summary> 
-		/// Retrieves the details of a single category.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CategoryFactory.GetCategory(handler : handler,  categoryId :  categoryId,  allowInactive :  allowInactive,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.ProductRuntime.Category GetCategory(ServiceClie
 				 categoryId :  categoryId,  allowInactive :  allowInactive,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.ProductRuntime.Category GetCategory(ServiceClie
 		}
   
 		/// <summary> 
-		/// Retrieves the list of product categories that appear on the storefront organized in a hierarchical format. Hidden categories do not appear in the list.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CategoryFactory.GetCategoryTree(handler : handler,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.ProductRuntime.CategoryCollection GetCategoryTr
 				 responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/StorefrontOrderTaxContextFactory.cs b/Mozu.Api.Test/Factories/Commerce/Catalog/Storefront/StorefrontOrderTaxContextFactory.cs
old mode 100644
new mode 100755
similarity index 91%
rename from Mozu.Api.Test/Factories/StorefrontOrderTaxContextFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Catalog/Storefront/StorefrontOrderTaxContextFactory.cs
index 53fa3691..96279115
--- a/Mozu.Api.Test/Factories/StorefrontOrderTaxContextFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Catalog/Storefront/StorefrontOrderTaxContextFactory.cs
@@ -18,19 +18,20 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Catalog.Storefront
 {
 	/// <summary>
-	/// Use the Storefront Tax resource to retrieve tax information from the storefront.
+	/// 
 	/// </summary>
 	public partial class StorefrontOrderTaxContextFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves tax information applicable to the site.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = OrderTaxContextFactory.EstimateTaxes(handler : handler,  taxableOrder :  taxableOrder,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.PricingRuntime.OrderTaxContext EstimateTaxes(Se
 				 taxableOrder :  taxableOrder,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/StorefrontPriceListFactory.cs b/Mozu.Api.Test/Factories/Commerce/Catalog/Storefront/StorefrontPriceListFactory.cs
old mode 100644
new mode 100755
similarity index 86%
rename from Mozu.Api.Test/Factories/StorefrontPriceListFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Catalog/Storefront/StorefrontPriceListFactory.cs
index 56d13637..8d5ffb19
--- a/Mozu.Api.Test/Factories/StorefrontPriceListFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Catalog/Storefront/StorefrontPriceListFactory.cs
@@ -18,19 +18,20 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Catalog.Storefront
 {
 	/// <summary>
-	/// Retrieves the details of a price list. The details may contain a hierarchy of ancestor and/or descendant price lists dependening on your configuration.
+	/// 
 	/// </summary>
 	public partial class StorefrontPriceListFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves the details of the specified price list.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = PriceListFactory.GetPriceList(handler : handler,  priceListCode :  priceListCode,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.ProductRuntime.PriceList GetPriceList(ServiceCl
 				 priceListCode :  priceListCode,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.ProductRuntime.PriceList GetPriceList(ServiceCl
 		}
   
 		/// <summary> 
-		/// Retrieves the details of a price list to which the specified customer resolves. This is primarly used when creating an offline order for a shopper.You can use this operation alongside custom Arc.js actions to alter the price list to which a shopper resolves.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = PriceListFactory.GetResolvedPriceList(handler : handler,  customerAccountId :  customerAccountId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.ProductRuntime.ResolvedPriceList GetResolvedPri
 				 customerAccountId :  customerAccountId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/StorefrontProductFactory.cs b/Mozu.Api.Test/Factories/Commerce/Catalog/Storefront/StorefrontProductFactory.cs
old mode 100644
new mode 100755
similarity index 86%
rename from Mozu.Api.Test/Factories/StorefrontProductFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Catalog/Storefront/StorefrontProductFactory.cs
index a4bad7cf..1f41970d
--- a/Mozu.Api.Test/Factories/StorefrontProductFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Catalog/Storefront/StorefrontProductFactory.cs
@@ -18,19 +18,20 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Catalog.Storefront
 {
 	/// <summary>
-	/// Use the Storefront Products resource to manage the shopper product selection process during a visit to the web storefront. You can update product options as shoppers pick and choose their product choices. A shopper cannot add a product to a cart until all of its required options have been selected.
+	/// Use the Storefront Products  resource to manage the shopper product selection process during a visit to the web storefront. You can update product options as shoppers pick and choose their product choices. A shopper cannot add a product to a cart until all of its required options have been selected.
 	/// </summary>
 	public partial class StorefrontProductFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a list of products that appear on the web storefront according to any specified filter criteria and sort options.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductFactory.GetProducts(handler : handler,  filter :  filter,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  responseOptions :  responseOptions,  cursorMark :  cursorMark,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.ProductRuntime.ProductCollection GetProducts(Se
 				 filter :  filter,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  responseOptions :  responseOptions,  cursorMark :  cursorMark,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.ProductRuntime.ProductCollection GetProducts(Se
 		}
   
 		/// <summary> 
-		/// Retrieves the active inventory level information associated with the product or location specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductFactory.GetProductInventory(handler : handler,  productCode :  productCode,  locationCodes :  locationCodes,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.ProductRuntime.LocationInventoryCollection GetP
 				 productCode :  productCode,  locationCodes :  locationCodes,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,17 +107,17 @@ public static Mozu.Api.Contracts.ProductRuntime.LocationInventoryCollection GetP
 		}
   
 		/// <summary> 
-		/// Retrieves information about a single product given its product code.
+		/// 
 		/// <example> 
 		///  <code> 
-		/// var result = ProductFactory.GetProduct(handler : handler,  productCode :  productCode,  variationProductCode :  variationProductCode,  allowInactive :  allowInactive,  skipInventoryCheck :  skipInventoryCheck,  supressOutOfStock404 :  supressOutOfStock404,  quantity :  quantity,  acceptVariantProductCode :  acceptVariantProductCode,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
+		/// var result = ProductFactory.GetProduct(handler : handler,  productCode :  productCode,  variationProductCode :  variationProductCode,  allowInactive :  allowInactive,  skipInventoryCheck :  skipInventoryCheck,  supressOutOfStock404 :  supressOutOfStock404,  quantity :  quantity,  acceptVariantProductCode :  acceptVariantProductCode,  purchaseLocation :  purchaseLocation,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
 		/// var optionalCasting = ConvertClass<Product/>(result); 
 		/// return optionalCasting;
 		///  </code> 
 		/// </example> 
 		/// </summary>
 		public static Mozu.Api.Contracts.ProductRuntime.Product GetProduct(ServiceClientMessageHandler handler, 
- 		 string productCode, string variationProductCode = null, bool? allowInactive = null, bool? skipInventoryCheck = null, bool? supressOutOfStock404 = null, int? quantity = null, bool? acceptVariantProductCode = null, string responseFields = null,  DataViewMode dataViewMode= DataViewMode.Live, 
+ 		 string productCode, string variationProductCode = null, bool? allowInactive = null, bool? skipInventoryCheck = null, bool? supressOutOfStock404 = null, int? quantity = null, bool? acceptVariantProductCode = null, string purchaseLocation = null, string responseFields = null,  DataViewMode dataViewMode= DataViewMode.Live, 
 		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
 		{
 			SetSdKparameters();
@@ -124,10 +125,10 @@ public static Mozu.Api.Contracts.ProductRuntime.Product GetProduct(ServiceClient
 			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
 			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
 			var apiClient = Mozu.Api.Clients.Commerce.Catalog.Storefront.ProductClient.GetProductClient(
-				 productCode :  productCode,  variationProductCode :  variationProductCode,  allowInactive :  allowInactive,  skipInventoryCheck :  skipInventoryCheck,  supressOutOfStock404 :  supressOutOfStock404,  quantity :  quantity,  acceptVariantProductCode :  acceptVariantProductCode,  responseFields :  responseFields, dataViewMode: dataViewMode		);
+				 productCode :  productCode,  variationProductCode :  variationProductCode,  allowInactive :  allowInactive,  skipInventoryCheck :  skipInventoryCheck,  supressOutOfStock404 :  supressOutOfStock404,  quantity :  quantity,  acceptVariantProductCode :  acceptVariantProductCode,  purchaseLocation :  purchaseLocation,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.ProductRuntime.Product GetProduct(ServiceClient
 		}
   
 		/// <summary> 
-		/// Retrieves information about a single product given its product code for  to index in the search engine
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductFactory.GetProductForIndexing(handler : handler,  productCode :  productCode,  productVersion :  productVersion,  lastModifiedDate :  lastModifiedDate,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static Mozu.Api.Contracts.ProductRuntime.Product GetProductForIndexing(Se
 				 productCode :  productCode,  productVersion :  productVersion,  lastModifiedDate :  lastModifiedDate,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -182,17 +183,17 @@ public static Mozu.Api.Contracts.ProductRuntime.Product GetProductForIndexing(Se
 		}
   
 		/// <summary> 
-		/// Creates a new product configuration each time a shopper selects a product option value. After the shopper defines values for all required product options, the shopper can add the product configuration to a cart.
+		/// 
 		/// <example> 
 		///  <code> 
-		/// var result = ProductFactory.ConfiguredProduct(handler : handler,  productOptionSelections :  productOptionSelections,  productCode :  productCode,  includeOptionDetails :  includeOptionDetails,  skipInventoryCheck :  skipInventoryCheck,  quantity :  quantity,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var result = ProductFactory.ConfiguredProduct(handler : handler,  productOptionSelections :  productOptionSelections,  productCode :  productCode,  includeOptionDetails :  includeOptionDetails,  skipInventoryCheck :  skipInventoryCheck,  quantity :  quantity,  purchaseLocation :  purchaseLocation,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
 		/// var optionalCasting = ConvertClass<ConfiguredProduct/>(result); 
 		/// return optionalCasting;
 		///  </code> 
 		/// </example> 
 		/// </summary>
 		public static Mozu.Api.Contracts.ProductRuntime.ConfiguredProduct ConfiguredProduct(ServiceClientMessageHandler handler, 
- 		 Mozu.Api.Contracts.ProductRuntime.ProductOptionSelections productOptionSelections, string productCode, bool? includeOptionDetails = null, bool? skipInventoryCheck = null, int? quantity = null, string responseFields = null, 
+ 		 Mozu.Api.Contracts.ProductRuntime.ProductOptionSelections productOptionSelections, string productCode, bool? includeOptionDetails = null, bool? skipInventoryCheck = null, int? quantity = null, string purchaseLocation = null, string responseFields = null, 
 		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
 		{
 			SetSdKparameters();
@@ -200,10 +201,10 @@ public static Mozu.Api.Contracts.ProductRuntime.ConfiguredProduct ConfiguredProd
 			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
 			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
 			var apiClient = Mozu.Api.Clients.Commerce.Catalog.Storefront.ProductClient.ConfiguredProductClient(
-				 productOptionSelections :  productOptionSelections,  productCode :  productCode,  includeOptionDetails :  includeOptionDetails,  skipInventoryCheck :  skipInventoryCheck,  quantity :  quantity,  responseFields :  responseFields		);
+				 productOptionSelections :  productOptionSelections,  productCode :  productCode,  includeOptionDetails :  includeOptionDetails,  skipInventoryCheck :  skipInventoryCheck,  quantity :  quantity,  purchaseLocation :  purchaseLocation,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -220,17 +221,17 @@ public static Mozu.Api.Contracts.ProductRuntime.ConfiguredProduct ConfiguredProd
 		}
   
 		/// <summary> 
-		/// Validate the final state of shopper-selected options.
+		/// 
 		/// <example> 
 		///  <code> 
-		/// var result = ProductFactory.ValidateProduct(handler : handler,  productOptionSelections :  productOptionSelections,  productCode :  productCode,  skipInventoryCheck :  skipInventoryCheck,  quantity :  quantity,  skipDefaults :  skipDefaults,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var result = ProductFactory.ValidateProduct(handler : handler,  productOptionSelections :  productOptionSelections,  productCode :  productCode,  skipInventoryCheck :  skipInventoryCheck,  quantity :  quantity,  skipDefaults :  skipDefaults,  purchaseLocation :  purchaseLocation,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
 		/// var optionalCasting = ConvertClass<ProductValidationSummary/>(result); 
 		/// return optionalCasting;
 		///  </code> 
 		/// </example> 
 		/// </summary>
 		public static Mozu.Api.Contracts.ProductRuntime.ProductValidationSummary ValidateProduct(ServiceClientMessageHandler handler, 
- 		 Mozu.Api.Contracts.ProductRuntime.ProductOptionSelections productOptionSelections, string productCode, bool? skipInventoryCheck = null, int? quantity = null, bool? skipDefaults = null, string responseFields = null, 
+ 		 Mozu.Api.Contracts.ProductRuntime.ProductOptionSelections productOptionSelections, string productCode, bool? skipInventoryCheck = null, int? quantity = null, bool? skipDefaults = null, string purchaseLocation = null, string responseFields = null, 
 		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
 		{
 			SetSdKparameters();
@@ -238,10 +239,10 @@ public static Mozu.Api.Contracts.ProductRuntime.ProductValidationSummary Validat
 			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
 			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
 			var apiClient = Mozu.Api.Clients.Commerce.Catalog.Storefront.ProductClient.ValidateProductClient(
-				 productOptionSelections :  productOptionSelections,  productCode :  productCode,  skipInventoryCheck :  skipInventoryCheck,  quantity :  quantity,  skipDefaults :  skipDefaults,  responseFields :  responseFields		);
+				 productOptionSelections :  productOptionSelections,  productCode :  productCode,  skipInventoryCheck :  skipInventoryCheck,  quantity :  quantity,  skipDefaults :  skipDefaults,  purchaseLocation :  purchaseLocation,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -258,7 +259,7 @@ public static Mozu.Api.Contracts.ProductRuntime.ProductValidationSummary Validat
 		}
   
 		/// <summary> 
-		/// Evaluates whether a collection of discounts specified in the request can be redeemed for the supplied product code.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductFactory.ValidateDiscounts(handler : handler,  discountSelections :  discountSelections,  productCode :  productCode,  variationProductCode :  variationProductCode,  customerAccountId :  customerAccountId,  allowInactive :  allowInactive,  skipInventoryCheck :  skipInventoryCheck,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -279,7 +280,7 @@ public static Mozu.Api.Contracts.ProductRuntime.DiscountValidationSummary Valida
 				 discountSelections :  discountSelections,  productCode :  productCode,  variationProductCode :  variationProductCode,  customerAccountId :  customerAccountId,  allowInactive :  allowInactive,  skipInventoryCheck :  skipInventoryCheck,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -296,7 +297,7 @@ public static Mozu.Api.Contracts.ProductRuntime.DiscountValidationSummary Valida
 		}
   
 		/// <summary> 
-		/// Retrieves the product cost based on a list of product codes. The product cost is the amount the merchant pays for the product—it is not the price that the shopper sees on the storefront (which is usually higher).
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductFactory.GetProductCosts(handler : handler,  query :  query,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -317,7 +318,7 @@ public static Mozu.Api.Contracts.ProductRuntime.ProductCostCollection GetProduct
 				 query :  query,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -334,7 +335,7 @@ public static Mozu.Api.Contracts.ProductRuntime.ProductCostCollection GetProduct
 		}
   
 		/// <summary> 
-		/// Retrieves product inventories for the storefront displayed products.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductFactory.GetProductInventories(handler : handler,  query :  query,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -355,7 +356,7 @@ public static Mozu.Api.Contracts.ProductRuntime.LocationInventoryCollection GetP
 				 query :  query,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/StorefrontProductSearchResultFactory.cs b/Mozu.Api.Test/Factories/Commerce/Catalog/Storefront/StorefrontProductSearchResultFactory.cs
old mode 100644
new mode 100755
similarity index 89%
rename from Mozu.Api.Test/Factories/StorefrontProductSearchResultFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Catalog/Storefront/StorefrontProductSearchResultFactory.cs
index 5c738c11..58c317f1
--- a/Mozu.Api.Test/Factories/StorefrontProductSearchResultFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Catalog/Storefront/StorefrontProductSearchResultFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Catalog.Storefront
 {
 	/// <summary>
 	/// Use the Product Search resource to provide dynamic search results to shoppers as they browse and search for products on the web storefront, and to suggest possible search terms as the shopper enters text.
@@ -30,7 +31,7 @@ public partial class StorefrontProductSearchResultFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Random access paging computes a set of , which can each then be provided to the  operation in the  resource or the  operation in the  resource. You can provide the computed groups in any order to the operations, and can therefore parallelize calls to retrieve products more quickly. To generate the set of , call this () operation, in which you can optionally provide query and/or filter parameters to limit the products matched by the cursor. After executing this operation, pass one of the returned  to the  parameter of the  or  operations.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductSearchResultFactory.GetRandomAccessCursor(handler : handler,  query :  query,  filter :  filter,  pageSize :  pageSize,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.ProductRuntime.ProductSearchRandomAccessCursor
 				 query :  query,  filter :  filter,  pageSize :  pageSize,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.ProductRuntime.ProductSearchRandomAccessCursor
 		}
   
 		/// <summary> 
-		/// Searches the categories displayed on the web storefront for products or product options that the shopper types in a search query.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductSearchResultFactory.Search(handler : handler,  query :  query,  filter :  filter,  facetTemplate :  facetTemplate,  facetTemplateSubset :  facetTemplateSubset,  facet :  facet,  facetFieldRangeQuery :  facetFieldRangeQuery,  facetHierPrefix :  facetHierPrefix,  facetHierValue :  facetHierValue,  facetHierDepth :  facetHierDepth,  facetStartIndex :  facetStartIndex,  facetPageSize :  facetPageSize,  facetSettings :  facetSettings,  facetValueFilter :  facetValueFilter,  sortBy :  sortBy,  pageSize :  pageSize,  startIndex :  startIndex,  searchSettings :  searchSettings,  enableSearchTuningRules :  enableSearchTuningRules,  searchTuningRuleContext :  searchTuningRuleContext,  searchTuningRuleCode :  searchTuningRuleCode,  facetTemplateExclude :  facetTemplateExclude,  facetPrefix :  facetPrefix,  responseOptions :  responseOptions,  cursorMark :  cursorMark,  facetValueSort :  facetValueSort,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.ProductRuntime.ProductSearchResult Search(Servi
 				 query :  query,  filter :  filter,  facetTemplate :  facetTemplate,  facetTemplateSubset :  facetTemplateSubset,  facet :  facet,  facetFieldRangeQuery :  facetFieldRangeQuery,  facetHierPrefix :  facetHierPrefix,  facetHierValue :  facetHierValue,  facetHierDepth :  facetHierDepth,  facetStartIndex :  facetStartIndex,  facetPageSize :  facetPageSize,  facetSettings :  facetSettings,  facetValueFilter :  facetValueFilter,  sortBy :  sortBy,  pageSize :  pageSize,  startIndex :  startIndex,  searchSettings :  searchSettings,  enableSearchTuningRules :  enableSearchTuningRules,  searchTuningRuleContext :  searchTuningRuleContext,  searchTuningRuleCode :  searchTuningRuleCode,  facetTemplateExclude :  facetTemplateExclude,  facetPrefix :  facetPrefix,  responseOptions :  responseOptions,  cursorMark :  cursorMark,  facetValueSort :  facetValueSort,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.ProductRuntime.ProductSearchResult Search(Servi
 		}
   
 		/// <summary> 
-		/// Suggests possible search terms as the shopper enters search text.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ProductSearchResultFactory.Suggest(handler : handler,  query :  query,  groups :  groups,  pageSize :  pageSize,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.ProductRuntime.SearchSuggestionResult Suggest(S
 				 query :  query,  groups :  groups,  pageSize :  pageSize,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/ExtensionsFactory.cs b/Mozu.Api.Test/Factories/Commerce/Catalog/Storefront/StorefrontShippingFactory.cs
old mode 100644
new mode 100755
similarity index 58%
rename from Mozu.Api.Test/Factories/ExtensionsFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Catalog/Storefront/StorefrontShippingFactory.cs
index 7f6a674c..8e1221aa
--- a/Mozu.Api.Test/Factories/ExtensionsFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Catalog/Storefront/StorefrontShippingFactory.cs
@@ -18,40 +18,41 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Catalog.Storefront
 {
 	/// <summary>
-	/// platform/extensions related resources. DOCUMENT_HERE 
+	/// Use the Storefront Shipping resource to retrieve shipping rate information from the website.
 	/// </summary>
-	public partial class ExtensionsFactory : BaseDataFactory
+	public partial class StorefrontShippingFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// platform-extensions Get GetExtensions description DOCUMENT_HERE 
+		/// 
 		/// <example> 
 		///  <code> 
-		/// var result = ExtensionsFactory.GetExtensions(handler : handler,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<TenantExtensions/>(result); 
+		/// var result = ShippingFactory.GetMultiRates(handler : handler,  rateRequestGroupList :  rateRequestGroupList,  includeRawResponse :  includeRawResponse,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<List<RatesResponseGroup>/>(result); 
 		/// return optionalCasting;
 		///  </code> 
 		/// </example> 
 		/// </summary>
-		public static Mozu.Api.Contracts.InstalledApplications.TenantExtensions GetExtensions(ServiceClientMessageHandler handler, 
- 		 string responseFields = null, 
+		public static List<Mozu.Api.Contracts.ShippingRuntime.RatesResponseGroup> GetMultiRates(ServiceClientMessageHandler handler, 
+ 		 List<Mozu.Api.Contracts.ShippingRuntime.RateRequestGroup> rateRequestGroupList, bool? includeRawResponse = null, 
 		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
 		{
 			SetSdKparameters();
 			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
 			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
 			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Platform.ExtensionsClient.GetExtensionsClient(
-				 responseFields :  responseFields		);
+			var apiClient = Mozu.Api.Clients.Commerce.Catalog.Storefront.ShippingClient.GetMultiRatesClient(
+				 rateRequestGroupList :  rateRequestGroupList,  includeRawResponse :  includeRawResponse		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,28 +69,28 @@ public static Mozu.Api.Contracts.InstalledApplications.TenantExtensions GetExten
 		}
   
 		/// <summary> 
-		/// platform-extensions Put UpdateExtensions description DOCUMENT_HERE 
+		/// 
 		/// <example> 
 		///  <code> 
-		/// var result = ExtensionsFactory.UpdateExtensions(handler : handler,  extensions :  extensions,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<TenantExtensions/>(result); 
+		/// var result = ShippingFactory.GetRates(handler : handler,  rateRequest :  rateRequest,  includeRawResponse :  includeRawResponse,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<RatesResponse/>(result); 
 		/// return optionalCasting;
 		///  </code> 
 		/// </example> 
 		/// </summary>
-		public static Mozu.Api.Contracts.InstalledApplications.TenantExtensions UpdateExtensions(ServiceClientMessageHandler handler, 
- 		 Mozu.Api.Contracts.InstalledApplications.TenantExtensions extensions, string responseFields = null, 
+		public static Mozu.Api.Contracts.ShippingRuntime.RatesResponse GetRates(ServiceClientMessageHandler handler, 
+ 		 Mozu.Api.Contracts.ShippingRuntime.RateRequest rateRequest, bool? includeRawResponse = null, string responseFields = null, 
 		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
 		{
 			SetSdKparameters();
 			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
 			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
 			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Platform.ExtensionsClient.UpdateExtensionsClient(
-				 extensions :  extensions,  responseFields :  responseFields		);
+			var apiClient = Mozu.Api.Clients.Commerce.Catalog.Storefront.ShippingClient.GetRatesClient(
+				 rateRequest :  rateRequest,  includeRawResponse :  includeRawResponse,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/ChannelFactory.cs b/Mozu.Api.Test/Factories/Commerce/ChannelFactory.cs
old mode 100644
new mode 100755
similarity index 91%
rename from Mozu.Api.Test/Factories/ChannelFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/ChannelFactory.cs
index 8ee22dd8..c4afd47d
--- a/Mozu.Api.Test/Factories/ChannelFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/ChannelFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce
 {
 	/// <summary>
 	/// Use the Channels resource to manage the channels a company uses to create logical commercial business divisions based on region or types of sales, such as "US Online," "Amazon," or "EMEA Retail." All orders include a channel association that enables the company to perform financial reporting for each defined channel. Because channels are managed at the tenant level, you must associate all the tenant's sites with a channel. Sites that do not have a defined channel association cannot successfully submit orders.
@@ -30,7 +31,7 @@ public partial class ChannelFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a list of channels defined for a tenant according to any filter or sort criteria specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ChannelFactory.GetChannels(handler : handler,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelCollection GetC
 				 startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelCollection GetC
 		}
   
 		/// <summary> 
-		/// Retrieves the details of the channel specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ChannelFactory.GetChannel(handler : handler,  code :  code,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Channels.Channel GetChannel(Ser
 				 code :  code,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Channels.Channel GetChannel(Ser
 		}
   
 		/// <summary> 
-		/// Creates a new channel that defines a new logical business division to use for financial reporting.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ChannelFactory.CreateChannel(handler : handler,  channel :  channel,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Channels.Channel CreateChannel(
 				 channel :  channel,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Channels.Channel CreateChannel(
 		}
   
 		/// <summary> 
-		/// Updates one or more details of a defined channel, including the associated sites.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ChannelFactory.UpdateChannel(handler : handler,  channel :  channel,  code :  code,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Channels.Channel UpdateChannel(
 				 channel :  channel,  code :  code,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -182,7 +183,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Channels.Channel UpdateChannel(
 		}
   
 		/// <summary> 
-		/// Deletes a defined channel for the tenant and removes the defined site associations. After deleting this channel, assign its associated sites to another channel.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ChannelFactory.DeleteChannel(handler : handler,  code :  code,  expectedCode: expectedCode, successCode: successCode); 
@@ -203,7 +204,7 @@ public static void DeleteChannel(ServiceClientMessageHandler handler,
 				 code :  code		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/ChannelGroupFactory.cs b/Mozu.Api.Test/Factories/Commerce/ChannelGroupFactory.cs
old mode 100644
new mode 100755
similarity index 91%
rename from Mozu.Api.Test/Factories/ChannelGroupFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/ChannelGroupFactory.cs
index 5a34bcd2..bdc3e418
--- a/Mozu.Api.Test/Factories/ChannelGroupFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/ChannelGroupFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce
 {
 	/// <summary>
 	/// Use the Channel Groups resource to manage groups of channels with common information.
@@ -30,7 +31,7 @@ public partial class ChannelGroupFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a list of defined channel groups according to any filter and sort criteria specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ChannelGroupFactory.GetChannelGroups(handler : handler,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelGroupCollection
 				 startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelGroupCollection
 		}
   
 		/// <summary> 
-		/// Retrieves the details of a defined channel group.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ChannelGroupFactory.GetChannelGroup(handler : handler,  code :  code,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelGroup GetChanne
 				 code :  code,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelGroup GetChanne
 		}
   
 		/// <summary> 
-		/// Creates a new group of channels with common information.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ChannelGroupFactory.CreateChannelGroup(handler : handler,  channelGroup :  channelGroup,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelGroup CreateCha
 				 channelGroup :  channelGroup,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelGroup CreateCha
 		}
   
 		/// <summary> 
-		/// Updates one or more properties of a defined channel group.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ChannelGroupFactory.UpdateChannelGroup(handler : handler,  channelGroup :  channelGroup,  code :  code,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelGroup UpdateCha
 				 channelGroup :  channelGroup,  code :  code,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -182,7 +183,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelGroup UpdateCha
 		}
   
 		/// <summary> 
-		/// Deletes a defined group of channels, which removes the group association with each channel in the group but does not delete the channel definitions themselves.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ChannelGroupFactory.DeleteChannelGroup(handler : handler,  code :  code,  expectedCode: expectedCode, successCode: successCode); 
@@ -203,7 +204,7 @@ public static void DeleteChannelGroup(ServiceClientMessageHandler handler,
 				 code :  code		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/Commerce/CheckoutFactory.cs b/Mozu.Api.Test/Factories/Commerce/CheckoutFactory.cs
new file mode 100755
index 00000000..275f50fd
--- /dev/null
+++ b/Mozu.Api.Test/Factories/Commerce/CheckoutFactory.cs
@@ -0,0 +1,455 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+#region Usings Setup
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Net;
+using Mozu.Api;
+using Mozu.Api.Security;
+using Mozu.Api.Test.Helpers;
+using System.Diagnostics;
+using Newtonsoft.Json.Linq;
+using System.Threading;
+
+#endregion
+
+namespace Mozu.Api.Test.Factories.Commerce
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	public partial class CheckoutFactory : BaseDataFactory
+	{
+
+		/// <summary> 
+		/// 
+		/// <example> 
+		///  <code> 
+		/// var result = CheckoutFactory.GetCheckouts(handler : handler,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  q :  q,  qLimit :  qLimit,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<CheckoutCollection/>(result); 
+		/// return optionalCasting;
+		///  </code> 
+		/// </example> 
+		/// </summary>
+		public static Mozu.Api.Contracts.CommerceRuntime.Checkouts.CheckoutCollection GetCheckouts(ServiceClientMessageHandler handler, 
+ 		 int? startIndex = null, int? pageSize = null, string sortBy = null, string filter = null, string q = null, int? qLimit = null, string responseFields = null, 
+		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
+		{
+			SetSdKparameters();
+			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
+			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
+			var apiClient = Mozu.Api.Clients.Commerce.CheckoutClient.GetCheckoutsClient(
+				 startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  q :  q,  qLimit :  qLimit,  responseFields :  responseFields		);
+			try
+			{
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
+			}
+			catch (ApiException ex)
+			{
+				// Custom error handling for test cases can be placed here
+				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
+				if (customException != null)
+					throw customException;
+				return null;
+			}
+			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
+					 ? (apiClient.Result()) 
+					 : null;
+
+		}
+  
+		/// <summary> 
+		/// 
+		/// <example> 
+		///  <code> 
+		/// var result = CheckoutFactory.GetAvailableActions(handler : handler,  checkoutId :  checkoutId,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<List<string>/>(result); 
+		/// return optionalCasting;
+		///  </code> 
+		/// </example> 
+		/// </summary>
+		public static List<string> GetAvailableActions(ServiceClientMessageHandler handler, 
+ 		 string checkoutId, 
+		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
+		{
+			SetSdKparameters();
+			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
+			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
+			var apiClient = Mozu.Api.Clients.Commerce.CheckoutClient.GetAvailableActionsClient(
+				 checkoutId :  checkoutId		);
+			try
+			{
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
+			}
+			catch (ApiException ex)
+			{
+				// Custom error handling for test cases can be placed here
+				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
+				if (customException != null)
+					throw customException;
+				return null;
+			}
+			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
+					 ? (apiClient.Result()) 
+					 : null;
+
+		}
+  
+		/// <summary> 
+		/// 
+		/// <example> 
+		///  <code> 
+		/// var result = CheckoutFactory.GetAvailableShippingMethods(handler : handler,  checkoutId :  checkoutId,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<List<CheckoutGroupRates>/>(result); 
+		/// return optionalCasting;
+		///  </code> 
+		/// </example> 
+		/// </summary>
+		public static List<Mozu.Api.Contracts.CommerceRuntime.Checkouts.CheckoutGroupRates> GetAvailableShippingMethods(ServiceClientMessageHandler handler, 
+ 		 string checkoutId, 
+		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
+		{
+			SetSdKparameters();
+			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
+			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
+			var apiClient = Mozu.Api.Clients.Commerce.CheckoutClient.GetAvailableShippingMethodsClient(
+				 checkoutId :  checkoutId		);
+			try
+			{
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
+			}
+			catch (ApiException ex)
+			{
+				// Custom error handling for test cases can be placed here
+				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
+				if (customException != null)
+					throw customException;
+				return null;
+			}
+			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
+					 ? (apiClient.Result()) 
+					 : null;
+
+		}
+  
+		/// <summary> 
+		/// 
+		/// <example> 
+		///  <code> 
+		/// var result = CheckoutFactory.GetCheckout(handler : handler,  checkoutId :  checkoutId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<Checkout/>(result); 
+		/// return optionalCasting;
+		///  </code> 
+		/// </example> 
+		/// </summary>
+		public static Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout GetCheckout(ServiceClientMessageHandler handler, 
+ 		 string checkoutId, string responseFields = null, 
+		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
+		{
+			SetSdKparameters();
+			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
+			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
+			var apiClient = Mozu.Api.Clients.Commerce.CheckoutClient.GetCheckoutClient(
+				 checkoutId :  checkoutId,  responseFields :  responseFields		);
+			try
+			{
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
+			}
+			catch (ApiException ex)
+			{
+				// Custom error handling for test cases can be placed here
+				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
+				if (customException != null)
+					throw customException;
+				return null;
+			}
+			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
+					 ? (apiClient.Result()) 
+					 : null;
+
+		}
+  
+		/// <summary> 
+		/// 
+		/// <example> 
+		///  <code> 
+		/// var result = CheckoutFactory.CreateCheckoutFromCart(handler : handler,  cartId :  cartId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<Checkout/>(result); 
+		/// return optionalCasting;
+		///  </code> 
+		/// </example> 
+		/// </summary>
+		public static Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout CreateCheckoutFromCart(ServiceClientMessageHandler handler, 
+ 		 string cartId, string responseFields = null, 
+		 HttpStatusCode expectedCode = HttpStatusCode.Created, HttpStatusCode successCode = HttpStatusCode.Created)
+		{
+			SetSdKparameters();
+			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
+			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
+			var apiClient = Mozu.Api.Clients.Commerce.CheckoutClient.CreateCheckoutFromCartClient(
+				 cartId :  cartId,  responseFields :  responseFields		);
+			try
+			{
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
+			}
+			catch (ApiException ex)
+			{
+				// Custom error handling for test cases can be placed here
+				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
+				if (customException != null)
+					throw customException;
+				return null;
+			}
+			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
+					 ? (apiClient.Result()) 
+					 : null;
+
+		}
+  
+		/// <summary> 
+		/// 
+		/// <example> 
+		///  <code> 
+		/// var result = CheckoutFactory.PerformCheckoutAction(handler : handler,  action :  action,  checkoutId :  checkoutId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<Checkout/>(result); 
+		/// return optionalCasting;
+		///  </code> 
+		/// </example> 
+		/// </summary>
+		public static Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout PerformCheckoutAction(ServiceClientMessageHandler handler, 
+ 		 Mozu.Api.Contracts.CommerceRuntime.Checkouts.CheckoutAction action, string checkoutId, string responseFields = null, 
+		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
+		{
+			SetSdKparameters();
+			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
+			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
+			var apiClient = Mozu.Api.Clients.Commerce.CheckoutClient.PerformCheckoutActionClient(
+				 action :  action,  checkoutId :  checkoutId,  responseFields :  responseFields		);
+			try
+			{
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
+			}
+			catch (ApiException ex)
+			{
+				// Custom error handling for test cases can be placed here
+				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
+				if (customException != null)
+					throw customException;
+				return null;
+			}
+			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
+					 ? (apiClient.Result()) 
+					 : null;
+
+		}
+  
+		/// <summary> 
+		/// 
+		/// <example> 
+		///  <code> 
+		/// var result = CheckoutFactory.ResendCheckoutConfirmationEmail(handler : handler,  checkoutId :  checkoutId,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<void/>(result); 
+		/// return optionalCasting;
+		///  </code> 
+		/// </example> 
+		/// </summary>
+		public static void ResendCheckoutConfirmationEmail(ServiceClientMessageHandler handler, 
+ 		string checkoutId, 
+		 HttpStatusCode expectedCode = HttpStatusCode.NoContent, HttpStatusCode successCode = HttpStatusCode.NoContent)
+		{
+			SetSdKparameters();
+			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
+			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
+			var apiClient = Mozu.Api.Clients.Commerce.CheckoutClient.ResendCheckoutConfirmationEmailClient(
+				 checkoutId :  checkoutId		);
+			try
+			{
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
+			}
+			catch (ApiException ex)
+			{
+				// Custom error handling for test cases can be placed here
+				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
+				if (customException != null)
+					throw customException;
+			}
+			var noResponse = ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
+					 ? (apiClient.Result()) 
+					 : null;
+
+		}
+  
+		/// <summary> 
+		/// 
+		/// <example> 
+		///  <code> 
+		/// var result = CheckoutFactory.SetShippingMethods(handler : handler,  groupShippingMethods :  groupShippingMethods,  checkoutId :  checkoutId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<Checkout/>(result); 
+		/// return optionalCasting;
+		///  </code> 
+		/// </example> 
+		/// </summary>
+		public static Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout SetShippingMethods(ServiceClientMessageHandler handler, 
+ 		 List<Mozu.Api.Contracts.CommerceRuntime.Checkouts.CheckoutGroupShippingMethod> groupShippingMethods, string checkoutId, string responseFields = null, 
+		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
+		{
+			SetSdKparameters();
+			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
+			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
+			var apiClient = Mozu.Api.Clients.Commerce.CheckoutClient.SetShippingMethodsClient(
+				 groupShippingMethods :  groupShippingMethods,  checkoutId :  checkoutId,  responseFields :  responseFields		);
+			try
+			{
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
+			}
+			catch (ApiException ex)
+			{
+				// Custom error handling for test cases can be placed here
+				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
+				if (customException != null)
+					throw customException;
+				return null;
+			}
+			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
+					 ? (apiClient.Result()) 
+					 : null;
+
+		}
+  
+		/// <summary> 
+		/// 
+		/// <example> 
+		///  <code> 
+		/// var result = CheckoutFactory.UpdateCheckout(handler : handler,  checkout :  checkout,  checkoutId :  checkoutId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<Checkout/>(result); 
+		/// return optionalCasting;
+		///  </code> 
+		/// </example> 
+		/// </summary>
+		public static Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout UpdateCheckout(ServiceClientMessageHandler handler, 
+ 		 Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout checkout, string checkoutId, string responseFields = null, 
+		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
+		{
+			SetSdKparameters();
+			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
+			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
+			var apiClient = Mozu.Api.Clients.Commerce.CheckoutClient.UpdateCheckoutClient(
+				 checkout :  checkout,  checkoutId :  checkoutId,  responseFields :  responseFields		);
+			try
+			{
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
+			}
+			catch (ApiException ex)
+			{
+				// Custom error handling for test cases can be placed here
+				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
+				if (customException != null)
+					throw customException;
+				return null;
+			}
+			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
+					 ? (apiClient.Result()) 
+					 : null;
+
+		}
+  
+		/// <summary> 
+		/// 
+		/// <example> 
+		///  <code> 
+		/// var result = CheckoutFactory.ProcessDigitalWallet(handler : handler,  digitalWallet :  digitalWallet,  checkoutId :  checkoutId,  digitalWalletType :  digitalWalletType,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<Checkout/>(result); 
+		/// return optionalCasting;
+		///  </code> 
+		/// </example> 
+		/// </summary>
+		public static Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout ProcessDigitalWallet(ServiceClientMessageHandler handler, 
+ 		 Mozu.Api.Contracts.CommerceRuntime.Orders.DigitalWallet digitalWallet, string checkoutId, string digitalWalletType, string responseFields = null, 
+		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
+		{
+			SetSdKparameters();
+			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
+			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
+			var apiClient = Mozu.Api.Clients.Commerce.CheckoutClient.ProcessDigitalWalletClient(
+				 digitalWallet :  digitalWallet,  checkoutId :  checkoutId,  digitalWalletType :  digitalWalletType,  responseFields :  responseFields		);
+			try
+			{
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
+			}
+			catch (ApiException ex)
+			{
+				// Custom error handling for test cases can be placed here
+				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
+				if (customException != null)
+					throw customException;
+				return null;
+			}
+			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
+					 ? (apiClient.Result()) 
+					 : null;
+
+		}
+  
+		/// <summary> 
+		/// 
+		/// <example> 
+		///  <code> 
+		/// var result = CheckoutFactory.ChangeCheckoutPriceList(handler : handler,  priceListCode :  priceListCode,  checkoutId :  checkoutId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<Checkout/>(result); 
+		/// return optionalCasting;
+		///  </code> 
+		/// </example> 
+		/// </summary>
+		public static Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout ChangeCheckoutPriceList(ServiceClientMessageHandler handler, 
+ 		 string priceListCode, string checkoutId, string responseFields = null, 
+		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
+		{
+			SetSdKparameters();
+			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
+			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
+			var apiClient = Mozu.Api.Clients.Commerce.CheckoutClient.ChangeCheckoutPriceListClient(
+				 priceListCode :  priceListCode,  checkoutId :  checkoutId,  responseFields :  responseFields		);
+			try
+			{
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
+			}
+			catch (ApiException ex)
+			{
+				// Custom error handling for test cases can be placed here
+				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
+				if (customException != null)
+					throw customException;
+				return null;
+			}
+			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
+					 ? (apiClient.Result()) 
+					 : null;
+
+		}
+  
+
+	}
+
+}
+
+
diff --git a/Mozu.Api.Test/Factories/CustomerAttributeDefinitionFactory.cs b/Mozu.Api.Test/Factories/Commerce/Checkouts/AppliedDiscountOrdersFactory.cs
old mode 100644
new mode 100755
similarity index 56%
rename from Mozu.Api.Test/Factories/CustomerAttributeDefinitionFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Checkouts/AppliedDiscountOrdersFactory.cs
index efa657d8..5af40d61
--- a/Mozu.Api.Test/Factories/CustomerAttributeDefinitionFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Checkouts/AppliedDiscountOrdersFactory.cs
@@ -18,40 +18,41 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Checkouts
 {
 	/// <summary>
-	/// Use the Customer Attribute Definition resource to manage the attributes to define for your shoppers.
+	/// 
 	/// </summary>
-	public partial class CustomerAttributeDefinitionFactory : BaseDataFactory
+	public partial class AppliedDiscountOrdersFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a list of customer attributes according to any filter and sort criteria specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
-		/// var result = CustomerAttributeDefinitionFactory.GetAttributes(handler : handler,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<AttributeCollection/>(result); 
+		/// var result = AppliedDiscountFactory.ApplyCoupon(handler : handler,  checkoutId :  checkoutId,  couponCode :  couponCode,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<Checkout/>(result); 
 		/// return optionalCasting;
 		///  </code> 
 		/// </example> 
 		/// </summary>
-		public static Mozu.Api.Contracts.Core.Extensible.AttributeCollection GetAttributes(ServiceClientMessageHandler handler, 
- 		 int? startIndex = null, int? pageSize = null, string sortBy = null, string filter = null, string responseFields = null, 
+		public static Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout ApplyCoupon(ServiceClientMessageHandler handler, 
+ 		 string checkoutId, string couponCode, string responseFields = null, 
 		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
 		{
 			SetSdKparameters();
 			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
 			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
 			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Commerce.Customer.Attributedefinition.AttributeClient.GetAttributesClient(
-				 startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields		);
+			var apiClient = Mozu.Api.Clients.Commerce.Checkouts.AppliedDiscountClient.ApplyCouponClient(
+				 checkoutId :  checkoutId,  couponCode :  couponCode,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,28 +69,28 @@ public static Mozu.Api.Contracts.Core.Extensible.AttributeCollection GetAttribut
 		}
   
 		/// <summary> 
-		/// Retrieve a list of the vocabulary values defined for the customer attribute specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
-		/// var result = CustomerAttributeDefinitionFactory.GetAttributeVocabularyValues(handler : handler,  attributeFQN :  attributeFQN,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<List<AttributeVocabularyValue>/>(result); 
+		/// var result = AppliedDiscountFactory.RemoveCoupons(handler : handler,  checkoutId :  checkoutId,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<Checkout/>(result); 
 		/// return optionalCasting;
 		///  </code> 
 		/// </example> 
 		/// </summary>
-		public static List<Mozu.Api.Contracts.Core.Extensible.AttributeVocabularyValue> GetAttributeVocabularyValues(ServiceClientMessageHandler handler, 
- 		 string attributeFQN, 
+		public static Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout RemoveCoupons(ServiceClientMessageHandler handler, 
+ 		 string checkoutId, 
 		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
 		{
 			SetSdKparameters();
 			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
 			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
 			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Commerce.Customer.Attributedefinition.AttributeClient.GetAttributeVocabularyValuesClient(
-				 attributeFQN :  attributeFQN		);
+			var apiClient = Mozu.Api.Clients.Commerce.Checkouts.AppliedDiscountClient.RemoveCouponsClient(
+				 checkoutId :  checkoutId		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,28 +107,28 @@ public static Mozu.Api.Contracts.Core.Extensible.AttributeCollection GetAttribut
 		}
   
 		/// <summary> 
-		/// Retrieve a customer attribute definition by supplying its fully qualified name.
+		/// 
 		/// <example> 
 		///  <code> 
-		/// var result = CustomerAttributeDefinitionFactory.GetAttribute(handler : handler,  attributeFQN :  attributeFQN,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<Attribute/>(result); 
+		/// var result = AppliedDiscountFactory.RemoveCoupon(handler : handler,  checkoutId :  checkoutId,  couponCode :  couponCode,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<Checkout/>(result); 
 		/// return optionalCasting;
 		///  </code> 
 		/// </example> 
 		/// </summary>
-		public static Mozu.Api.Contracts.Core.Extensible.Attribute GetAttribute(ServiceClientMessageHandler handler, 
- 		 string attributeFQN, string responseFields = null, 
+		public static Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout RemoveCoupon(ServiceClientMessageHandler handler, 
+ 		 string checkoutId, string couponCode, 
 		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
 		{
 			SetSdKparameters();
 			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
 			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
 			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Commerce.Customer.Attributedefinition.AttributeClient.GetAttributeClient(
-				 attributeFQN :  attributeFQN,  responseFields :  responseFields		);
+			var apiClient = Mozu.Api.Clients.Commerce.Checkouts.AppliedDiscountClient.RemoveCouponClient(
+				 checkoutId :  checkoutId,  couponCode :  couponCode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/Commerce/Checkouts/DestinationFactory.cs b/Mozu.Api.Test/Factories/Commerce/Checkouts/DestinationFactory.cs
new file mode 100755
index 00000000..b2bcb8b4
--- /dev/null
+++ b/Mozu.Api.Test/Factories/Commerce/Checkouts/DestinationFactory.cs
@@ -0,0 +1,227 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+#region Usings Setup
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Net;
+using Mozu.Api;
+using Mozu.Api.Security;
+using Mozu.Api.Test.Helpers;
+using System.Diagnostics;
+using Newtonsoft.Json.Linq;
+using System.Threading;
+
+#endregion
+
+namespace Mozu.Api.Test.Factories.Commerce.Checkouts
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	public partial class DestinationFactory : BaseDataFactory
+	{
+
+		/// <summary> 
+		/// 
+		/// <example> 
+		///  <code> 
+		/// var result = DestinationFactory.GetDestinations(handler : handler,  checkoutId :  checkoutId,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<List<Destination>/>(result); 
+		/// return optionalCasting;
+		///  </code> 
+		/// </example> 
+		/// </summary>
+		public static List<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Destination> GetDestinations(ServiceClientMessageHandler handler, 
+ 		 string checkoutId, 
+		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
+		{
+			SetSdKparameters();
+			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
+			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
+			var apiClient = Mozu.Api.Clients.Commerce.Checkouts.DestinationClient.GetDestinationsClient(
+				 checkoutId :  checkoutId		);
+			try
+			{
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
+			}
+			catch (ApiException ex)
+			{
+				// Custom error handling for test cases can be placed here
+				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
+				if (customException != null)
+					throw customException;
+				return null;
+			}
+			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
+					 ? (apiClient.Result()) 
+					 : null;
+
+		}
+  
+		/// <summary> 
+		/// 
+		/// <example> 
+		///  <code> 
+		/// var result = DestinationFactory.GetDestination(handler : handler,  checkoutId :  checkoutId,  destinationId :  destinationId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<Destination/>(result); 
+		/// return optionalCasting;
+		///  </code> 
+		/// </example> 
+		/// </summary>
+		public static Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Destination GetDestination(ServiceClientMessageHandler handler, 
+ 		 string checkoutId, string destinationId, string responseFields = null, 
+		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
+		{
+			SetSdKparameters();
+			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
+			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
+			var apiClient = Mozu.Api.Clients.Commerce.Checkouts.DestinationClient.GetDestinationClient(
+				 checkoutId :  checkoutId,  destinationId :  destinationId,  responseFields :  responseFields		);
+			try
+			{
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
+			}
+			catch (ApiException ex)
+			{
+				// Custom error handling for test cases can be placed here
+				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
+				if (customException != null)
+					throw customException;
+				return null;
+			}
+			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
+					 ? (apiClient.Result()) 
+					 : null;
+
+		}
+  
+		/// <summary> 
+		/// 
+		/// <example> 
+		///  <code> 
+		/// var result = DestinationFactory.AddDestination(handler : handler,  destination :  destination,  checkoutId :  checkoutId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<Destination/>(result); 
+		/// return optionalCasting;
+		///  </code> 
+		/// </example> 
+		/// </summary>
+		public static Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Destination AddDestination(ServiceClientMessageHandler handler, 
+ 		 Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Destination destination, string checkoutId, string responseFields = null, 
+		 HttpStatusCode expectedCode = HttpStatusCode.Created, HttpStatusCode successCode = HttpStatusCode.Created)
+		{
+			SetSdKparameters();
+			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
+			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
+			var apiClient = Mozu.Api.Clients.Commerce.Checkouts.DestinationClient.AddDestinationClient(
+				 destination :  destination,  checkoutId :  checkoutId,  responseFields :  responseFields		);
+			try
+			{
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
+			}
+			catch (ApiException ex)
+			{
+				// Custom error handling for test cases can be placed here
+				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
+				if (customException != null)
+					throw customException;
+				return null;
+			}
+			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
+					 ? (apiClient.Result()) 
+					 : null;
+
+		}
+  
+		/// <summary> 
+		/// 
+		/// <example> 
+		///  <code> 
+		/// var result = DestinationFactory.UpdateDestination(handler : handler,  destination :  destination,  checkoutId :  checkoutId,  destinationId :  destinationId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<Destination/>(result); 
+		/// return optionalCasting;
+		///  </code> 
+		/// </example> 
+		/// </summary>
+		public static Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Destination UpdateDestination(ServiceClientMessageHandler handler, 
+ 		 Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Destination destination, string checkoutId, string destinationId, string responseFields = null, 
+		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
+		{
+			SetSdKparameters();
+			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
+			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
+			var apiClient = Mozu.Api.Clients.Commerce.Checkouts.DestinationClient.UpdateDestinationClient(
+				 destination :  destination,  checkoutId :  checkoutId,  destinationId :  destinationId,  responseFields :  responseFields		);
+			try
+			{
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
+			}
+			catch (ApiException ex)
+			{
+				// Custom error handling for test cases can be placed here
+				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
+				if (customException != null)
+					throw customException;
+				return null;
+			}
+			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
+					 ? (apiClient.Result()) 
+					 : null;
+
+		}
+  
+		/// <summary> 
+		/// 
+		/// <example> 
+		///  <code> 
+		/// var result = DestinationFactory.RemoveDestination(handler : handler,  checkoutId :  checkoutId,  destinationId :  destinationId,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<void/>(result); 
+		/// return optionalCasting;
+		///  </code> 
+		/// </example> 
+		/// </summary>
+		public static void RemoveDestination(ServiceClientMessageHandler handler, 
+ 		string checkoutId, string destinationId, 
+		 HttpStatusCode expectedCode = HttpStatusCode.NoContent, HttpStatusCode successCode = HttpStatusCode.NoContent)
+		{
+			SetSdKparameters();
+			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
+			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
+			var apiClient = Mozu.Api.Clients.Commerce.Checkouts.DestinationClient.RemoveDestinationClient(
+				 checkoutId :  checkoutId,  destinationId :  destinationId		);
+			try
+			{
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
+			}
+			catch (ApiException ex)
+			{
+				// Custom error handling for test cases can be placed here
+				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
+				if (customException != null)
+					throw customException;
+			}
+			var noResponse = ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
+					 ? (apiClient.Result()) 
+					 : null;
+
+		}
+  
+
+	}
+
+}
+
+
diff --git a/Mozu.Api.Test/Factories/PublicCardsFactory.cs b/Mozu.Api.Test/Factories/Commerce/Checkouts/OrderAttributeFactory.cs
old mode 100644
new mode 100755
similarity index 55%
rename from Mozu.Api.Test/Factories/PublicCardsFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Checkouts/OrderAttributeFactory.cs
index c44e9424..b9b24b88
--- a/Mozu.Api.Test/Factories/PublicCardsFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Checkouts/OrderAttributeFactory.cs
@@ -18,40 +18,41 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Checkouts
 {
 	/// <summary>
-	/// commerce/payments/cards related resources. DOCUMENT_HERE 
+	/// 
 	/// </summary>
-	public partial class PublicCardsFactory : BaseDataFactory
+	public partial class OrderAttributeFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// payments-cards Post Create description DOCUMENT_HERE 
+		/// 
 		/// <example> 
 		///  <code> 
-		/// var result = PublicCardsFactory.Create(handler : handler,  request :  request,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<SyncResponse/>(result); 
+		/// var result = OrderAttributeFactory.GetCheckoutAttributes(handler : handler,  checkoutId :  checkoutId,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<List<OrderAttribute>/>(result); 
 		/// return optionalCasting;
 		///  </code> 
 		/// </example> 
 		/// </summary>
-		public static Mozu.Api.Contracts.PaymentService.Response.SyncResponse Create(ServiceClientMessageHandler handler, 
- 		 Mozu.Api.Contracts.PaymentService.PublicCard request, 
-		 HttpStatusCode expectedCode = HttpStatusCode.Created, HttpStatusCode successCode = HttpStatusCode.Created)
+		public static List<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAttribute> GetCheckoutAttributes(ServiceClientMessageHandler handler, 
+ 		 string checkoutId, 
+		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
 		{
 			SetSdKparameters();
 			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
 			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
 			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Commerce.Payments.PublicCardsClient.CreateClient(
-				 request :  request		);
+			var apiClient = Mozu.Api.Clients.Commerce.Checkouts.OrderAttributeClient.GetCheckoutAttributesClient(
+				 checkoutId :  checkoutId		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,28 +69,28 @@ public static Mozu.Api.Contracts.PaymentService.Response.SyncResponse Create(Ser
 		}
   
 		/// <summary> 
-		/// payments-cards Put Update description DOCUMENT_HERE 
+		/// 
 		/// <example> 
 		///  <code> 
-		/// var result = PublicCardsFactory.Update(handler : handler,  request :  request,  cardId :  cardId,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<SyncResponse/>(result); 
+		/// var result = OrderAttributeFactory.CreateCheckoutAttributes(handler : handler,  checkoutAttributes :  checkoutAttributes,  checkoutId :  checkoutId,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<List<OrderAttribute>/>(result); 
 		/// return optionalCasting;
 		///  </code> 
 		/// </example> 
 		/// </summary>
-		public static Mozu.Api.Contracts.PaymentService.Response.SyncResponse Update(ServiceClientMessageHandler handler, 
- 		 Mozu.Api.Contracts.PaymentService.PublicCard request, string cardId, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
+		public static List<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAttribute> CreateCheckoutAttributes(ServiceClientMessageHandler handler, 
+ 		 List<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAttribute> checkoutAttributes, string checkoutId, 
+		 HttpStatusCode expectedCode = HttpStatusCode.Created, HttpStatusCode successCode = HttpStatusCode.Created)
 		{
 			SetSdKparameters();
 			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
 			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
 			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Commerce.Payments.PublicCardsClient.UpdateClient(
-				 request :  request,  cardId :  cardId		);
+			var apiClient = Mozu.Api.Clients.Commerce.Checkouts.OrderAttributeClient.CreateCheckoutAttributesClient(
+				 checkoutAttributes :  checkoutAttributes,  checkoutId :  checkoutId		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,28 +107,28 @@ public static Mozu.Api.Contracts.PaymentService.Response.SyncResponse Update(Ser
 		}
   
 		/// <summary> 
-		/// payments-cards Delete Delete description DOCUMENT_HERE 
+		/// 
 		/// <example> 
 		///  <code> 
-		/// var result = PublicCardsFactory.Delete(handler : handler,  cardId :  cardId,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<void/>(result); 
+		/// var result = OrderAttributeFactory.UpdateCheckoutAttribute(handler : handler,  checkoutAttributes :  checkoutAttributes,  checkoutId :  checkoutId,  removeMissing :  removeMissing,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<List<OrderAttribute>/>(result); 
 		/// return optionalCasting;
 		///  </code> 
 		/// </example> 
 		/// </summary>
-		public static void Delete(ServiceClientMessageHandler handler, 
- 		string cardId, 
-		 HttpStatusCode expectedCode = HttpStatusCode.NoContent, HttpStatusCode successCode = HttpStatusCode.NoContent)
+		public static List<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAttribute> UpdateCheckoutAttribute(ServiceClientMessageHandler handler, 
+ 		 List<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAttribute> checkoutAttributes, string checkoutId, bool? removeMissing = null, 
+		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
 		{
 			SetSdKparameters();
 			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
 			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
 			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Commerce.Payments.PublicCardsClient.DeleteClient(
-				 cardId :  cardId		);
+			var apiClient = Mozu.Api.Clients.Commerce.Checkouts.OrderAttributeClient.UpdateCheckoutAttributeClient(
+				 checkoutAttributes :  checkoutAttributes,  checkoutId :  checkoutId,  removeMissing :  removeMissing		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -135,8 +136,9 @@ public static void Delete(ServiceClientMessageHandler handler,
 				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
 				if (customException != null)
 					throw customException;
+				return null;
 			}
-			var noResponse = ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
+			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
 					 ? (apiClient.Result()) 
 					 : null;
 
diff --git a/Mozu.Api.Test/Factories/StorefrontProductCategoryRuntimeFactory.cs b/Mozu.Api.Test/Factories/Commerce/Checkouts/OrderItemFactory.cs
old mode 100644
new mode 100755
similarity index 56%
rename from Mozu.Api.Test/Factories/StorefrontProductCategoryRuntimeFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Checkouts/OrderItemFactory.cs
index 5fb5c2a8..8a69c527
--- a/Mozu.Api.Test/Factories/StorefrontProductCategoryRuntimeFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Checkouts/OrderItemFactory.cs
@@ -18,40 +18,41 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Checkouts
 {
 	/// <summary>
-	/// Use the Storefront Categories resource to view the product category hierarchy as it appears to shoppers who are browsing the storefront. The hierarchy can be returned as a flat list or as a category tree.
+	/// 
 	/// </summary>
-	public partial class StorefrontProductCategoryRuntimeFactory : BaseDataFactory
+	public partial class OrderItemFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a list of categories according to any specified filter criteria and sort options.
+		/// 
 		/// <example> 
 		///  <code> 
-		/// var result = ProductCategoryRuntimeFactory.GetCategories(handler : handler,  filter :  filter,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<CategoryPagedCollection/>(result); 
+		/// var result = OrderItemFactory.SplitItem(handler : handler,  checkoutId :  checkoutId,  itemId :  itemId,  quantity :  quantity,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<Checkout/>(result); 
 		/// return optionalCasting;
 		///  </code> 
 		/// </example> 
 		/// </summary>
-		public static Mozu.Api.Contracts.ProductRuntime.CategoryPagedCollection GetCategories(ServiceClientMessageHandler handler, 
- 		 string filter = null, int? startIndex = null, int? pageSize = null, string sortBy = null, string responseFields = null, 
+		public static Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout SplitItem(ServiceClientMessageHandler handler, 
+ 		 string checkoutId, string itemId, int? quantity = null, string responseFields = null, 
 		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
 		{
 			SetSdKparameters();
 			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
 			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
 			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Commerce.Catalog.Storefront.CategoryClient.GetCategoriesClient(
-				 filter :  filter,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  responseFields :  responseFields		);
+			var apiClient = Mozu.Api.Clients.Commerce.Checkouts.OrderItemClient.SplitItemClient(
+				 checkoutId :  checkoutId,  itemId :  itemId,  quantity :  quantity,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,28 +69,28 @@ public static Mozu.Api.Contracts.ProductRuntime.CategoryPagedCollection GetCateg
 		}
   
 		/// <summary> 
-		/// Retrieves the details of a single category.
+		/// 
 		/// <example> 
 		///  <code> 
-		/// var result = ProductCategoryRuntimeFactory.GetCategory(handler : handler,  categoryId :  categoryId,  allowInactive :  allowInactive,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<Category/>(result); 
+		/// var result = OrderItemFactory.BulkUpdateItemDestinations(handler : handler,  itemsForDestination :  itemsForDestination,  checkoutId :  checkoutId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<Checkout/>(result); 
 		/// return optionalCasting;
 		///  </code> 
 		/// </example> 
 		/// </summary>
-		public static Mozu.Api.Contracts.ProductRuntime.Category GetCategory(ServiceClientMessageHandler handler, 
- 		 int categoryId, bool? allowInactive = null, string responseFields = null, 
+		public static Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout BulkUpdateItemDestinations(ServiceClientMessageHandler handler, 
+ 		 List<Mozu.Api.Contracts.CommerceRuntime.Checkouts.ItemsForDestination> itemsForDestination, string checkoutId, string responseFields = null, 
 		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
 		{
 			SetSdKparameters();
 			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
 			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
 			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Commerce.Catalog.Storefront.CategoryClient.GetCategoryClient(
-				 categoryId :  categoryId,  allowInactive :  allowInactive,  responseFields :  responseFields		);
+			var apiClient = Mozu.Api.Clients.Commerce.Checkouts.OrderItemClient.BulkUpdateItemDestinationsClient(
+				 itemsForDestination :  itemsForDestination,  checkoutId :  checkoutId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,28 +107,28 @@ public static Mozu.Api.Contracts.ProductRuntime.Category GetCategory(ServiceClie
 		}
   
 		/// <summary> 
-		/// Retrieves the list of product categories that appear on the storefront organized in a hierarchical format. Hidden categories do not appear in the list.
+		/// 
 		/// <example> 
 		///  <code> 
-		/// var result = ProductCategoryRuntimeFactory.GetCategoryTree(handler : handler,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<CategoryCollection/>(result); 
+		/// var result = OrderItemFactory.UpdateItemDestination(handler : handler,  checkoutId :  checkoutId,  itemId :  itemId,  destinationId :  destinationId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<Checkout/>(result); 
 		/// return optionalCasting;
 		///  </code> 
 		/// </example> 
 		/// </summary>
-		public static Mozu.Api.Contracts.ProductRuntime.CategoryCollection GetCategoryTree(ServiceClientMessageHandler handler, 
- 		 string responseFields = null, 
+		public static Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout UpdateItemDestination(ServiceClientMessageHandler handler, 
+ 		 string checkoutId, string itemId, string destinationId, string responseFields = null, 
 		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
 		{
 			SetSdKparameters();
 			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
 			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
 			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Commerce.Catalog.Storefront.CategoryClient.GetCategoryTreeClient(
-				 responseFields :  responseFields		);
+			var apiClient = Mozu.Api.Clients.Commerce.Checkouts.OrderItemClient.UpdateItemDestinationClient(
+				 checkoutId :  checkoutId,  itemId :  itemId,  destinationId :  destinationId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/GeneralSettingFactory.cs b/Mozu.Api.Test/Factories/Commerce/Checkouts/PaymentFactory.cs
old mode 100644
new mode 100755
similarity index 58%
rename from Mozu.Api.Test/Factories/GeneralSettingFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Checkouts/PaymentFactory.cs
index d4616929..e7f46cf7
--- a/Mozu.Api.Test/Factories/GeneralSettingFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Checkouts/PaymentFactory.cs
@@ -18,40 +18,41 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Checkouts
 {
 	/// <summary>
-	/// Define global site settings such as the site name, shipping and email addresses, and logo images. Block undesirable IP addresses using this resource.
+	/// 
 	/// </summary>
-	public partial class GeneralSettingFactory : BaseDataFactory
+	public partial class PaymentFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieve a site's general global settings.
+		/// 
 		/// <example> 
 		///  <code> 
-		/// var result = GeneralSettingFactory.GetGeneralSettings(handler : handler,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<GeneralSettings/>(result); 
+		/// var result = PaymentFactory.PerformPaymentAction(handler : handler,  action :  action,  checkoutId :  checkoutId,  paymentId :  paymentId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<Checkout/>(result); 
 		/// return optionalCasting;
 		///  </code> 
 		/// </example> 
 		/// </summary>
-		public static Mozu.Api.Contracts.SiteSettings.General.GeneralSettings GetGeneralSettings(ServiceClientMessageHandler handler, 
- 		 string responseFields = null, 
+		public static Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout PerformPaymentAction(ServiceClientMessageHandler handler, 
+ 		 Mozu.Api.Contracts.CommerceRuntime.Payments.PaymentAction action, string checkoutId, string paymentId, string responseFields = null, 
 		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
 		{
 			SetSdKparameters();
 			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
 			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
 			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Commerce.Settings.GeneralSettingsClient.GetGeneralSettingsClient(
-				 responseFields :  responseFields		);
+			var apiClient = Mozu.Api.Clients.Commerce.Checkouts.PaymentClient.PerformPaymentActionClient(
+				 action :  action,  checkoutId :  checkoutId,  paymentId :  paymentId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,28 +69,28 @@ public static Mozu.Api.Contracts.SiteSettings.General.GeneralSettings GetGeneral
 		}
   
 		/// <summary> 
-		/// Updates a site's general global settings.
+		/// 
 		/// <example> 
 		///  <code> 
-		/// var result = GeneralSettingFactory.UpdateGeneralSettings(handler : handler,  generalSettings :  generalSettings,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<GeneralSettings/>(result); 
+		/// var result = PaymentFactory.CreatePaymentAction(handler : handler,  action :  action,  checkoutId :  checkoutId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<Checkout/>(result); 
 		/// return optionalCasting;
 		///  </code> 
 		/// </example> 
 		/// </summary>
-		public static Mozu.Api.Contracts.SiteSettings.General.GeneralSettings UpdateGeneralSettings(ServiceClientMessageHandler handler, 
- 		 Mozu.Api.Contracts.SiteSettings.General.GeneralSettings generalSettings, string responseFields = null, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
+		public static Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout CreatePaymentAction(ServiceClientMessageHandler handler, 
+ 		 Mozu.Api.Contracts.CommerceRuntime.Payments.PaymentAction action, string checkoutId, string responseFields = null, 
+		 HttpStatusCode expectedCode = HttpStatusCode.Created, HttpStatusCode successCode = HttpStatusCode.Created)
 		{
 			SetSdKparameters();
 			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
 			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
 			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Commerce.Settings.GeneralSettingsClient.UpdateGeneralSettingsClient(
-				 generalSettings :  generalSettings,  responseFields :  responseFields		);
+			var apiClient = Mozu.Api.Clients.Commerce.Checkouts.PaymentClient.CreatePaymentActionClient(
+				 action :  action,  checkoutId :  checkoutId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/CardFactory.cs b/Mozu.Api.Test/Factories/Commerce/Customer/Accounts/CardFactory.cs
old mode 100644
new mode 100755
similarity index 90%
rename from Mozu.Api.Test/Factories/CardFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Customer/Accounts/CardFactory.cs
index 9eaf054e..6768169e
--- a/Mozu.Api.Test/Factories/CardFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Customer/Accounts/CardFactory.cs
@@ -18,19 +18,20 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Customer.Accounts
 {
 	/// <summary>
-	/// Use the Cards subresource to manage stored credit cards for customer accounts.  stores limited card data in the Customer service for expedited ordering purposes; however, the complete card data is stored in the Payment service.
+	/// Use the Cards subresource to manage stored credit cards for customer accounts. Mozu stores limited card data in the Customer service for expedited ordering purposes; however, the complete card data is stored in the Payment service.
 	/// </summary>
 	public partial class CardFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves the details of a credit card stored with a customer account billing contact.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CardFactory.GetAccountCard(handler : handler,  accountId :  accountId,  cardId :  cardId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.Customer.Card GetAccountCard(ServiceClientMessa
 				 accountId :  accountId,  cardId :  cardId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.Customer.Card GetAccountCard(ServiceClientMessa
 		}
   
 		/// <summary> 
-		/// Retrieves all stored credit cards for the customer account.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CardFactory.GetAccountCards(handler : handler,  accountId :  accountId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.Customer.CardCollection GetAccountCards(Service
 				 accountId :  accountId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.Customer.CardCollection GetAccountCards(Service
 		}
   
 		/// <summary> 
-		/// Creates a new credit card record and stores it for the customer account.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CardFactory.AddAccountCard(handler : handler,  card :  card,  accountId :  accountId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.Customer.Card AddAccountCard(ServiceClientMessa
 				 card :  card,  accountId :  accountId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.Customer.Card AddAccountCard(ServiceClientMessa
 		}
   
 		/// <summary> 
-		/// Update one or more properties of a credit card defined for a customer account.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CardFactory.UpdateAccountCard(handler : handler,  card :  card,  accountId :  accountId,  cardId :  cardId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static Mozu.Api.Contracts.Customer.Card UpdateAccountCard(ServiceClientMe
 				 card :  card,  accountId :  accountId,  cardId :  cardId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -182,7 +183,7 @@ public static Mozu.Api.Contracts.Customer.Card UpdateAccountCard(ServiceClientMe
 		}
   
 		/// <summary> 
-		/// Removes a stored credit card from a customer account.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CardFactory.DeleteAccountCard(handler : handler,  accountId :  accountId,  cardId :  cardId,  expectedCode: expectedCode, successCode: successCode); 
@@ -203,7 +204,7 @@ public static void DeleteAccountCard(ServiceClientMessageHandler handler,
 				 accountId :  accountId,  cardId :  cardId		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/CustomerAttributeFactory.cs b/Mozu.Api.Test/Factories/Commerce/Customer/Accounts/CustomerAttributeFactory.cs
old mode 100644
new mode 100755
similarity index 92%
rename from Mozu.Api.Test/Factories/CustomerAttributeFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Customer/Accounts/CustomerAttributeFactory.cs
index 1ae0573c..707fbcd7
--- a/Mozu.Api.Test/Factories/CustomerAttributeFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Customer/Accounts/CustomerAttributeFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Customer.Accounts
 {
 	/// <summary>
 	/// Use the Attributes subresource to manage the attributes used to uniquely identify shopper accounts, such as gender or age.
@@ -30,7 +31,7 @@ public partial class CustomerAttributeFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves the contents of an attribute associated with the specified customer account.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CustomerAttributeFactory.GetAccountAttribute(handler : handler,  accountId :  accountId,  attributeFQN :  attributeFQN,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.Customer.CustomerAttribute GetAccountAttribute(
 				 accountId :  accountId,  attributeFQN :  attributeFQN,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.Customer.CustomerAttribute GetAccountAttribute(
 		}
   
 		/// <summary> 
-		/// Retrieves the list of customer account attributes.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CustomerAttributeFactory.GetAccountAttributes(handler : handler,  accountId :  accountId,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.Customer.CustomerAttributeCollection GetAccount
 				 accountId :  accountId,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.Customer.CustomerAttributeCollection GetAccount
 		}
   
 		/// <summary> 
-		/// Applies a defined attribute to the customer account specified in the request and assigns a value to the customer attribute.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CustomerAttributeFactory.AddAccountAttribute(handler : handler,  attribute :  attribute,  accountId :  accountId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.Customer.CustomerAttribute AddAccountAttribute(
 				 attribute :  attribute,  accountId :  accountId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.Customer.CustomerAttribute AddAccountAttribute(
 		}
   
 		/// <summary> 
-		/// Updates one or more details of a customer account attribute.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CustomerAttributeFactory.UpdateAccountAttribute(handler : handler,  attribute :  attribute,  accountId :  accountId,  attributeFQN :  attributeFQN,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static Mozu.Api.Contracts.Customer.CustomerAttribute UpdateAccountAttribu
 				 attribute :  attribute,  accountId :  accountId,  attributeFQN :  attributeFQN,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -182,7 +183,7 @@ public static Mozu.Api.Contracts.Customer.CustomerAttribute UpdateAccountAttribu
 		}
   
 		/// <summary> 
-		/// Removes the attribute specified in the request from the customer account.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CustomerAttributeFactory.DeleteAccountAttribute(handler : handler,  accountId :  accountId,  attributeFQN :  attributeFQN,  expectedCode: expectedCode, successCode: successCode); 
@@ -203,7 +204,7 @@ public static void DeleteAccountAttribute(ServiceClientMessageHandler handler,
 				 accountId :  accountId,  attributeFQN :  attributeFQN		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/CustomerAuditEntryFactory.cs b/Mozu.Api.Test/Factories/Commerce/Customer/Accounts/CustomerAuditEntryFactory.cs
old mode 100644
new mode 100755
similarity index 91%
rename from Mozu.Api.Test/Factories/CustomerAuditEntryFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Customer/Accounts/CustomerAuditEntryFactory.cs
index 7985cc9d..bb1c2b8c
--- a/Mozu.Api.Test/Factories/CustomerAuditEntryFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Customer/Accounts/CustomerAuditEntryFactory.cs
@@ -18,19 +18,20 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Customer.Accounts
 {
 	/// <summary>
-	/// Use the Audit Log resource to retrieve audit logs for customer accounts.
+	/// 
 	/// </summary>
 	public partial class CustomerAuditEntryFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves audit log entries for the specified customer account.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CustomerAuditEntryFactory.GetAccountAuditLog(handler : handler,  accountId :  accountId,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.Customer.CustomerAuditEntryCollection GetAccoun
 				 accountId :  accountId,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/CustomerContactFactory.cs b/Mozu.Api.Test/Factories/Commerce/Customer/Accounts/CustomerContactFactory.cs
old mode 100644
new mode 100755
similarity index 79%
rename from Mozu.Api.Test/Factories/CustomerContactFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Customer/Accounts/CustomerContactFactory.cs
index 0afaeeae..a7cd18f5
--- a/Mozu.Api.Test/Factories/CustomerContactFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Customer/Accounts/CustomerContactFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Customer.Accounts
 {
 	/// <summary>
 	/// Merchants and customers can create, view, update, and delete a contact for a customer account. A customer account may have multiple contacts for billing and shipping addresses.
@@ -30,7 +31,7 @@ public partial class CustomerContactFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves the specified contact for a customer account such as a billing or shipping contact.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CustomerContactFactory.GetAccountContact(handler : handler,  accountId :  accountId,  contactId :  contactId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.Customer.CustomerContact GetAccountContact(Serv
 				 accountId :  accountId,  contactId :  contactId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.Customer.CustomerContact GetAccountContact(Serv
 		}
   
 		/// <summary> 
-		/// Retrieves a list of contacts for a customer according to any specified filter criteria and sort options.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CustomerContactFactory.GetAccountContacts(handler : handler,  accountId :  accountId,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.Customer.CustomerContactCollection GetAccountCo
 				 accountId :  accountId,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.Customer.CustomerContactCollection GetAccountCo
 		}
   
 		/// <summary> 
-		/// Creates a new contact for a customer account such as a new shipping address.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CustomerContactFactory.AddAccountContact(handler : handler,  contact :  contact,  accountId :  accountId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.Customer.CustomerContact AddAccountContact(Serv
 				 contact :  contact,  accountId :  accountId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.Customer.CustomerContact AddAccountContact(Serv
 		}
   
 		/// <summary> 
-		/// Updates a contact for a specified customer account such as to update addresses or change which contact is the primary contact for billing.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CustomerContactFactory.UpdateAccountContact(handler : handler,  contact :  contact,  accountId :  accountId,  contactId :  contactId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static Mozu.Api.Contracts.Customer.CustomerContact UpdateAccountContact(S
 				 contact :  contact,  accountId :  accountId,  contactId :  contactId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -182,7 +183,45 @@ public static Mozu.Api.Contracts.Customer.CustomerContact UpdateAccountContact(S
 		}
   
 		/// <summary> 
-		/// Deletes a contact for the specified customer account.
+		/// 
+		/// <example> 
+		///  <code> 
+		/// var result = CustomerContactFactory.AddAccountContactList(handler : handler,  contactList :  contactList,  accountId :  accountId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<CustomerContactCollection/>(result); 
+		/// return optionalCasting;
+		///  </code> 
+		/// </example> 
+		/// </summary>
+		public static Mozu.Api.Contracts.Customer.CustomerContactCollection AddAccountContactList(ServiceClientMessageHandler handler, 
+ 		 List<Mozu.Api.Contracts.Customer.CustomerContact> contactList, int accountId, string responseFields = null, 
+		 HttpStatusCode expectedCode = HttpStatusCode.Created, HttpStatusCode successCode = HttpStatusCode.Created)
+		{
+			SetSdKparameters();
+			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
+			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
+			var apiClient = Mozu.Api.Clients.Commerce.Customer.Accounts.CustomerContactClient.AddAccountContactListClient(
+				 contactList :  contactList,  accountId :  accountId,  responseFields :  responseFields		);
+			try
+			{
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
+			}
+			catch (ApiException ex)
+			{
+				// Custom error handling for test cases can be placed here
+				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
+				if (customException != null)
+					throw customException;
+				return null;
+			}
+			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
+					 ? (apiClient.Result()) 
+					 : null;
+
+		}
+  
+		/// <summary> 
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CustomerContactFactory.DeleteAccountContact(handler : handler,  accountId :  accountId,  contactId :  contactId,  expectedCode: expectedCode, successCode: successCode); 
@@ -203,7 +242,7 @@ public static void DeleteAccountContact(ServiceClientMessageHandler handler,
 				 accountId :  accountId,  contactId :  contactId		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/CustomerNoteFactory.cs b/Mozu.Api.Test/Factories/Commerce/Customer/Accounts/CustomerNoteFactory.cs
old mode 100644
new mode 100755
similarity index 90%
rename from Mozu.Api.Test/Factories/CustomerNoteFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Customer/Accounts/CustomerNoteFactory.cs
index f3c712b9..57f7db54
--- a/Mozu.Api.Test/Factories/CustomerNoteFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Customer/Accounts/CustomerNoteFactory.cs
@@ -18,19 +18,20 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Customer.Accounts
 {
 	/// <summary>
-	/// This resources manages notes for a customer account. For example, a client can track a shopper's interests or complaints. Only clients can add and view notes. Shoppers cannot view these notes from the My Account page.
+	/// Tenant administrators can add and view internal notes for a customer account. For example, a client can track a shopper's interests or complaints. Only clients can add and view notes. Shoppers cannot view these notes from the My Account page.
 	/// </summary>
 	public partial class CustomerNoteFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves the contents of a particular note attached to a specified customer account.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CustomerNoteFactory.GetAccountNote(handler : handler,  accountId :  accountId,  noteId :  noteId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.Customer.CustomerNote GetAccountNote(ServiceCli
 				 accountId :  accountId,  noteId :  noteId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.Customer.CustomerNote GetAccountNote(ServiceCli
 		}
   
 		/// <summary> 
-		/// Retrieves a list of notes added to a customer account according to any specified filter criteria and sort options.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CustomerNoteFactory.GetAccountNotes(handler : handler,  accountId :  accountId,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.Customer.CustomerNoteCollection GetAccountNotes
 				 accountId :  accountId,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.Customer.CustomerNoteCollection GetAccountNotes
 		}
   
 		/// <summary> 
-		/// Adds a new note to the specified customer account.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CustomerNoteFactory.AddAccountNote(handler : handler,  note :  note,  accountId :  accountId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.Customer.CustomerNote AddAccountNote(ServiceCli
 				 note :  note,  accountId :  accountId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.Customer.CustomerNote AddAccountNote(ServiceCli
 		}
   
 		/// <summary> 
-		/// Modifies an existing note for a customer account.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CustomerNoteFactory.UpdateAccountNote(handler : handler,  note :  note,  accountId :  accountId,  noteId :  noteId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static Mozu.Api.Contracts.Customer.CustomerNote UpdateAccountNote(Service
 				 note :  note,  accountId :  accountId,  noteId :  noteId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -182,7 +183,7 @@ public static Mozu.Api.Contracts.Customer.CustomerNote UpdateAccountNote(Service
 		}
   
 		/// <summary> 
-		/// Removes a note from the specified customer account.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CustomerNoteFactory.DeleteAccountNote(handler : handler,  accountId :  accountId,  noteId :  noteId,  expectedCode: expectedCode, successCode: successCode); 
@@ -203,7 +204,7 @@ public static void DeleteAccountNote(ServiceClientMessageHandler handler,
 				 accountId :  accountId,  noteId :  noteId		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/CustomerPurchaseOrderAccountFactory.cs b/Mozu.Api.Test/Factories/Commerce/Customer/Accounts/CustomerPurchaseOrderAccountFactory.cs
old mode 100644
new mode 100755
similarity index 90%
rename from Mozu.Api.Test/Factories/CustomerPurchaseOrderAccountFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Customer/Accounts/CustomerPurchaseOrderAccountFactory.cs
index da904808..1c81e510
--- a/Mozu.Api.Test/Factories/CustomerPurchaseOrderAccountFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Customer/Accounts/CustomerPurchaseOrderAccountFactory.cs
@@ -18,19 +18,20 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Customer.Accounts
 {
 	/// <summary>
-	/// Use the Customer Account Purchase Order resource to manage purchase order details for specific customer acocunts.
+	/// 
 	/// </summary>
 	public partial class CustomerPurchaseOrderAccountFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves the details of the specified customer purchase order account.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CustomerPurchaseOrderAccountFactory.GetCustomerPurchaseOrderAccount(handler : handler,  accountId :  accountId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.Customer.CustomerPurchaseOrderAccount GetCustom
 				 accountId :  accountId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.Customer.CustomerPurchaseOrderAccount GetCustom
 		}
   
 		/// <summary> 
-		/// Retrieves a list of purchase order transactions for the specified customer account according to any specified sort options.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CustomerPurchaseOrderAccountFactory.GetCustomerPurchaseOrderTransactions(handler : handler,  accountId :  accountId,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.Customer.PurchaseOrderTransactionCollection Get
 				 accountId :  accountId,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.Customer.PurchaseOrderTransactionCollection Get
 		}
   
 		/// <summary> 
-		/// Adds a purchase order account to the specified customer account.This adds the ability for the specified customer account to use the purchase order payment method.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CustomerPurchaseOrderAccountFactory.CreateCustomerPurchaseOrderAccount(handler : handler,  customerPurchaseOrderAccount :  customerPurchaseOrderAccount,  accountId :  accountId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.Customer.CustomerPurchaseOrderAccount CreateCus
 				 customerPurchaseOrderAccount :  customerPurchaseOrderAccount,  accountId :  accountId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.Customer.CustomerPurchaseOrderAccount CreateCus
 		}
   
 		/// <summary> 
-		/// Creates a purchase order transaction on the specified customer purchase order account.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CustomerPurchaseOrderAccountFactory.CreatePurchaseOrderTransaction(handler : handler,  purchaseOrderTransaction :  purchaseOrderTransaction,  accountId :  accountId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static Mozu.Api.Contracts.Customer.PurchaseOrderTransaction CreatePurchas
 				 purchaseOrderTransaction :  purchaseOrderTransaction,  accountId :  accountId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -182,7 +183,7 @@ public static Mozu.Api.Contracts.Customer.PurchaseOrderTransaction CreatePurchas
 		}
   
 		/// <summary> 
-		/// Updates the details of the purchase order account for the specified customer account.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CustomerPurchaseOrderAccountFactory.UpdateCustomerPurchaseOrderAccount(handler : handler,  customerPurchaseOrderAccount :  customerPurchaseOrderAccount,  accountId :  accountId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -203,7 +204,7 @@ public static Mozu.Api.Contracts.Customer.CustomerPurchaseOrderAccount UpdateCus
 				 customerPurchaseOrderAccount :  customerPurchaseOrderAccount,  accountId :  accountId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -220,7 +221,7 @@ public static Mozu.Api.Contracts.Customer.CustomerPurchaseOrderAccount UpdateCus
 		}
   
 		/// <summary> 
-		/// Deletes the specified customer purchase order account.This removes the ability for the specified customer account to use the purchase order payment method.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CustomerPurchaseOrderAccountFactory.DeleteCustomerPurchaseOrderAccount(handler : handler,  accountId :  accountId,  expectedCode: expectedCode, successCode: successCode); 
@@ -241,7 +242,7 @@ public static void DeleteCustomerPurchaseOrderAccount(ServiceClientMessageHandle
 				 accountId :  accountId		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/CustomerSegmentAccountsFactory.cs b/Mozu.Api.Test/Factories/Commerce/Customer/Accounts/CustomerSegmentAccountsFactory.cs
old mode 100644
new mode 100755
similarity index 93%
rename from Mozu.Api.Test/Factories/CustomerSegmentAccountsFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Customer/Accounts/CustomerSegmentAccountsFactory.cs
index f5677a0b..92d53afd
--- a/Mozu.Api.Test/Factories/CustomerSegmentAccountsFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Customer/Accounts/CustomerSegmentAccountsFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Customer.Accounts
 {
 	/// <summary>
 	/// Use the Customer Account Segments subresource to view the customer segments associated with a customer account.
@@ -30,7 +31,7 @@ public partial class CustomerSegmentAccountsFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves the list of segments associated with a customer account.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CustomerSegmentFactory.GetAccountSegments(handler : handler,  accountId :  accountId,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.Customer.CustomerSegmentCollection GetAccountSe
 				 accountId :  accountId,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/TransactionFactory.cs b/Mozu.Api.Test/Factories/Commerce/Customer/Accounts/TransactionFactory.cs
old mode 100644
new mode 100755
similarity index 92%
rename from Mozu.Api.Test/Factories/TransactionFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Customer/Accounts/TransactionFactory.cs
index 0ee9933e..dfb8e8e1
--- a/Mozu.Api.Test/Factories/TransactionFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Customer/Accounts/TransactionFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Customer.Accounts
 {
 	/// <summary>
 	/// Use the Customer Account Transactions resource to manage the transactions associated with a customer account.
@@ -30,7 +31,7 @@ public partial class TransactionFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a list of transactions associated with the customer account specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = TransactionFactory.GetTransactions(handler : handler,  accountId :  accountId,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public partial class TransactionFactory : BaseDataFactory
 				 accountId :  accountId		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public partial class TransactionFactory : BaseDataFactory
 		}
   
 		/// <summary> 
-		/// Creates a new transaction for the customer account specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = TransactionFactory.AddTransaction(handler : handler,  transaction :  transaction,  accountId :  accountId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.Customer.Transaction AddTransaction(ServiceClie
 				 transaction :  transaction,  accountId :  accountId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.Customer.Transaction AddTransaction(ServiceClie
 		}
   
 		/// <summary> 
-		/// Deletes a transaction from the customer account specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = TransactionFactory.RemoveTransaction(handler : handler,  accountId :  accountId,  transactionId :  transactionId,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static void RemoveTransaction(ServiceClientMessageHandler handler,
 				 accountId :  accountId,  transactionId :  transactionId		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/AddressValidationRequestFactory.cs b/Mozu.Api.Test/Factories/Commerce/Customer/AddressValidationRequestFactory.cs
old mode 100644
new mode 100755
similarity index 93%
rename from Mozu.Api.Test/Factories/AddressValidationRequestFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Customer/AddressValidationRequestFactory.cs
index 65ed9db8..8cda1366
--- a/Mozu.Api.Test/Factories/AddressValidationRequestFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Customer/AddressValidationRequestFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Customer
 {
 	/// <summary>
 	/// Use the Address Validation resource to validate addresses associated with a customer account contact.
@@ -30,7 +31,7 @@ public partial class AddressValidationRequestFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Validates the customer address supplied in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = AddressValidationRequestFactory.ValidateAddress(handler : handler,  addressValidationRequest :  addressValidationRequest,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.Customer.AddressValidationResponse ValidateAddr
 				 addressValidationRequest :  addressValidationRequest,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/Commerce/Customer/Attributedefinition/AttributeFactory.cs b/Mozu.Api.Test/Factories/Commerce/Customer/Attributedefinition/AttributeFactory.cs
new file mode 100755
index 00000000..14d256ae
--- /dev/null
+++ b/Mozu.Api.Test/Factories/Commerce/Customer/Attributedefinition/AttributeFactory.cs
@@ -0,0 +1,228 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+#region Usings Setup
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Net;
+using Mozu.Api;
+using Mozu.Api.Security;
+using Mozu.Api.Test.Helpers;
+using System.Diagnostics;
+using Newtonsoft.Json.Linq;
+using System.Threading;
+
+#endregion
+
+namespace Mozu.Api.Test.Factories.Commerce.Customer.Attributedefinition
+{
+	/// <summary>
+	/// Use the Customer Attribute Definition resource to manage the attributes to define for your shoppers.
+	/// </summary>
+	public partial class AttributeFactory : BaseDataFactory
+	{
+
+		/// <summary> 
+		/// 
+		/// <example> 
+		///  <code> 
+		/// var result = AttributeFactory.GetAttributes(handler : handler,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<AttributeCollection/>(result); 
+		/// return optionalCasting;
+		///  </code> 
+		/// </example> 
+		/// </summary>
+		public static Mozu.Api.Contracts.Core.Extensible.AttributeCollection GetAttributes(ServiceClientMessageHandler handler, 
+ 		 int? startIndex = null, int? pageSize = null, string sortBy = null, string filter = null, string responseFields = null, 
+		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
+		{
+			SetSdKparameters();
+			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
+			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
+			var apiClient = Mozu.Api.Clients.Commerce.Customer.Attributedefinition.AttributeClient.GetAttributesClient(
+				 startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields		);
+			try
+			{
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
+			}
+			catch (ApiException ex)
+			{
+				// Custom error handling for test cases can be placed here
+				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
+				if (customException != null)
+					throw customException;
+				return null;
+			}
+			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
+					 ? (apiClient.Result()) 
+					 : null;
+
+		}
+  
+		/// <summary> 
+		/// 
+		/// <example> 
+		///  <code> 
+		/// var result = AttributeFactory.GetAttributeVocabularyValues(handler : handler,  attributeFQN :  attributeFQN,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<List<AttributeVocabularyValue>/>(result); 
+		/// return optionalCasting;
+		///  </code> 
+		/// </example> 
+		/// </summary>
+		public static List<Mozu.Api.Contracts.Core.Extensible.AttributeVocabularyValue> GetAttributeVocabularyValues(ServiceClientMessageHandler handler, 
+ 		 string attributeFQN, 
+		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
+		{
+			SetSdKparameters();
+			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
+			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
+			var apiClient = Mozu.Api.Clients.Commerce.Customer.Attributedefinition.AttributeClient.GetAttributeVocabularyValuesClient(
+				 attributeFQN :  attributeFQN		);
+			try
+			{
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
+			}
+			catch (ApiException ex)
+			{
+				// Custom error handling for test cases can be placed here
+				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
+				if (customException != null)
+					throw customException;
+				return null;
+			}
+			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
+					 ? (apiClient.Result()) 
+					 : null;
+
+		}
+  
+		/// <summary> 
+		/// 
+		/// <example> 
+		///  <code> 
+		/// var result = AttributeFactory.GetAttribute(handler : handler,  attributeFQN :  attributeFQN,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<Attribute/>(result); 
+		/// return optionalCasting;
+		///  </code> 
+		/// </example> 
+		/// </summary>
+		public static Mozu.Api.Contracts.Core.Extensible.Attribute GetAttribute(ServiceClientMessageHandler handler, 
+ 		 string attributeFQN, string responseFields = null, 
+		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
+		{
+			SetSdKparameters();
+			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
+			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
+			var apiClient = Mozu.Api.Clients.Commerce.Customer.Attributedefinition.AttributeClient.GetAttributeClient(
+				 attributeFQN :  attributeFQN,  responseFields :  responseFields		);
+			try
+			{
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
+			}
+			catch (ApiException ex)
+			{
+				// Custom error handling for test cases can be placed here
+				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
+				if (customException != null)
+					throw customException;
+				return null;
+			}
+			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
+					 ? (apiClient.Result()) 
+					 : null;
+
+		}
+  
+		/// <summary> 
+		/// 
+		/// <example> 
+		///  <code> 
+		/// var result = AttributeFactory.CreateAttribute(handler : handler,  attribute :  attribute,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<Attribute/>(result); 
+		/// return optionalCasting;
+		///  </code> 
+		/// </example> 
+		/// </summary>
+		public static Mozu.Api.Contracts.Core.Extensible.Attribute CreateAttribute(ServiceClientMessageHandler handler, 
+ 		 Mozu.Api.Contracts.Core.Extensible.Attribute attribute, string responseFields = null, 
+		 HttpStatusCode expectedCode = HttpStatusCode.Created, HttpStatusCode successCode = HttpStatusCode.Created)
+		{
+			SetSdKparameters();
+			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
+			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
+			var apiClient = Mozu.Api.Clients.Commerce.Customer.Attributedefinition.AttributeClient.CreateAttributeClient(
+				 attribute :  attribute,  responseFields :  responseFields		);
+			try
+			{
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
+			}
+			catch (ApiException ex)
+			{
+				// Custom error handling for test cases can be placed here
+				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
+				if (customException != null)
+					throw customException;
+				return null;
+			}
+			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
+					 ? (apiClient.Result()) 
+					 : null;
+
+		}
+  
+		/// <summary> 
+		/// 
+		/// <example> 
+		///  <code> 
+		/// var result = AttributeFactory.UpdateAttribute(handler : handler,  attribute :  attribute,  attributeFQN :  attributeFQN,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<Attribute/>(result); 
+		/// return optionalCasting;
+		///  </code> 
+		/// </example> 
+		/// </summary>
+		public static Mozu.Api.Contracts.Core.Extensible.Attribute UpdateAttribute(ServiceClientMessageHandler handler, 
+ 		 Mozu.Api.Contracts.Core.Extensible.Attribute attribute, string attributeFQN, string responseFields = null, 
+		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
+		{
+			SetSdKparameters();
+			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
+			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
+			var apiClient = Mozu.Api.Clients.Commerce.Customer.Attributedefinition.AttributeClient.UpdateAttributeClient(
+				 attribute :  attribute,  attributeFQN :  attributeFQN,  responseFields :  responseFields		);
+			try
+			{
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
+			}
+			catch (ApiException ex)
+			{
+				// Custom error handling for test cases can be placed here
+				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
+				if (customException != null)
+					throw customException;
+				return null;
+			}
+			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
+					 ? (apiClient.Result()) 
+					 : null;
+
+		}
+  
+
+	}
+
+}
+
+
diff --git a/Mozu.Api.Test/Factories/CreditFactory.cs b/Mozu.Api.Test/Factories/Commerce/Customer/CreditFactory.cs
old mode 100644
new mode 100755
similarity index 91%
rename from Mozu.Api.Test/Factories/CreditFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Customer/CreditFactory.cs
index 3ac4bb97..04db5198
--- a/Mozu.Api.Test/Factories/CreditFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Customer/CreditFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Customer
 {
 	/// <summary>
 	/// Use the Customer Credits resource to manage the store credit associated with a customer account. Store credit can represent a static amount the customer can redeem at any of the tenant's sites, or a gift card registered for a customer account. At this time, gift card functionality is reserved for future use.
@@ -30,7 +31,7 @@ public partial class CreditFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a list of store credits applied to customer accounts, according any filter and sort criteria specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CreditFactory.GetCredits(handler : handler,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.Customer.Credit.CreditCollection GetCredits(Ser
 				 startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.Customer.Credit.CreditCollection GetCredits(Ser
 		}
   
 		/// <summary> 
-		/// Retrieves the details of a store credit applied to a customer account.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CreditFactory.GetCredit(handler : handler,  code :  code,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.Customer.Credit.Credit GetCredit(ServiceClientM
 				 code :  code,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.Customer.Credit.Credit GetCredit(ServiceClientM
 		}
   
 		/// <summary> 
-		/// Creates a new store credit for the customer account specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CreditFactory.AddCredit(handler : handler,  credit :  credit,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.Customer.Credit.Credit AddCredit(ServiceClientM
 				 credit :  credit,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.Customer.Credit.Credit AddCredit(ServiceClientM
 		}
   
 		/// <summary> 
-		/// Associates an unclaimed customer credit with the shopper user authenticated in the request header.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CreditFactory.AssociateCreditToShopper(handler : handler,  code :  code,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static Mozu.Api.Contracts.Customer.Credit.Credit AssociateCreditToShopper
 				 code :  code,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -182,7 +183,7 @@ public static Mozu.Api.Contracts.Customer.Credit.Credit AssociateCreditToShopper
 		}
   
 		/// <summary> 
-		/// Resend the notification email that informs a shopper that a credit has been created.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CreditFactory.ResendCreditCreatedEmail(handler : handler,  code :  code,  expectedCode: expectedCode, successCode: successCode); 
@@ -203,7 +204,7 @@ public static void ResendCreditCreatedEmail(ServiceClientMessageHandler handler,
 				 code :  code		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -219,7 +220,7 @@ public static void ResendCreditCreatedEmail(ServiceClientMessageHandler handler,
 		}
   
 		/// <summary> 
-		/// Updates one or more properties of a defined store credit applied to a customer account.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CreditFactory.UpdateCredit(handler : handler,  credit :  credit,  code :  code,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -240,7 +241,7 @@ public static Mozu.Api.Contracts.Customer.Credit.Credit UpdateCredit(ServiceClie
 				 credit :  credit,  code :  code,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -257,7 +258,7 @@ public static Mozu.Api.Contracts.Customer.Credit.Credit UpdateCredit(ServiceClie
 		}
   
 		/// <summary> 
-		/// Deletes a store credit previously applied to a customer account.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CreditFactory.DeleteCredit(handler : handler,  code :  code,  expectedCode: expectedCode, successCode: successCode); 
@@ -278,7 +279,7 @@ public static void DeleteCredit(ServiceClientMessageHandler handler,
 				 code :  code		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/CreditAuditEntryFactory.cs b/Mozu.Api.Test/Factories/Commerce/Customer/Credits/CreditAuditEntryFactory.cs
old mode 100644
new mode 100755
similarity index 93%
rename from Mozu.Api.Test/Factories/CreditAuditEntryFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Customer/Credits/CreditAuditEntryFactory.cs
index 3775b41a..3a4c212c
--- a/Mozu.Api.Test/Factories/CreditAuditEntryFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Customer/Credits/CreditAuditEntryFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Customer.Credits
 {
 	/// <summary>
 	/// Use the Customer Credit Audit Entries subresource to retrieve entries logged in the audit report of a store credit or gift card applied to a customer account. The system creates a new audit entry when the credit is created, deleted, activated, or deactivated. The system then creates a new audit entry each time the credit is updated or redeemed in a transaction.
@@ -30,7 +31,7 @@ public partial class CreditAuditEntryFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves the list of audit entries for the credit, according to any filter or sort criteria specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CreditAuditEntryFactory.GetAuditEntries(handler : handler,  code :  code,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.Customer.Credit.CreditAuditEntryCollection GetA
 				 code :  code,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/CreditTransactionFactory.cs b/Mozu.Api.Test/Factories/Commerce/Customer/Credits/CreditTransactionFactory.cs
old mode 100644
new mode 100755
similarity index 92%
rename from Mozu.Api.Test/Factories/CreditTransactionFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Customer/Credits/CreditTransactionFactory.cs
index 272fa854..d19fbba9
--- a/Mozu.Api.Test/Factories/CreditTransactionFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Customer/Credits/CreditTransactionFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Customer.Credits
 {
 	/// <summary>
 	/// Use the Customer Credit Transactions subresource to manage the individual transactions performed using a store credit or gift card.
@@ -30,7 +31,7 @@ public partial class CreditTransactionFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a list of the transactions performed using a customer credit that update the balance of the credit.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CreditTransactionFactory.GetTransactions(handler : handler,  code :  code,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.Customer.Credit.CreditTransactionCollection Get
 				 code :  code,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.Customer.Credit.CreditTransactionCollection Get
 		}
   
 		/// <summary> 
-		/// Creates a new transaction and updates the amount of a store credit or gift card.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CreditTransactionFactory.AddTransaction(handler : handler,  creditTransaction :  creditTransaction,  code :  code,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.Customer.Credit.CreditTransaction AddTransactio
 				 creditTransaction :  creditTransaction,  code :  code,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/CustomerAccountFactory.cs b/Mozu.Api.Test/Factories/Commerce/Customer/CustomerAccountFactory.cs
old mode 100644
new mode 100755
similarity index 92%
rename from Mozu.Api.Test/Factories/CustomerAccountFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Customer/CustomerAccountFactory.cs
index e4c85c8f..1ace6e09
--- a/Mozu.Api.Test/Factories/CustomerAccountFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Customer/CustomerAccountFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Customer
 {
 	/// <summary>
 	/// Use the Customer Accounts resource to manage the components of shopper accounts, including attributes, contact information, company notes, and groups associated with the customer account.
@@ -30,7 +31,7 @@ public partial class CustomerAccountFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a list of customer accounts.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CustomerAccountFactory.GetAccounts(handler : handler,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  fields :  fields,  q :  q,  qLimit :  qLimit,  isAnonymous :  isAnonymous,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.Customer.CustomerAccountCollection GetAccounts(
 				 startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  fields :  fields,  q :  q,  qLimit :  qLimit,  isAnonymous :  isAnonymous,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.Customer.CustomerAccountCollection GetAccounts(
 		}
   
 		/// <summary> 
-		/// Retrieves the current login state of the customer account specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CustomerAccountFactory.GetLoginState(handler : handler,  accountId :  accountId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.Customer.LoginState GetLoginState(ServiceClient
 				 accountId :  accountId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.Customer.LoginState GetLoginState(ServiceClient
 		}
   
 		/// <summary> 
-		/// Retrieve details of a customer account.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CustomerAccountFactory.GetAccount(handler : handler,  accountId :  accountId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.Customer.CustomerAccount GetAccount(ServiceClie
 				 accountId :  accountId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.Customer.CustomerAccount GetAccount(ServiceClie
 		}
   
 		/// <summary> 
-		/// Creates a new customer account based on the information specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CustomerAccountFactory.AddAccount(handler : handler,  account :  account,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static Mozu.Api.Contracts.Customer.CustomerAccount AddAccount(ServiceClie
 				 account :  account,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -182,7 +183,7 @@ public static Mozu.Api.Contracts.Customer.CustomerAccount AddAccount(ServiceClie
 		}
   
 		/// <summary> 
-		/// Modifies the password associated with a customer account.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CustomerAccountFactory.ChangePassword(handler : handler,  passwordInfo :  passwordInfo,  accountId :  accountId,  unlockAccount :  unlockAccount,  expectedCode: expectedCode, successCode: successCode); 
@@ -203,7 +204,7 @@ public static void ChangePassword(ServiceClientMessageHandler handler,
 				 passwordInfo :  passwordInfo,  accountId :  accountId,  unlockAccount :  unlockAccount		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -219,7 +220,7 @@ public static void ChangePassword(ServiceClientMessageHandler handler,
 		}
   
 		/// <summary> 
-		/// Adds a new user login to a defined customer account.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CustomerAccountFactory.AddLoginToExistingCustomer(handler : handler,  customerAuthInfo :  customerAuthInfo,  accountId :  accountId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -240,7 +241,7 @@ public static Mozu.Api.Contracts.Customer.CustomerAuthTicket AddLoginToExistingC
 				 customerAuthInfo :  customerAuthInfo,  accountId :  accountId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -257,7 +258,7 @@ public static Mozu.Api.Contracts.Customer.CustomerAuthTicket AddLoginToExistingC
 		}
   
 		/// <summary> 
-		/// Updates the customer lifetime value of the specified customer account in the event of an order import or a lifetime value calculation error.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CustomerAccountFactory.RecomputeCustomerLifetimeValue(handler : handler,  accountId :  accountId,  expectedCode: expectedCode, successCode: successCode); 
@@ -278,7 +279,7 @@ public static void RecomputeCustomerLifetimeValue(ServiceClientMessageHandler ha
 				 accountId :  accountId		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -294,7 +295,7 @@ public static void RecomputeCustomerLifetimeValue(ServiceClientMessageHandler ha
 		}
   
 		/// <summary> 
-		/// Lock or unlock a customer account.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CustomerAccountFactory.SetLoginLocked(handler : handler,  isLocked :  isLocked,  accountId :  accountId,  expectedCode: expectedCode, successCode: successCode); 
@@ -315,7 +316,7 @@ public static void SetLoginLocked(ServiceClientMessageHandler handler,
 				 isLocked :  isLocked,  accountId :  accountId		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -331,7 +332,7 @@ public static void SetLoginLocked(ServiceClientMessageHandler handler,
 		}
   
 		/// <summary> 
-		/// Requires the password for the customer account to be changed.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CustomerAccountFactory.SetPasswordChangeRequired(handler : handler,  isPasswordChangeRequired :  isPasswordChangeRequired,  accountId :  accountId,  expectedCode: expectedCode, successCode: successCode); 
@@ -352,7 +353,7 @@ public static void SetPasswordChangeRequired(ServiceClientMessageHandler handler
 				 isPasswordChangeRequired :  isPasswordChangeRequired,  accountId :  accountId		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -368,7 +369,7 @@ public static void SetPasswordChangeRequired(ServiceClientMessageHandler handler
 		}
   
 		/// <summary> 
-		/// Creates a new customer account and logs the user associated with the customer account into the site.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CustomerAccountFactory.AddAccountAndLogin(handler : handler,  accountAndAuthInfo :  accountAndAuthInfo,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -389,7 +390,7 @@ public static Mozu.Api.Contracts.Customer.CustomerAuthTicket AddAccountAndLogin(
 				 accountAndAuthInfo :  accountAndAuthInfo,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -406,7 +407,7 @@ public static Mozu.Api.Contracts.Customer.CustomerAuthTicket AddAccountAndLogin(
 		}
   
 		/// <summary> 
-		/// Creates multiple customer accounts based on the information specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CustomerAccountFactory.AddAccounts(handler : handler,  customers :  customers,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -427,7 +428,7 @@ public static Mozu.Api.Contracts.Customer.CustomerAccountCollection AddAccounts(
 				 customers :  customers,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -444,7 +445,7 @@ public static Mozu.Api.Contracts.Customer.CustomerAccountCollection AddAccounts(
 		}
   
 		/// <summary> 
-		/// Changes a collection of customer account passwords.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CustomerAccountFactory.ChangePasswords(handler : handler,  accountPasswordInfos :  accountPasswordInfos,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -465,7 +466,7 @@ public static Mozu.Api.Contracts.Customer.ChangePasswordResultCollection ChangeP
 				 accountPasswordInfos :  accountPasswordInfos,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -482,7 +483,7 @@ public static Mozu.Api.Contracts.Customer.ChangePasswordResultCollection ChangeP
 		}
   
 		/// <summary> 
-		/// Retrieves the current login state of a customer account by providing the customer's email address.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CustomerAccountFactory.GetLoginStateByEmailAddress(handler : handler,  emailAddress :  emailAddress,  customerSetCode :  customerSetCode,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -503,7 +504,7 @@ public static Mozu.Api.Contracts.Customer.LoginState GetLoginStateByEmailAddress
 				 emailAddress :  emailAddress,  customerSetCode :  customerSetCode,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -520,7 +521,7 @@ public static Mozu.Api.Contracts.Customer.LoginState GetLoginStateByEmailAddress
 		}
   
 		/// <summary> 
-		/// Retrieves the current login state of a customer account by providing the user name associated with the customer account.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CustomerAccountFactory.GetLoginStateByUserName(handler : handler,  userName :  userName,  customerSetCode :  customerSetCode,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -541,7 +542,7 @@ public static Mozu.Api.Contracts.Customer.LoginState GetLoginStateByUserName(Ser
 				 userName :  userName,  customerSetCode :  customerSetCode,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -558,7 +559,7 @@ public static Mozu.Api.Contracts.Customer.LoginState GetLoginStateByUserName(Ser
 		}
   
 		/// <summary> 
-		/// Retrieves a list of customer purchase order accounts according to according to any specified sort options.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CustomerAccountFactory.GetCustomersPurchaseOrderAccounts(handler : handler,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -579,7 +580,7 @@ public static Mozu.Api.Contracts.Customer.CustomerPurchaseOrderAccountCollection
 				 startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -596,7 +597,7 @@ public static Mozu.Api.Contracts.Customer.CustomerPurchaseOrderAccountCollection
 		}
   
 		/// <summary> 
-		/// Resets the password for a customer account.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CustomerAccountFactory.ResetPassword(handler : handler,  resetPasswordInfo :  resetPasswordInfo,  expectedCode: expectedCode, successCode: successCode); 
@@ -617,7 +618,7 @@ public static void ResetPassword(ServiceClientMessageHandler handler,
 				 resetPasswordInfo :  resetPasswordInfo		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -633,7 +634,7 @@ public static void ResetPassword(ServiceClientMessageHandler handler,
 		}
   
 		/// <summary> 
-		/// Updates a customer account.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CustomerAccountFactory.UpdateAccount(handler : handler,  account :  account,  accountId :  accountId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -654,7 +655,7 @@ public static Mozu.Api.Contracts.Customer.CustomerAccount UpdateAccount(ServiceC
 				 account :  account,  accountId :  accountId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -671,7 +672,7 @@ public static Mozu.Api.Contracts.Customer.CustomerAccount UpdateAccount(ServiceC
 		}
   
 		/// <summary> 
-		/// Deletes a customer account. A customer account cannot be deleted if any orders exist, past or present.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CustomerAccountFactory.DeleteAccount(handler : handler,  accountId :  accountId,  expectedCode: expectedCode, successCode: successCode); 
@@ -692,7 +693,7 @@ public static void DeleteAccount(ServiceClientMessageHandler handler,
 				 accountId :  accountId		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/CustomerAuthTicketFactory.cs b/Mozu.Api.Test/Factories/Commerce/Customer/CustomerAuthTicketFactory.cs
old mode 100644
new mode 100755
similarity index 92%
rename from Mozu.Api.Test/Factories/CustomerAuthTicketFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Customer/CustomerAuthTicketFactory.cs
index 75c6a257..09e98ed1
--- a/Mozu.Api.Test/Factories/CustomerAuthTicketFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Customer/CustomerAuthTicketFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Customer
 {
 	/// <summary>
 	/// Use the Customer Authentication Tickets resource to generate and refresh authentication tickets for customer accounts.
@@ -30,7 +31,7 @@ public partial class CustomerAuthTicketFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Creates an authentication ticket for an anonymous shopper user.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CustomerAuthTicketFactory.CreateAnonymousShopperAuthTicket(handler : handler,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.Customer.CustomerAuthTicket CreateAnonymousShop
 				 responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.Customer.CustomerAuthTicket CreateAnonymousShop
 		}
   
 		/// <summary> 
-		/// Generates a new authentication ticket for a customer account.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CustomerAuthTicketFactory.CreateUserAuthTicket(handler : handler,  userAuthInfo :  userAuthInfo,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.Customer.CustomerAuthTicket CreateUserAuthTicke
 				 userAuthInfo :  userAuthInfo,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.Customer.CustomerAuthTicket CreateUserAuthTicke
 		}
   
 		/// <summary> 
-		/// Refreshes an existing authentication ticket for a customer account by providing the refresh token string.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CustomerAuthTicketFactory.RefreshUserAuthTicket(handler : handler,  refreshToken :  refreshToken,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.Customer.CustomerAuthTicket RefreshUserAuthTick
 				 refreshToken :  refreshToken,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/CustomerSegmentFactory.cs b/Mozu.Api.Test/Factories/Commerce/Customer/CustomerSegmentFactory.cs
old mode 100644
new mode 100755
similarity index 91%
rename from Mozu.Api.Test/Factories/CustomerSegmentFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Customer/CustomerSegmentFactory.cs
index faa68fb0..12d1454b
--- a/Mozu.Api.Test/Factories/CustomerSegmentFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Customer/CustomerSegmentFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Customer
 {
 	/// <summary>
 	/// Use the Customer Segments resource to manage the segments that enable a client to manage groups of customers and target discounts for these segments. After a customer segment is defined, you can associate any number of customer accounts with it.
@@ -30,7 +31,7 @@ public partial class CustomerSegmentFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a list of defined customer segments according to any filter and sort criteria.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CustomerSegmentFactory.GetSegments(handler : handler,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.Customer.CustomerSegmentCollection GetSegments(
 				 startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.Customer.CustomerSegmentCollection GetSegments(
 		}
   
 		/// <summary> 
-		/// Retrieves the details of the customer segment specified in the request. This operation does not return a list of the customer accounts associated with the segment.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CustomerSegmentFactory.GetSegment(handler : handler,  id :  id,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.Customer.CustomerSegment GetSegment(ServiceClie
 				 id :  id,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.Customer.CustomerSegment GetSegment(ServiceClie
 		}
   
 		/// <summary> 
-		/// Creates a new customer segments. New customer segments do not have any associated customer accounts.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CustomerSegmentFactory.AddSegment(handler : handler,  segment :  segment,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.Customer.CustomerSegment AddSegment(ServiceClie
 				 segment :  segment,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.Customer.CustomerSegment AddSegment(ServiceClie
 		}
   
 		/// <summary> 
-		/// Adds one or more customer accounts to a defined customer segment.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CustomerSegmentFactory.AddSegmentAccounts(handler : handler,  accountIds :  accountIds,  id :  id,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static void AddSegmentAccounts(ServiceClientMessageHandler handler,
 				 accountIds :  accountIds,  id :  id		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -181,7 +182,7 @@ public static void AddSegmentAccounts(ServiceClientMessageHandler handler,
 		}
   
 		/// <summary> 
-		/// Updates the details of the customer segment specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CustomerSegmentFactory.UpdateSegment(handler : handler,  segment :  segment,  id :  id,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -202,7 +203,7 @@ public static Mozu.Api.Contracts.Customer.CustomerSegment UpdateSegment(ServiceC
 				 segment :  segment,  id :  id,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -219,7 +220,7 @@ public static Mozu.Api.Contracts.Customer.CustomerSegment UpdateSegment(ServiceC
 		}
   
 		/// <summary> 
-		/// Deletes a customer segment specified by its unique identifier. Deleting a segment removes any customer account associations, but does not delete the customer account itself.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CustomerSegmentFactory.DeleteSegment(handler : handler,  id :  id,  expectedCode: expectedCode, successCode: successCode); 
@@ -240,7 +241,7 @@ public static void DeleteSegment(ServiceClientMessageHandler handler,
 				 id :  id		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -256,7 +257,7 @@ public static void DeleteSegment(ServiceClientMessageHandler handler,
 		}
   
 		/// <summary> 
-		/// Removes single account from a segment.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CustomerSegmentFactory.RemoveSegmentAccount(handler : handler,  id :  id,  accountId :  accountId,  expectedCode: expectedCode, successCode: successCode); 
@@ -277,7 +278,7 @@ public static void RemoveSegmentAccount(ServiceClientMessageHandler handler,
 				 id :  id,  accountId :  accountId		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/CustomerSetFactory.cs b/Mozu.Api.Test/Factories/Commerce/Customer/CustomerSetFactory.cs
old mode 100644
new mode 100755
similarity index 85%
rename from Mozu.Api.Test/Factories/CustomerSetFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Customer/CustomerSetFactory.cs
index 3f67bbf6..06d33761
--- a/Mozu.Api.Test/Factories/CustomerSetFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Customer/CustomerSetFactory.cs
@@ -18,19 +18,20 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Customer
 {
 	/// <summary>
-	/// Use the Customer Sets resource to manage your customer sets. You can use customer sets to control the specific sites your customers can access using the same login credentials, as well as what customer My Account information is shared between sites.Refer to [Customer Sets](../../../guides/settings/customer-sets.htm) in the Guides section for more information.
+	/// 
 	/// </summary>
 	public partial class CustomerSetFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a collection of customer sets according to any specified filter criteria.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CustomerSetFactory.GetCustomerSets(handler : handler,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.Customer.CustomerSetCollection GetCustomerSets(
 				 startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.Customer.CustomerSetCollection GetCustomerSets(
 		}
   
 		/// <summary> 
-		/// Retrieves the details of the specified customer set.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CustomerSetFactory.GetCustomerSet(handler : handler,  code :  code,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.Customer.CustomerSet GetCustomerSet(ServiceClie
 				 code :  code,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/VisitFactory.cs b/Mozu.Api.Test/Factories/Commerce/Customer/VisitFactory.cs
old mode 100644
new mode 100755
similarity index 92%
rename from Mozu.Api.Test/Factories/VisitFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Customer/VisitFactory.cs
index 86ec9187..fabf7916
--- a/Mozu.Api.Test/Factories/VisitFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Customer/VisitFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Customer
 {
 	/// <summary>
 	/// Use the Visits resource to manage all visits a customer makes to a tenant's sites and measure the level of transactions a customer performs during a unique visit for customer account analytics. Clients can track customer visits by site (including online and in-person interactions), the transactions a customer performs during the visit, and the device type associated with the visit, if any.
@@ -30,7 +31,7 @@ public partial class VisitFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a list of customer visits according to any filter or sort criteria specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = VisitFactory.GetVisits(handler : handler,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.Customer.VisitCollection GetVisits(ServiceClien
 				 startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.Customer.VisitCollection GetVisits(ServiceClien
 		}
   
 		/// <summary> 
-		/// Retrieves the details of the customer visit specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = VisitFactory.GetVisit(handler : handler,  visitId :  visitId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.Customer.Visit GetVisit(ServiceClientMessageHan
 				 visitId :  visitId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.Customer.Visit GetVisit(ServiceClientMessageHan
 		}
   
 		/// <summary> 
-		/// Creates a new visit for the customer account specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = VisitFactory.AddVisit(handler : handler,  visit :  visit,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.Customer.Visit AddVisit(ServiceClientMessageHan
 				 visit :  visit,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.Customer.Visit AddVisit(ServiceClientMessageHan
 		}
   
 		/// <summary> 
-		/// Updates one or more properties of a defined customer visit.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = VisitFactory.UpdateVisit(handler : handler,  visit :  visit,  visitId :  visitId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static Mozu.Api.Contracts.Customer.Visit UpdateVisit(ServiceClientMessage
 				 visit :  visit,  visitId :  visitId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/InStockNotificationSubscriptionFactory.cs b/Mozu.Api.Test/Factories/Commerce/InStockNotificationSubscriptionFactory.cs
old mode 100644
new mode 100755
similarity index 92%
rename from Mozu.Api.Test/Factories/InStockNotificationSubscriptionFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/InStockNotificationSubscriptionFactory.cs
index 8d6adcb5..4be80b43
--- a/Mozu.Api.Test/Factories/InStockNotificationSubscriptionFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/InStockNotificationSubscriptionFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce
 {
 	/// <summary>
 	/// Use the Customer In-Stock Notification Subscription resource to manage the subscriptions customer accounts use to send product notifications. This resource can send a notification when a product in a catalog returns to a site's active inventory after it is out of stock, or when a new product becomes available for the first time.
@@ -30,7 +31,7 @@ public partial class InStockNotificationSubscriptionFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a list of in-stock notification subscriptions.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = InStockNotificationSubscriptionFactory.GetInStockNotificationSubscriptions(handler : handler,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.Customer.InStockNotificationSubscriptionCollect
 				 startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.Customer.InStockNotificationSubscriptionCollect
 		}
   
 		/// <summary> 
-		/// Retrieves the details of a subscription that sends a push notification when a product is available in a site's active stock.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = InStockNotificationSubscriptionFactory.GetInStockNotificationSubscription(handler : handler,  id :  id,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.Customer.InStockNotificationSubscription GetInS
 				 id :  id,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.Customer.InStockNotificationSubscription GetInS
 		}
   
 		/// <summary> 
-		/// Creates a new subscription that notifies the customer when the product specified in the request is available in the active inventory of the defined location.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = InStockNotificationSubscriptionFactory.AddInStockNotificationSubscription(handler : handler,  inStockNotificationSubscription :  inStockNotificationSubscription,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.Customer.InStockNotificationSubscription AddInS
 				 inStockNotificationSubscription :  inStockNotificationSubscription,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.Customer.InStockNotificationSubscription AddInS
 		}
   
 		/// <summary> 
-		/// Deletes a subscription for a customer in-stock notification.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = InStockNotificationSubscriptionFactory.DeleteInStockNotificationSubscription(handler : handler,  id :  id,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static void DeleteInStockNotificationSubscription(ServiceClientMessageHan
 				 id :  id		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/LocationFactory.cs b/Mozu.Api.Test/Factories/Commerce/LocationFactory.cs
old mode 100644
new mode 100755
similarity index 73%
rename from Mozu.Api.Test/Factories/LocationFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/LocationFactory.cs
index 01c2ec82..c7f11739
--- a/Mozu.Api.Test/Factories/LocationFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/LocationFactory.cs
@@ -18,29 +18,30 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce
 {
 	/// <summary>
-	/// Use the Location resource to retrieve details about a location from a  hosted storefront.
+	/// Use the Location resource to retrieve details about a location from a Mozu hosted storefront.
 	/// </summary>
 	public partial class LocationFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves the details of the location specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
-		/// var result = LocationFactory.GetLocation(handler : handler,  code :  code,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var result = LocationFactory.GetLocation(handler : handler,  locationCode :  locationCode,  includeAttributeDefinition :  includeAttributeDefinition,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
 		/// var optionalCasting = ConvertClass<Location/>(result); 
 		/// return optionalCasting;
 		///  </code> 
 		/// </example> 
 		/// </summary>
 		public static Mozu.Api.Contracts.Location.Location GetLocation(ServiceClientMessageHandler handler, 
- 		 string code, string responseFields = null, 
+ 		 string locationCode, bool? includeAttributeDefinition = null, string responseFields = null, 
 		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
 		{
 			SetSdKparameters();
@@ -48,10 +49,10 @@ public static Mozu.Api.Contracts.Location.Location GetLocation(ServiceClientMess
 			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
 			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
 			var apiClient = Mozu.Api.Clients.Commerce.LocationClient.GetLocationClient(
-				 code :  code,  responseFields :  responseFields		);
+				 locationCode :  locationCode,  includeAttributeDefinition :  includeAttributeDefinition,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,17 +69,17 @@ public static Mozu.Api.Contracts.Location.Location GetLocation(ServiceClientMess
 		}
   
 		/// <summary> 
-		/// Retrieves a list of the locations configured for a specified location usage type for the specified site, according to any defined filter or sort criteria.
+		/// 
 		/// <example> 
 		///  <code> 
-		/// var result = LocationFactory.GetLocationsInUsageType(handler : handler,  locationUsageType :  locationUsageType,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var result = LocationFactory.GetLocationsInUsageType(handler : handler,  locationUsageType :  locationUsageType,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  includeAttributeDefinition :  includeAttributeDefinition,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
 		/// var optionalCasting = ConvertClass<LocationCollection/>(result); 
 		/// return optionalCasting;
 		///  </code> 
 		/// </example> 
 		/// </summary>
 		public static Mozu.Api.Contracts.Location.LocationCollection GetLocationsInUsageType(ServiceClientMessageHandler handler, 
- 		 string locationUsageType, int? startIndex = null, int? pageSize = null, string sortBy = null, string filter = null, string responseFields = null, 
+ 		 string locationUsageType, int? startIndex = null, int? pageSize = null, string sortBy = null, string filter = null, bool? includeAttributeDefinition = null, string responseFields = null, 
 		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
 		{
 			SetSdKparameters();
@@ -86,10 +87,10 @@ public static Mozu.Api.Contracts.Location.LocationCollection GetLocationsInUsage
 			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
 			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
 			var apiClient = Mozu.Api.Clients.Commerce.LocationClient.GetLocationsInUsageTypeClient(
-				 locationUsageType :  locationUsageType,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields		);
+				 locationUsageType :  locationUsageType,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  includeAttributeDefinition :  includeAttributeDefinition,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,17 +107,17 @@ public static Mozu.Api.Contracts.Location.LocationCollection GetLocationsInUsage
 		}
   
 		/// <summary> 
-		/// Retrieves the details of the location configured for the direct shipping (DS) location usage type for the site specified in the request. This location acts as an origin address from which order packages will ship, as well as the location where product reservations are created when order items are submitted with the direct ship fulfillment type (DS). If the direct ship location usage type is not configured for this site, the operation returns an error.
+		/// 
 		/// <example> 
 		///  <code> 
-		/// var result = LocationFactory.GetDirectShipLocation(handler : handler,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var result = LocationFactory.GetDirectShipLocation(handler : handler,  includeAttributeDefinition :  includeAttributeDefinition,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
 		/// var optionalCasting = ConvertClass<Location/>(result); 
 		/// return optionalCasting;
 		///  </code> 
 		/// </example> 
 		/// </summary>
 		public static Mozu.Api.Contracts.Location.Location GetDirectShipLocation(ServiceClientMessageHandler handler, 
- 		 string responseFields = null, 
+ 		 bool? includeAttributeDefinition = null, string responseFields = null, 
 		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
 		{
 			SetSdKparameters();
@@ -124,10 +125,10 @@ public static Mozu.Api.Contracts.Location.Location GetDirectShipLocation(Service
 			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
 			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
 			var apiClient = Mozu.Api.Clients.Commerce.LocationClient.GetDirectShipLocationClient(
-				 responseFields :  responseFields		);
+				 includeAttributeDefinition :  includeAttributeDefinition,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,17 +145,17 @@ public static Mozu.Api.Contracts.Location.Location GetDirectShipLocation(Service
 		}
   
 		/// <summary> 
-		/// Retrieves the details of the location configured for the in-store pickup (SP) location usage type for the site specified in the request. If the location is not associated with a location type configured for the in-store pickup location usage type (SP), the operation returns an error.
+		/// 
 		/// <example> 
 		///  <code> 
-		/// var result = LocationFactory.GetInStorePickupLocation(handler : handler,  code :  code,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var result = LocationFactory.GetInStorePickupLocation(handler : handler,  locationCode :  locationCode,  includeAttributeDefinition :  includeAttributeDefinition,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
 		/// var optionalCasting = ConvertClass<Location/>(result); 
 		/// return optionalCasting;
 		///  </code> 
 		/// </example> 
 		/// </summary>
 		public static Mozu.Api.Contracts.Location.Location GetInStorePickupLocation(ServiceClientMessageHandler handler, 
- 		 string code, string responseFields = null, 
+ 		 string locationCode, bool? includeAttributeDefinition = null, string responseFields = null, 
 		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
 		{
 			SetSdKparameters();
@@ -162,10 +163,10 @@ public static Mozu.Api.Contracts.Location.Location GetInStorePickupLocation(Serv
 			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
 			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
 			var apiClient = Mozu.Api.Clients.Commerce.LocationClient.GetInStorePickupLocationClient(
-				 code :  code,  responseFields :  responseFields		);
+				 locationCode :  locationCode,  includeAttributeDefinition :  includeAttributeDefinition,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -182,17 +183,17 @@ public static Mozu.Api.Contracts.Location.Location GetInStorePickupLocation(Serv
 		}
   
 		/// <summary> 
-		/// Retrieves a list of locations valid for in-store pickup of an item in an order according to any filter and sort criteria. For example, an application could use this operation to provide a store finder feature based on the shopper's GPS coordinates. If the location types for the in-store pickup location usage type are not configured for the site, this operation returns an error.
+		/// 
 		/// <example> 
 		///  <code> 
-		/// var result = LocationFactory.GetInStorePickupLocations(handler : handler,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var result = LocationFactory.GetInStorePickupLocations(handler : handler,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  includeAttributeDefinition :  includeAttributeDefinition,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
 		/// var optionalCasting = ConvertClass<LocationCollection/>(result); 
 		/// return optionalCasting;
 		///  </code> 
 		/// </example> 
 		/// </summary>
 		public static Mozu.Api.Contracts.Location.LocationCollection GetInStorePickupLocations(ServiceClientMessageHandler handler, 
- 		 int? startIndex = null, int? pageSize = null, string sortBy = null, string filter = null, string responseFields = null, 
+ 		 int? startIndex = null, int? pageSize = null, string sortBy = null, string filter = null, bool? includeAttributeDefinition = null, string responseFields = null, 
 		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
 		{
 			SetSdKparameters();
@@ -200,10 +201,10 @@ public static Mozu.Api.Contracts.Location.LocationCollection GetInStorePickupLoc
 			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
 			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
 			var apiClient = Mozu.Api.Clients.Commerce.LocationClient.GetInStorePickupLocationsClient(
-				 startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields		);
+				 startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  includeAttributeDefinition :  includeAttributeDefinition,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/OrderFactory.cs b/Mozu.Api.Test/Factories/Commerce/OrderFactory.cs
old mode 100644
new mode 100755
similarity index 85%
rename from Mozu.Api.Test/Factories/OrderFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/OrderFactory.cs
index d43a695a..50e9fe26
--- a/Mozu.Api.Test/Factories/OrderFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/OrderFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce
 {
 	/// <summary>
 	/// Use the Orders resource to manage all components of order processing, payment, and fulfillment.
@@ -30,17 +31,17 @@ public partial class OrderFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a list of orders according to any specified filter criteria and sort options.
+		/// 
 		/// <example> 
 		///  <code> 
-		/// var result = OrderFactory.GetOrders(handler : handler,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  q :  q,  qLimit :  qLimit,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var result = OrderFactory.GetOrders(handler : handler,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  q :  q,  qLimit :  qLimit,  includeBin :  includeBin,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
 		/// var optionalCasting = ConvertClass<OrderCollection/>(result); 
 		/// return optionalCasting;
 		///  </code> 
 		/// </example> 
 		/// </summary>
 		public static Mozu.Api.Contracts.CommerceRuntime.Orders.OrderCollection GetOrders(ServiceClientMessageHandler handler, 
- 		 int? startIndex = null, int? pageSize = null, string sortBy = null, string filter = null, string q = null, int? qLimit = null, string responseFields = null, 
+ 		 int? startIndex = null, int? pageSize = null, string sortBy = null, string filter = null, string q = null, int? qLimit = null, bool? includeBin = null, string responseFields = null, 
 		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
 		{
 			SetSdKparameters();
@@ -48,10 +49,10 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.OrderCollection GetOrder
 			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
 			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
 			var apiClient = Mozu.Api.Clients.Commerce.OrderClient.GetOrdersClient(
-				 startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  q :  q,  qLimit :  qLimit,  responseFields :  responseFields		);
+				 startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  q :  q,  qLimit :  qLimit,  includeBin :  includeBin,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.OrderCollection GetOrder
 		}
   
 		/// <summary> 
-		/// Retrieves the actions available to perform for an order based on its current status.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = OrderFactory.GetAvailableActions(handler : handler,  orderId :  orderId,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static List<string> GetAvailableActions(ServiceClientMessageHandler handl
 				 orderId :  orderId		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static List<string> GetAvailableActions(ServiceClientMessageHandler handl
 		}
   
 		/// <summary> 
-		/// Retrieves an order for the purpose of splitting it into multiple taxable orders in order to fulfill the order in multiple locations.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = OrderFactory.GetTaxableOrders(handler : handler,  orderId :  orderId,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static List<string> GetAvailableActions(ServiceClientMessageHandler handl
 				 orderId :  orderId		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,17 +145,17 @@ public static List<string> GetAvailableActions(ServiceClientMessageHandler handl
 		}
   
 		/// <summary> 
-		/// Retrieves the details of an order specified by the order ID.
+		/// 
 		/// <example> 
 		///  <code> 
-		/// var result = OrderFactory.GetOrder(handler : handler,  orderId :  orderId,  draft :  draft,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var result = OrderFactory.GetOrder(handler : handler,  orderId :  orderId,  draft :  draft,  includeBin :  includeBin,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
 		/// var optionalCasting = ConvertClass<Order/>(result); 
 		/// return optionalCasting;
 		///  </code> 
 		/// </example> 
 		/// </summary>
 		public static Mozu.Api.Contracts.CommerceRuntime.Orders.Order GetOrder(ServiceClientMessageHandler handler, 
- 		 string orderId, bool? draft = null, string responseFields = null, 
+ 		 string orderId, bool? draft = null, bool? includeBin = null, string responseFields = null, 
 		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
 		{
 			SetSdKparameters();
@@ -162,10 +163,10 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.Order GetOrder(ServiceCl
 			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
 			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
 			var apiClient = Mozu.Api.Clients.Commerce.OrderClient.GetOrderClient(
-				 orderId :  orderId,  draft :  draft,  responseFields :  responseFields		);
+				 orderId :  orderId,  draft :  draft,  includeBin :  includeBin,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -182,7 +183,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.Order GetOrder(ServiceCl
 		}
   
 		/// <summary> 
-		/// Creates a new order from an existing cart when the customer chooses to proceed to checkout.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = OrderFactory.CreateOrderFromCart(handler : handler,  cartId :  cartId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -203,7 +204,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.Order CreateOrderFromCar
 				 cartId :  cartId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -220,7 +221,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.Order CreateOrderFromCar
 		}
   
 		/// <summary> 
-		/// Creates a new order for no-cart quick-ordering scenarios.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = OrderFactory.CreateOrder(handler : handler,  order :  order,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -241,7 +242,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.Order CreateOrder(Servic
 				 order :  order,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -258,7 +259,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.Order CreateOrder(Servic
 		}
   
 		/// <summary> 
-		/// Perform the specified action for an order. The actions you can perform depend on the current status of the order.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = OrderFactory.PerformOrderAction(handler : handler,  action :  action,  orderId :  orderId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -279,7 +280,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.Order PerformOrderAction
 				 action :  action,  orderId :  orderId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -296,7 +297,45 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.Order PerformOrderAction
 		}
   
 		/// <summary> 
-		/// Processes a digital wallet (used to hold 3rd party payment and shipping information).
+		/// 
+		/// <example> 
+		///  <code> 
+		/// var result = OrderFactory.PriceOrder(handler : handler,  order :  order,  refreshShipping :  refreshShipping,  couponCodeToApply :  couponCodeToApply,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<Order/>(result); 
+		/// return optionalCasting;
+		///  </code> 
+		/// </example> 
+		/// </summary>
+		public static Mozu.Api.Contracts.CommerceRuntime.Orders.Order PriceOrder(ServiceClientMessageHandler handler, 
+ 		 Mozu.Api.Contracts.CommerceRuntime.Orders.Order order, bool refreshShipping, string couponCodeToApply = null, string responseFields = null, 
+		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
+		{
+			SetSdKparameters();
+			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
+			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
+			var apiClient = Mozu.Api.Clients.Commerce.OrderClient.PriceOrderClient(
+				 order :  order,  refreshShipping :  refreshShipping,  couponCodeToApply :  couponCodeToApply,  responseFields :  responseFields		);
+			try
+			{
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
+			}
+			catch (ApiException ex)
+			{
+				// Custom error handling for test cases can be placed here
+				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
+				if (customException != null)
+					throw customException;
+				return null;
+			}
+			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
+					 ? (apiClient.Result()) 
+					 : null;
+
+		}
+  
+		/// <summary> 
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = OrderFactory.ProcessDigitalWallet(handler : handler,  digitalWallet :  digitalWallet,  orderId :  orderId,  digitalWalletType :  digitalWalletType,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -317,7 +356,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.Order ProcessDigitalWall
 				 digitalWallet :  digitalWallet,  orderId :  orderId,  digitalWalletType :  digitalWalletType,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -334,7 +373,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.Order ProcessDigitalWall
 		}
   
 		/// <summary> 
-		/// Update the properties of a discount applied to an order.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = OrderFactory.UpdateOrderDiscount(handler : handler,  discount :  discount,  orderId :  orderId,  discountId :  discountId,  updateMode :  updateMode,  version :  version,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -355,7 +394,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.Order UpdateOrderDiscoun
 				 discount :  discount,  orderId :  orderId,  discountId :  discountId,  updateMode :  updateMode,  version :  version,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -372,7 +411,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.Order UpdateOrderDiscoun
 		}
   
 		/// <summary> 
-		/// Deletes the current draft version of the order, which also deletes any uncommitted changes made to the order in draft mode.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = OrderFactory.DeleteOrderDraft(handler : handler,  orderId :  orderId,  version :  version,  expectedCode: expectedCode, successCode: successCode); 
@@ -393,7 +432,7 @@ public static void DeleteOrderDraft(ServiceClientMessageHandler handler,
 				 orderId :  orderId,  version :  version		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -409,7 +448,7 @@ public static void DeleteOrderDraft(ServiceClientMessageHandler handler,
 		}
   
 		/// <summary> 
-		/// Triggers an order confirmation email to be resent.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = OrderFactory.ResendOrderConfirmationEmail(handler : handler,  action :  action,  orderId :  orderId,  expectedCode: expectedCode, successCode: successCode); 
@@ -430,7 +469,7 @@ public static void ResendOrderConfirmationEmail(ServiceClientMessageHandler hand
 				 action :  action,  orderId :  orderId		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -446,7 +485,7 @@ public static void ResendOrderConfirmationEmail(ServiceClientMessageHandler hand
 		}
   
 		/// <summary> 
-		/// Changes the price list associated with an order. The desired price list code should be specified in the ApiContext.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = OrderFactory.ChangeOrderPriceList(handler : handler,  priceListCode :  priceListCode,  orderId :  orderId,  updateMode :  updateMode,  version :  version,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -467,7 +506,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.Order ChangeOrderPriceLi
 				 priceListCode :  priceListCode,  orderId :  orderId,  updateMode :  updateMode,  version :  version,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -484,7 +523,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.Order ChangeOrderPriceLi
 		}
   
 		/// <summary> 
-		/// Updates the user ID of the shopper who placed the order to the current user.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = OrderFactory.ChangeOrderUserId(handler : handler,  orderId :  orderId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -505,7 +544,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.Order ChangeOrderUserId(
 				 orderId :  orderId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -522,7 +561,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.Order ChangeOrderUserId(
 		}
   
 		/// <summary> 
-		/// Updates the specified order when additional order information, such as shipping or billing information, is modified during the checkout process.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = OrderFactory.UpdateOrder(handler : handler,  order :  order,  orderId :  orderId,  updateMode :  updateMode,  version :  version,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -543,7 +582,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.Order UpdateOrder(Servic
 				 order :  order,  orderId :  orderId,  updateMode :  updateMode,  version :  version,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/AdjustmentFactory.cs b/Mozu.Api.Test/Factories/Commerce/Orders/AdjustmentFactory.cs
old mode 100644
new mode 100755
similarity index 93%
rename from Mozu.Api.Test/Factories/AdjustmentFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Orders/AdjustmentFactory.cs
index 1c58607c..bee93b48
--- a/Mozu.Api.Test/Factories/AdjustmentFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Orders/AdjustmentFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Orders
 {
 	/// <summary>
 	/// Use this subresource to manage ad-hoc order level price adjustments.
@@ -30,7 +31,7 @@ public partial class AdjustmentFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Updates the order handling adjustment.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = AdjustmentFactory.ApplyHandlingAdjustment(handler : handler,  adjustment :  adjustment,  orderId :  orderId,  updateMode :  updateMode,  version :  version,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.Order ApplyHandlingAdjus
 				 adjustment :  adjustment,  orderId :  orderId,  updateMode :  updateMode,  version :  version,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.Order ApplyHandlingAdjus
 		}
   
 		/// <summary> 
-		/// Applies a shipping adjustment to the specified order.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = AdjustmentFactory.ApplyShippingAdjustment(handler : handler,  adjustment :  adjustment,  orderId :  orderId,  updateMode :  updateMode,  version :  version,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.Order ApplyShippingAdjus
 				 adjustment :  adjustment,  orderId :  orderId,  updateMode :  updateMode,  version :  version,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.Order ApplyShippingAdjus
 		}
   
 		/// <summary> 
-		/// Applies a price adjustment to the specified order.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = AdjustmentFactory.ApplyAdjustment(handler : handler,  adjustment :  adjustment,  orderId :  orderId,  updateMode :  updateMode,  version :  version,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.Order ApplyAdjustment(Se
 				 adjustment :  adjustment,  orderId :  orderId,  updateMode :  updateMode,  version :  version,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.Order ApplyAdjustment(Se
 		}
   
 		/// <summary> 
-		/// Removes an adjustment to the order handling fee.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = AdjustmentFactory.RemoveHandlingAdjustment(handler : handler,  orderId :  orderId,  updateMode :  updateMode,  version :  version,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.Order RemoveHandlingAdju
 				 orderId :  orderId,  updateMode :  updateMode,  version :  version		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -182,7 +183,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.Order RemoveHandlingAdju
 		}
   
 		/// <summary> 
-		/// Removes a shipping adjustment previously applied to an order or draft.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = AdjustmentFactory.RemoveShippingAdjustment(handler : handler,  orderId :  orderId,  updateMode :  updateMode,  version :  version,  expectedCode: expectedCode, successCode: successCode); 
@@ -203,7 +204,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.Order RemoveShippingAdju
 				 orderId :  orderId,  updateMode :  updateMode,  version :  version		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -220,7 +221,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.Order RemoveShippingAdju
 		}
   
 		/// <summary> 
-		/// Removes a price adjustment from the specified order.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = AdjustmentFactory.RemoveAdjustment(handler : handler,  orderId :  orderId,  updateMode :  updateMode,  version :  version,  expectedCode: expectedCode, successCode: successCode); 
@@ -241,7 +242,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.Order RemoveAdjustment(S
 				 orderId :  orderId,  updateMode :  updateMode,  version :  version		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/AppliedDiscountOrdersFactory.cs b/Mozu.Api.Test/Factories/Commerce/Orders/AppliedDiscountOrdersFactory.cs
old mode 100644
new mode 100755
similarity index 93%
rename from Mozu.Api.Test/Factories/AppliedDiscountOrdersFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Orders/AppliedDiscountOrdersFactory.cs
index 10d10c22..b24f27b0
--- a/Mozu.Api.Test/Factories/AppliedDiscountOrdersFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Orders/AppliedDiscountOrdersFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Orders
 {
 	/// <summary>
 	/// Use this subresource to apply coupons to or remove coupons from an order based on a supplied coupon code.
@@ -30,7 +31,7 @@ public partial class AppliedDiscountOrdersFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Apply a coupon to the order.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = AppliedDiscountFactory.ApplyCoupon(handler : handler,  orderId :  orderId,  couponCode :  couponCode,  updateMode :  updateMode,  version :  version,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.Order ApplyCoupon(Servic
 				 orderId :  orderId,  couponCode :  couponCode,  updateMode :  updateMode,  version :  version,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.Order ApplyCoupon(Servic
 		}
   
 		/// <summary> 
-		/// Removes a coupon previously applied to the order.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = AppliedDiscountFactory.RemoveCoupon(handler : handler,  orderId :  orderId,  couponCode :  couponCode,  updateMode :  updateMode,  version :  version,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.Order RemoveCoupon(Servi
 				 orderId :  orderId,  couponCode :  couponCode,  updateMode :  updateMode,  version :  version		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.Order RemoveCoupon(Servi
 		}
   
 		/// <summary> 
-		/// Removes all coupons previously applied to the order.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = AppliedDiscountFactory.RemoveCoupons(handler : handler,  orderId :  orderId,  updateMode :  updateMode,  version :  version,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.Order RemoveCoupons(Serv
 				 orderId :  orderId,  updateMode :  updateMode,  version :  version		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/Commerce/Orders/Attributedefinition/AttributeFactory.cs b/Mozu.Api.Test/Factories/Commerce/Orders/Attributedefinition/AttributeFactory.cs
new file mode 100755
index 00000000..5dceed5c
--- /dev/null
+++ b/Mozu.Api.Test/Factories/Commerce/Orders/Attributedefinition/AttributeFactory.cs
@@ -0,0 +1,228 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+#region Usings Setup
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Net;
+using Mozu.Api;
+using Mozu.Api.Security;
+using Mozu.Api.Test.Helpers;
+using System.Diagnostics;
+using Newtonsoft.Json.Linq;
+using System.Threading;
+
+#endregion
+
+namespace Mozu.Api.Test.Factories.Commerce.Orders.Attributedefinition
+{
+	/// <summary>
+	/// Use the Order Attribute Definition resource to manage the attributes that uniquely describe orders, such as the associated shopping season or "How did you hear about us?". Merchants can display order attributes on the order summary, the order confirmation page, invoices, or packing slips.
+	/// </summary>
+	public partial class AttributeFactory : BaseDataFactory
+	{
+
+		/// <summary> 
+		/// 
+		/// <example> 
+		///  <code> 
+		/// var result = AttributeFactory.GetAttributes(handler : handler,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<AttributeCollection/>(result); 
+		/// return optionalCasting;
+		///  </code> 
+		/// </example> 
+		/// </summary>
+		public static Mozu.Api.Contracts.Core.Extensible.AttributeCollection GetAttributes(ServiceClientMessageHandler handler, 
+ 		 int? startIndex = null, int? pageSize = null, string sortBy = null, string filter = null, string responseFields = null, 
+		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
+		{
+			SetSdKparameters();
+			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
+			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
+			var apiClient = Mozu.Api.Clients.Commerce.Orders.Attributedefinition.AttributeClient.GetAttributesClient(
+				 startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields		);
+			try
+			{
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
+			}
+			catch (ApiException ex)
+			{
+				// Custom error handling for test cases can be placed here
+				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
+				if (customException != null)
+					throw customException;
+				return null;
+			}
+			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
+					 ? (apiClient.Result()) 
+					 : null;
+
+		}
+  
+		/// <summary> 
+		/// 
+		/// <example> 
+		///  <code> 
+		/// var result = AttributeFactory.GetAttributeVocabularyValues(handler : handler,  attributeFQN :  attributeFQN,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<List<AttributeVocabularyValue>/>(result); 
+		/// return optionalCasting;
+		///  </code> 
+		/// </example> 
+		/// </summary>
+		public static List<Mozu.Api.Contracts.Core.Extensible.AttributeVocabularyValue> GetAttributeVocabularyValues(ServiceClientMessageHandler handler, 
+ 		 string attributeFQN, 
+		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
+		{
+			SetSdKparameters();
+			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
+			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
+			var apiClient = Mozu.Api.Clients.Commerce.Orders.Attributedefinition.AttributeClient.GetAttributeVocabularyValuesClient(
+				 attributeFQN :  attributeFQN		);
+			try
+			{
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
+			}
+			catch (ApiException ex)
+			{
+				// Custom error handling for test cases can be placed here
+				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
+				if (customException != null)
+					throw customException;
+				return null;
+			}
+			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
+					 ? (apiClient.Result()) 
+					 : null;
+
+		}
+  
+		/// <summary> 
+		/// 
+		/// <example> 
+		///  <code> 
+		/// var result = AttributeFactory.GetAttribute(handler : handler,  attributeFQN :  attributeFQN,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<Attribute/>(result); 
+		/// return optionalCasting;
+		///  </code> 
+		/// </example> 
+		/// </summary>
+		public static Mozu.Api.Contracts.Core.Extensible.Attribute GetAttribute(ServiceClientMessageHandler handler, 
+ 		 string attributeFQN, string responseFields = null, 
+		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
+		{
+			SetSdKparameters();
+			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
+			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
+			var apiClient = Mozu.Api.Clients.Commerce.Orders.Attributedefinition.AttributeClient.GetAttributeClient(
+				 attributeFQN :  attributeFQN,  responseFields :  responseFields		);
+			try
+			{
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
+			}
+			catch (ApiException ex)
+			{
+				// Custom error handling for test cases can be placed here
+				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
+				if (customException != null)
+					throw customException;
+				return null;
+			}
+			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
+					 ? (apiClient.Result()) 
+					 : null;
+
+		}
+  
+		/// <summary> 
+		/// 
+		/// <example> 
+		///  <code> 
+		/// var result = AttributeFactory.CreateAttribute(handler : handler,  attribute :  attribute,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<Attribute/>(result); 
+		/// return optionalCasting;
+		///  </code> 
+		/// </example> 
+		/// </summary>
+		public static Mozu.Api.Contracts.Core.Extensible.Attribute CreateAttribute(ServiceClientMessageHandler handler, 
+ 		 Mozu.Api.Contracts.Core.Extensible.Attribute attribute, string responseFields = null, 
+		 HttpStatusCode expectedCode = HttpStatusCode.Created, HttpStatusCode successCode = HttpStatusCode.Created)
+		{
+			SetSdKparameters();
+			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
+			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
+			var apiClient = Mozu.Api.Clients.Commerce.Orders.Attributedefinition.AttributeClient.CreateAttributeClient(
+				 attribute :  attribute,  responseFields :  responseFields		);
+			try
+			{
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
+			}
+			catch (ApiException ex)
+			{
+				// Custom error handling for test cases can be placed here
+				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
+				if (customException != null)
+					throw customException;
+				return null;
+			}
+			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
+					 ? (apiClient.Result()) 
+					 : null;
+
+		}
+  
+		/// <summary> 
+		/// 
+		/// <example> 
+		///  <code> 
+		/// var result = AttributeFactory.UpdateAttribute(handler : handler,  attribute :  attribute,  attributeFQN :  attributeFQN,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<Attribute/>(result); 
+		/// return optionalCasting;
+		///  </code> 
+		/// </example> 
+		/// </summary>
+		public static Mozu.Api.Contracts.Core.Extensible.Attribute UpdateAttribute(ServiceClientMessageHandler handler, 
+ 		 Mozu.Api.Contracts.Core.Extensible.Attribute attribute, string attributeFQN, string responseFields = null, 
+		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
+		{
+			SetSdKparameters();
+			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
+			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
+			var apiClient = Mozu.Api.Clients.Commerce.Orders.Attributedefinition.AttributeClient.UpdateAttributeClient(
+				 attribute :  attribute,  attributeFQN :  attributeFQN,  responseFields :  responseFields		);
+			try
+			{
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
+			}
+			catch (ApiException ex)
+			{
+				// Custom error handling for test cases can be placed here
+				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
+				if (customException != null)
+					throw customException;
+				return null;
+			}
+			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
+					 ? (apiClient.Result()) 
+					 : null;
+
+		}
+  
+
+	}
+
+}
+
+
diff --git a/Mozu.Api.Test/Factories/BillingInfoFactory.cs b/Mozu.Api.Test/Factories/Commerce/Orders/BillingInfoFactory.cs
old mode 100644
new mode 100755
similarity index 93%
rename from Mozu.Api.Test/Factories/BillingInfoFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Orders/BillingInfoFactory.cs
index ca1e7e48..cba7ba6d
--- a/Mozu.Api.Test/Factories/BillingInfoFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Orders/BillingInfoFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Orders
 {
 	/// <summary>
 	/// Use the Billing Info subresource to manage the billing information stored for an order.
@@ -30,7 +31,7 @@ public partial class BillingInfoFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves the billing information associated with an order.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = BillingInfoFactory.GetBillingInfo(handler : handler,  orderId :  orderId,  draft :  draft,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Payments.BillingInfo GetBilling
 				 orderId :  orderId,  draft :  draft,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Payments.BillingInfo GetBilling
 		}
   
 		/// <summary> 
-		/// Updates the billing information supplied for an order.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = BillingInfoFactory.SetBillingInfo(handler : handler,  billingInfo :  billingInfo,  orderId :  orderId,  updateMode :  updateMode,  version :  version,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Payments.BillingInfo SetBilling
 				 billingInfo :  billingInfo,  orderId :  orderId,  updateMode :  updateMode,  version :  version,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/DigitalPackageFactory.cs b/Mozu.Api.Test/Factories/Commerce/Orders/DigitalPackageFactory.cs
old mode 100644
new mode 100755
similarity index 89%
rename from Mozu.Api.Test/Factories/DigitalPackageFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Orders/DigitalPackageFactory.cs
index ab2c45fc..075056f4
--- a/Mozu.Api.Test/Factories/DigitalPackageFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Orders/DigitalPackageFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Orders
 {
 	/// <summary>
 	/// A digital package is a package in a digital format.
@@ -30,7 +31,7 @@ public partial class DigitalPackageFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a collection of fulfillment options for digital packages. Options may include emailed files/links or provided links. 
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = DigitalPackageFactory.GetAvailableDigitalPackageFulfillmentActions(handler : handler,  orderId :  orderId,  digitalPackageId :  digitalPackageId,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static List<string> GetAvailableDigitalPackageFulfillmentActions(ServiceC
 				 orderId :  orderId,  digitalPackageId :  digitalPackageId		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static List<string> GetAvailableDigitalPackageFulfillmentActions(ServiceC
 		}
   
 		/// <summary> 
-		/// This operation retreives a digital package within an order and it requires two parameters: orderId and digitalPackageId.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = DigitalPackageFactory.GetDigitalPackage(handler : handler,  orderId :  orderId,  digitalPackageId :  digitalPackageId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Fulfillment.DigitalPackage GetD
 				 orderId :  orderId,  digitalPackageId :  digitalPackageId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Fulfillment.DigitalPackage GetD
 		}
   
 		/// <summary> 
-		/// Lets you apply a digital package to the order using the orderId and digitalPackage parameters.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = DigitalPackageFactory.CreateDigitalPackage(handler : handler,  digitalPackage :  digitalPackage,  orderId :  orderId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Fulfillment.DigitalPackage Crea
 				 digitalPackage :  digitalPackage,  orderId :  orderId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Fulfillment.DigitalPackage Crea
 		}
   
 		/// <summary> 
-		/// This method operates on one digital package, specified by the id given. This method ensures that the digital package ID provided is in the order with the id given, and then updates the properties of that package with the properties of the one passed in using the ‘digitalpackage’ parameter.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = DigitalPackageFactory.UpdateDigitalPackage(handler : handler,  digitalPackage :  digitalPackage,  orderId :  orderId,  digitalPackageId :  digitalPackageId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Fulfillment.DigitalPackage Upda
 				 digitalPackage :  digitalPackage,  orderId :  orderId,  digitalPackageId :  digitalPackageId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -182,7 +183,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Fulfillment.DigitalPackage Upda
 		}
   
 		/// <summary> 
-		/// This operation deletes a digital package from an order. This operation requires three parameters: orderId, digitalPackageId, and digitalPackage.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = DigitalPackageFactory.DeleteDigitalPackage(handler : handler,  orderId :  orderId,  digitalPackageId :  digitalPackageId,  expectedCode: expectedCode, successCode: successCode); 
@@ -203,7 +204,7 @@ public static void DeleteDigitalPackage(ServiceClientMessageHandler handler,
 				 orderId :  orderId,  digitalPackageId :  digitalPackageId		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/PublishingFactory.cs b/Mozu.Api.Test/Factories/Commerce/Orders/ExtendedPropertyFactory.cs
old mode 100644
new mode 100755
similarity index 54%
rename from Mozu.Api.Test/Factories/PublishingFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Orders/ExtendedPropertyFactory.cs
index 409e61b6..c4ca5dd3
--- a/Mozu.Api.Test/Factories/PublishingFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Orders/ExtendedPropertyFactory.cs
@@ -18,40 +18,41 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Orders
 {
 	/// <summary>
-	/// Use the Product Publishing resource to publish or discard pending changes to product definitions in the master catalog.
+	/// 
 	/// </summary>
-	public partial class PublishingFactory : BaseDataFactory
+	public partial class ExtendedPropertyFactory : BaseDataFactory
 	{
 
 		/// <summary> 
 		/// 
 		/// <example> 
 		///  <code> 
-		/// var result = PublishingFactory.GetPublishSet(handler : handler,  publishSetCode :  publishSetCode,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<PublishSet/>(result); 
+		/// var result = ExtendedPropertyFactory.GetExtendedProperties(handler : handler,  orderId :  orderId,  draft :  draft,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<List<ExtendedProperty>/>(result); 
 		/// return optionalCasting;
 		///  </code> 
 		/// </example> 
 		/// </summary>
-		public static Mozu.Api.Contracts.ProductAdmin.PublishSet GetPublishSet(ServiceClientMessageHandler handler, 
- 		 string publishSetCode, string responseFields = null, 
+		public static List<Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty> GetExtendedProperties(ServiceClientMessageHandler handler, 
+ 		 string orderId, bool? draft = null, 
 		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
 		{
 			SetSdKparameters();
 			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
 			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
 			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Commerce.Catalog.Admin.PublishingScopeClient.GetPublishSetClient(
-				 publishSetCode :  publishSetCode,  responseFields :  responseFields		);
+			var apiClient = Mozu.Api.Clients.Commerce.Orders.ExtendedPropertyClient.GetExtendedPropertiesClient(
+				 orderId :  orderId,  draft :  draft		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -71,25 +72,25 @@ public static Mozu.Api.Contracts.ProductAdmin.PublishSet GetPublishSet(ServiceCl
 		/// 
 		/// <example> 
 		///  <code> 
-		/// var result = PublishingFactory.GetPublishSets(handler : handler,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<PublishSetCollection/>(result); 
+		/// var result = ExtendedPropertyFactory.AddExtendedProperties(handler : handler,  extendedProperties :  extendedProperties,  orderId :  orderId,  updateMode :  updateMode,  version :  version,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<List<ExtendedProperty>/>(result); 
 		/// return optionalCasting;
 		///  </code> 
 		/// </example> 
 		/// </summary>
-		public static Mozu.Api.Contracts.ProductAdmin.PublishSetCollection GetPublishSets(ServiceClientMessageHandler handler, 
- 		 string responseFields = null, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
+		public static List<Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty> AddExtendedProperties(ServiceClientMessageHandler handler, 
+ 		 List<Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty> extendedProperties, string orderId, string updateMode = null, string version = null, 
+		 HttpStatusCode expectedCode = HttpStatusCode.Created, HttpStatusCode successCode = HttpStatusCode.Created)
 		{
 			SetSdKparameters();
 			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
 			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
 			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Commerce.Catalog.Admin.PublishingScopeClient.GetPublishSetsClient(
-				 responseFields :  responseFields		);
+			var apiClient = Mozu.Api.Clients.Commerce.Orders.ExtendedPropertyClient.AddExtendedPropertiesClient(
+				 extendedProperties :  extendedProperties,  orderId :  orderId,  updateMode :  updateMode,  version :  version		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,28 +107,28 @@ public static Mozu.Api.Contracts.ProductAdmin.PublishSetCollection GetPublishSet
 		}
   
 		/// <summary> 
-		/// Deletes the draft version of product changes for each product code specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
-		/// var result = PublishingFactory.DiscardDrafts(handler : handler,  publishScope :  publishScope, dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<void/>(result); 
+		/// var result = ExtendedPropertyFactory.UpdateExtendedProperty(handler : handler,  extendedProperty :  extendedProperty,  orderId :  orderId,  key :  key,  updateMode :  updateMode,  version :  version,  upsert :  upsert,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<ExtendedProperty/>(result); 
 		/// return optionalCasting;
 		///  </code> 
 		/// </example> 
 		/// </summary>
-		public static void DiscardDrafts(ServiceClientMessageHandler handler, 
- 		Mozu.Api.Contracts.ProductAdmin.PublishingScope publishScope, DataViewMode dataViewMode= DataViewMode.Live, 
-		 HttpStatusCode expectedCode = HttpStatusCode.NoContent, HttpStatusCode successCode = HttpStatusCode.NoContent)
+		public static Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty UpdateExtendedProperty(ServiceClientMessageHandler handler, 
+ 		 Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty extendedProperty, string orderId, string key, string updateMode = null, string version = null, bool? upsert = null, string responseFields = null, 
+		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
 		{
 			SetSdKparameters();
 			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
 			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
 			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Commerce.Catalog.Admin.PublishingScopeClient.DiscardDraftsClient(
-				 publishScope :  publishScope, dataViewMode: dataViewMode		);
+			var apiClient = Mozu.Api.Clients.Commerce.Orders.ExtendedPropertyClient.UpdateExtendedPropertyClient(
+				 extendedProperty :  extendedProperty,  orderId :  orderId,  key :  key,  updateMode :  updateMode,  version :  version,  upsert :  upsert,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -135,36 +136,37 @@ public static void DiscardDrafts(ServiceClientMessageHandler handler,
 				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
 				if (customException != null)
 					throw customException;
+				return null;
 			}
-			var noResponse = ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
+			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
 					 ? (apiClient.Result()) 
 					 : null;
 
 		}
   
 		/// <summary> 
-		/// Publishes the draft version of product changes for each product code specified in the request, and changes the product publish state to "live".
+		/// 
 		/// <example> 
 		///  <code> 
-		/// var result = PublishingFactory.PublishDrafts(handler : handler,  publishScope :  publishScope, dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<void/>(result); 
+		/// var result = ExtendedPropertyFactory.UpdateExtendedProperties(handler : handler,  extendedProperties :  extendedProperties,  orderId :  orderId,  updateMode :  updateMode,  version :  version,  upsert :  upsert,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<List<ExtendedProperty>/>(result); 
 		/// return optionalCasting;
 		///  </code> 
 		/// </example> 
 		/// </summary>
-		public static void PublishDrafts(ServiceClientMessageHandler handler, 
- 		Mozu.Api.Contracts.ProductAdmin.PublishingScope publishScope, DataViewMode dataViewMode= DataViewMode.Live, 
-		 HttpStatusCode expectedCode = HttpStatusCode.NoContent, HttpStatusCode successCode = HttpStatusCode.NoContent)
+		public static List<Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty> UpdateExtendedProperties(ServiceClientMessageHandler handler, 
+ 		 List<Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty> extendedProperties, string orderId, string updateMode = null, string version = null, bool? upsert = null, 
+		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
 		{
 			SetSdKparameters();
 			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
 			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
 			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Commerce.Catalog.Admin.PublishingScopeClient.PublishDraftsClient(
-				 publishScope :  publishScope, dataViewMode: dataViewMode		);
+			var apiClient = Mozu.Api.Clients.Commerce.Orders.ExtendedPropertyClient.UpdateExtendedPropertiesClient(
+				 extendedProperties :  extendedProperties,  orderId :  orderId,  updateMode :  updateMode,  version :  version,  upsert :  upsert		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -172,8 +174,9 @@ public static void PublishDrafts(ServiceClientMessageHandler handler,
 				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
 				if (customException != null)
 					throw customException;
+				return null;
 			}
-			var noResponse = ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
+			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
 					 ? (apiClient.Result()) 
 					 : null;
 
@@ -183,25 +186,25 @@ public static void PublishDrafts(ServiceClientMessageHandler handler,
 		/// 
 		/// <example> 
 		///  <code> 
-		/// var result = PublishingFactory.AssignProductsToPublishSet(handler : handler,  publishSet :  publishSet,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<PublishSet/>(result); 
+		/// var result = ExtendedPropertyFactory.DeleteExtendedProperty(handler : handler,  orderId :  orderId,  key :  key,  updateMode :  updateMode,  version :  version,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<void/>(result); 
 		/// return optionalCasting;
 		///  </code> 
 		/// </example> 
 		/// </summary>
-		public static Mozu.Api.Contracts.ProductAdmin.PublishSet AssignProductsToPublishSet(ServiceClientMessageHandler handler, 
- 		 Mozu.Api.Contracts.ProductAdmin.PublishSet publishSet, string responseFields = null, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
+		public static void DeleteExtendedProperty(ServiceClientMessageHandler handler, 
+ 		string orderId, string key, string updateMode = null, string version = null, 
+		 HttpStatusCode expectedCode = HttpStatusCode.NoContent, HttpStatusCode successCode = HttpStatusCode.NoContent)
 		{
 			SetSdKparameters();
 			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
 			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
 			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Commerce.Catalog.Admin.PublishingScopeClient.AssignProductsToPublishSetClient(
-				 publishSet :  publishSet,  responseFields :  responseFields		);
+			var apiClient = Mozu.Api.Clients.Commerce.Orders.ExtendedPropertyClient.DeleteExtendedPropertyClient(
+				 orderId :  orderId,  key :  key,  updateMode :  updateMode,  version :  version		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -209,9 +212,8 @@ public static Mozu.Api.Contracts.ProductAdmin.PublishSet AssignProductsToPublish
 				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
 				if (customException != null)
 					throw customException;
-				return null;
 			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
+			var noResponse = ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
 					 ? (apiClient.Result()) 
 					 : null;
 
@@ -221,25 +223,25 @@ public static Mozu.Api.Contracts.ProductAdmin.PublishSet AssignProductsToPublish
 		/// 
 		/// <example> 
 		///  <code> 
-		/// var result = PublishingFactory.DeletePublishSet(handler : handler,  publishSetCode :  publishSetCode,  discardDrafts :  discardDrafts,  expectedCode: expectedCode, successCode: successCode); 
+		/// var result = ExtendedPropertyFactory.DeleteExtendedProperties(handler : handler,  keys :  keys,  orderId :  orderId,  updateMode :  updateMode,  version :  version,  expectedCode: expectedCode, successCode: successCode); 
 		/// var optionalCasting = ConvertClass<void/>(result); 
 		/// return optionalCasting;
 		///  </code> 
 		/// </example> 
 		/// </summary>
-		public static void DeletePublishSet(ServiceClientMessageHandler handler, 
- 		string publishSetCode, bool? discardDrafts = null, 
+		public static void DeleteExtendedProperties(ServiceClientMessageHandler handler, 
+ 		List<string> keys, string orderId, string updateMode = null, string version = null, 
 		 HttpStatusCode expectedCode = HttpStatusCode.NoContent, HttpStatusCode successCode = HttpStatusCode.NoContent)
 		{
 			SetSdKparameters();
 			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
 			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
 			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Commerce.Catalog.Admin.PublishingScopeClient.DeletePublishSetClient(
-				 publishSetCode :  publishSetCode,  discardDrafts :  discardDrafts		);
+			var apiClient = Mozu.Api.Clients.Commerce.Orders.ExtendedPropertyClient.DeleteExtendedPropertiesClient(
+				 keys :  keys,  orderId :  orderId,  updateMode :  updateMode,  version :  version		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/FulfillmentActionFactory.cs b/Mozu.Api.Test/Factories/Commerce/Orders/FulfillmentActionFactory.cs
old mode 100644
new mode 100755
similarity index 87%
rename from Mozu.Api.Test/Factories/FulfillmentActionFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Orders/FulfillmentActionFactory.cs
index 10ff2a61..8c8bc97c
--- a/Mozu.Api.Test/Factories/FulfillmentActionFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Orders/FulfillmentActionFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Orders
 {
 	/// <summary>
 	/// Use the Fulfillment resource to manage shipments or pickups of collections of packages for an order.
@@ -30,7 +31,7 @@ public partial class FulfillmentActionFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Sets the fulfillment action to "Ship" or "PickUp". To ship an order or prepare it for in-store pickup, the order must have a customer name, the "Open" or "OpenAndProcessing" status. To ship the order, it must also have the full shipping address and shipping method. Shipping all packages or picking up all pickups for an order will complete a paid order.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = FulfillmentActionFactory.PerformFulfillmentAction(handler : handler,  action :  action,  orderId :  orderId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.Order PerformFulfillment
 				 action :  action,  orderId :  orderId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.Order PerformFulfillment
 		}
   
 		/// <summary> 
-		/// Resends an email with details about the package fulfillment to the shopper. 
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = FulfillmentActionFactory.ResendPackageFulfillmentEmail(handler : handler,  action :  action,  orderId :  orderId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.Order ResendPackageFulfi
 				 action :  action,  orderId :  orderId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/FulfillmentInfoFactory.cs b/Mozu.Api.Test/Factories/Commerce/Orders/FulfillmentInfoFactory.cs
old mode 100644
new mode 100755
similarity index 93%
rename from Mozu.Api.Test/Factories/FulfillmentInfoFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Orders/FulfillmentInfoFactory.cs
index 2abdf765..025e5758
--- a/Mozu.Api.Test/Factories/FulfillmentInfoFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Orders/FulfillmentInfoFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Orders
 {
 	/// <summary>
 	/// Use the Fulfillment Information resource to manage shipping or pickup information for orders.
@@ -30,7 +31,7 @@ public partial class FulfillmentInfoFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a list of the fulfillment information for the specified order.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = FulfillmentInfoFactory.GetFulfillmentInfo(handler : handler,  orderId :  orderId,  draft :  draft,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Fulfillment.FulfillmentInfo Get
 				 orderId :  orderId,  draft :  draft,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Fulfillment.FulfillmentInfo Get
 		}
   
 		/// <summary> 
-		/// Updates one or more properties of fulfillment information for the specified order.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = FulfillmentInfoFactory.SetFulFillmentInfo(handler : handler,  fulfillmentInfo :  fulfillmentInfo,  orderId :  orderId,  updateMode :  updateMode,  version :  version,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Fulfillment.FulfillmentInfo Set
 				 fulfillmentInfo :  fulfillmentInfo,  orderId :  orderId,  updateMode :  updateMode,  version :  version,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/OrderAttributeFactory.cs b/Mozu.Api.Test/Factories/Commerce/Orders/OrderAttributeFactory.cs
old mode 100644
new mode 100755
similarity index 91%
rename from Mozu.Api.Test/Factories/OrderAttributeFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Orders/OrderAttributeFactory.cs
index 9ccd3f05..618db75d
--- a/Mozu.Api.Test/Factories/OrderAttributeFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Orders/OrderAttributeFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Orders
 {
 	/// <summary>
 	/// Use the Order Attributes resource to define how an order attribute definition applies to a specific order.
@@ -30,7 +31,7 @@ public partial class OrderAttributeFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a list of the attributes defined for the order specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = OrderAttributeFactory.GetOrderAttributes(handler : handler,  orderId :  orderId,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public partial class OrderAttributeFactory : BaseDataFactory
 				 orderId :  orderId		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public partial class OrderAttributeFactory : BaseDataFactory
 		}
   
 		/// <summary> 
-		/// Applies a list of attributes to the order specified in the request and defines a value for each attribute in the request body.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = OrderAttributeFactory.CreateOrderAttributes(handler : handler,  orderAttributes :  orderAttributes,  orderId :  orderId,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public partial class OrderAttributeFactory : BaseDataFactory
 				 orderAttributes :  orderAttributes,  orderId :  orderId		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public partial class OrderAttributeFactory : BaseDataFactory
 		}
   
 		/// <summary> 
-		/// Updates one or more properties of an attribute defined for the order specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = OrderAttributeFactory.UpdateOrderAttributes(handler : handler,  orderAttributes :  orderAttributes,  orderId :  orderId,  removeMissing :  removeMissing,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public partial class OrderAttributeFactory : BaseDataFactory
 				 orderAttributes :  orderAttributes,  orderId :  orderId,  removeMissing :  removeMissing		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/OrderItemFactory.cs b/Mozu.Api.Test/Factories/Commerce/Orders/OrderItemFactory.cs
old mode 100644
new mode 100755
similarity index 93%
rename from Mozu.Api.Test/Factories/OrderItemFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Orders/OrderItemFactory.cs
index 9f5fbc19..267fc721
--- a/Mozu.Api.Test/Factories/OrderItemFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Orders/OrderItemFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Orders
 {
 	/// <summary>
 	/// Use this subresource to retrieve details about items in an active order.
@@ -30,7 +31,7 @@ public partial class OrderItemFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves an order item with the order line ID.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = OrderItemFactory.GetOrderItemViaLineId(handler : handler,  orderId :  orderId,  lineId :  lineId,  draft :  draft,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.OrderItem GetOrderItemVi
 				 orderId :  orderId,  lineId :  lineId,  draft :  draft,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.OrderItem GetOrderItemVi
 		}
   
 		/// <summary> 
-		/// Retrieves the details of a single order item.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = OrderItemFactory.GetOrderItem(handler : handler,  orderId :  orderId,  orderItemId :  orderItemId,  draft :  draft,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.OrderItem GetOrderItem(S
 				 orderId :  orderId,  orderItemId :  orderItemId,  draft :  draft,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.OrderItem GetOrderItem(S
 		}
   
 		/// <summary> 
-		/// Retrieves the details of all items in an order.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = OrderItemFactory.GetOrderItems(handler : handler,  orderId :  orderId,  draft :  draft,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.OrderItemCollection GetO
 				 orderId :  orderId,  draft :  draft,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.OrderItemCollection GetO
 		}
   
 		/// <summary> 
-		/// Adds a new item to a defined order.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = OrderItemFactory.CreateOrderItem(handler : handler,  orderItem :  orderItem,  orderId :  orderId,  updateMode :  updateMode,  version :  version,  skipInventoryCheck :  skipInventoryCheck,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.Order CreateOrderItem(Se
 				 orderItem :  orderItem,  orderId :  orderId,  updateMode :  updateMode,  version :  version,  skipInventoryCheck :  skipInventoryCheck,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -182,7 +183,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.Order CreateOrderItem(Se
 		}
   
 		/// <summary> 
-		/// Update the discount applied to an item in an order.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = OrderItemFactory.UpdateOrderItemDiscount(handler : handler,  discount :  discount,  orderId :  orderId,  orderItemId :  orderItemId,  discountId :  discountId,  updateMode :  updateMode,  version :  version,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -203,7 +204,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.Order UpdateOrderItemDis
 				 discount :  discount,  orderId :  orderId,  orderItemId :  orderItemId,  discountId :  discountId,  updateMode :  updateMode,  version :  version,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -220,7 +221,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.Order UpdateOrderItemDis
 		}
   
 		/// <summary> 
-		/// Update the duty fee information for an order item.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = OrderItemFactory.UpdateItemDuty(handler : handler,  orderId :  orderId,  orderItemId :  orderItemId,  dutyAmount :  dutyAmount,  updateMode :  updateMode,  version :  version,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -241,7 +242,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.Order UpdateItemDuty(Ser
 				 orderId :  orderId,  orderItemId :  orderItemId,  dutyAmount :  dutyAmount,  updateMode :  updateMode,  version :  version,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -258,7 +259,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.Order UpdateItemDuty(Ser
 		}
   
 		/// <summary> 
-		/// Updates the item fulfillment information for the order specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = OrderItemFactory.UpdateItemFulfillment(handler : handler,  orderItem :  orderItem,  orderId :  orderId,  orderItemId :  orderItemId,  updateMode :  updateMode,  version :  version,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -279,7 +280,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.Order UpdateItemFulfillm
 				 orderItem :  orderItem,  orderId :  orderId,  orderItemId :  orderItemId,  updateMode :  updateMode,  version :  version,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -296,7 +297,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.Order UpdateItemFulfillm
 		}
   
 		/// <summary> 
-		/// Override the price of an individual product on a line item in the specified order.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = OrderItemFactory.UpdateItemProductPrice(handler : handler,  orderId :  orderId,  orderItemId :  orderItemId,  price :  price,  updateMode :  updateMode,  version :  version,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -317,7 +318,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.Order UpdateItemProductP
 				 orderId :  orderId,  orderItemId :  orderItemId,  price :  price,  updateMode :  updateMode,  version :  version,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -334,7 +335,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.Order UpdateItemProductP
 		}
   
 		/// <summary> 
-		/// Update the quantity of an item in an order.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = OrderItemFactory.UpdateItemQuantity(handler : handler,  orderId :  orderId,  orderItemId :  orderItemId,  quantity :  quantity,  updateMode :  updateMode,  version :  version,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -355,7 +356,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.Order UpdateItemQuantity
 				 orderId :  orderId,  orderItemId :  orderItemId,  quantity :  quantity,  updateMode :  updateMode,  version :  version,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -372,7 +373,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.Order UpdateItemQuantity
 		}
   
 		/// <summary> 
-		/// Removes a previously added item from a defined order.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = OrderItemFactory.DeleteOrderItem(handler : handler,  orderId :  orderId,  orderItemId :  orderItemId,  updateMode :  updateMode,  version :  version,  expectedCode: expectedCode, successCode: successCode); 
@@ -393,7 +394,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.Order DeleteOrderItem(Se
 				 orderId :  orderId,  orderItemId :  orderItemId,  updateMode :  updateMode,  version :  version		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/OrderNoteFactory.cs b/Mozu.Api.Test/Factories/Commerce/Orders/OrderNoteFactory.cs
old mode 100644
new mode 100755
similarity index 93%
rename from Mozu.Api.Test/Factories/OrderNoteFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Orders/OrderNoteFactory.cs
index 86d8458a..d8c065dc
--- a/Mozu.Api.Test/Factories/OrderNoteFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Orders/OrderNoteFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Orders
 {
 	/// <summary>
 	/// Use the Order Notes subresource to manage merchant-level notes associated with an active order.
@@ -30,7 +31,7 @@ public partial class OrderNoteFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a list of all notes for an order.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = OrderNoteFactory.GetOrderNotes(handler : handler,  orderId :  orderId,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public partial class OrderNoteFactory : BaseDataFactory
 				 orderId :  orderId		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public partial class OrderNoteFactory : BaseDataFactory
 		}
   
 		/// <summary> 
-		/// Retrieves the details of a specific order note.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = OrderNoteFactory.GetOrderNote(handler : handler,  orderId :  orderId,  noteId :  noteId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote GetOrderNote(S
 				 orderId :  orderId,  noteId :  noteId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote GetOrderNote(S
 		}
   
 		/// <summary> 
-		/// Creates a new merchant note for the specified order.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = OrderNoteFactory.CreateOrderNote(handler : handler,  orderNote :  orderNote,  orderId :  orderId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote CreateOrderNot
 				 orderNote :  orderNote,  orderId :  orderId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote CreateOrderNot
 		}
   
 		/// <summary> 
-		/// Updates a specific note for an order.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = OrderNoteFactory.UpdateOrderNote(handler : handler,  orderNote :  orderNote,  orderId :  orderId,  noteId :  noteId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote UpdateOrderNot
 				 orderNote :  orderNote,  orderId :  orderId,  noteId :  noteId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -182,7 +183,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote UpdateOrderNot
 		}
   
 		/// <summary> 
-		/// Deletes the specified order note.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = OrderNoteFactory.DeleteOrderNote(handler : handler,  orderId :  orderId,  noteId :  noteId,  expectedCode: expectedCode, successCode: successCode); 
@@ -203,7 +204,7 @@ public static void DeleteOrderNote(ServiceClientMessageHandler handler,
 				 orderId :  orderId,  noteId :  noteId		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/OrderReturnableItemFactory.cs b/Mozu.Api.Test/Factories/Commerce/Orders/OrderReturnableItemFactory.cs
old mode 100644
new mode 100755
similarity index 88%
rename from Mozu.Api.Test/Factories/OrderReturnableItemFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Orders/OrderReturnableItemFactory.cs
index 8b057dc6..1dd85990
--- a/Mozu.Api.Test/Factories/OrderReturnableItemFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Orders/OrderReturnableItemFactory.cs
@@ -18,22 +18,20 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Orders
 {
 	/// <summary>
-	/// Use this subresource to view which order items are eligible for return.
+	/// 
 	/// </summary>
 	public partial class OrderReturnableItemFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves information about which items are eligible for return on an order.Each item displays the following information:
-
-
-
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = OrderReturnableItemFactory.GetOrderReturnableItems(handler : handler,  orderId :  orderId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -54,7 +52,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.OrderReturnableItemColle
 				 orderId :  orderId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/OrderValidationResultFactory.cs b/Mozu.Api.Test/Factories/Commerce/Orders/OrderValidationResultFactory.cs
old mode 100644
new mode 100755
similarity index 93%
rename from Mozu.Api.Test/Factories/OrderValidationResultFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Orders/OrderValidationResultFactory.cs
index 2a6b511b..995eeace
--- a/Mozu.Api.Test/Factories/OrderValidationResultFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Orders/OrderValidationResultFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Orders
 {
 	/// <summary>
 	/// Manage the results of order validation.
@@ -30,7 +31,7 @@ public partial class OrderValidationResultFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a list of the validation results associated with the order.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = OrderValidationResultFactory.GetValidationResults(handler : handler,  orderId :  orderId,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public partial class OrderValidationResultFactory : BaseDataFactory
 				 orderId :  orderId		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public partial class OrderValidationResultFactory : BaseDataFactory
 		}
   
 		/// <summary> 
-		/// Add a new order validation result to a submitted order.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = OrderValidationResultFactory.AddValidationResult(handler : handler,  validationResult :  validationResult,  orderId :  orderId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.OrderValidationResult Ad
 				 validationResult :  validationResult,  orderId :  orderId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/PaymentFactory.cs b/Mozu.Api.Test/Factories/Commerce/Orders/PaymentFactory.cs
old mode 100644
new mode 100755
similarity index 91%
rename from Mozu.Api.Test/Factories/PaymentFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Orders/PaymentFactory.cs
index 95c16487..d0e878d3
--- a/Mozu.Api.Test/Factories/PaymentFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Orders/PaymentFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Orders
 {
 	/// <summary>
 	/// Use the Payments subresource to manage payment transactions for orders. Each transaction performed for an order represents an individual payment. For example, if an order totals $75.00 but the shopper has a $50.00 gift certificate, both the gift certificate transaction and the credit card transaction for the remaining $25.00 are recorded as payments for the order.
@@ -30,7 +31,7 @@ public partial class PaymentFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves information about all payment transactions submitted for the specified order.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = PaymentFactory.GetPayments(handler : handler,  orderId :  orderId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Payments.PaymentCollection GetP
 				 orderId :  orderId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Payments.PaymentCollection GetP
 		}
   
 		/// <summary> 
-		/// Retrieves the list of all available payment actions dependent on the order payment status by specifying the order ID.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = PaymentFactory.GetAvailablePaymentActions(handler : handler,  orderId :  orderId,  paymentId :  paymentId,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static List<string> GetAvailablePaymentActions(ServiceClientMessageHandle
 				 orderId :  orderId,  paymentId :  paymentId		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static List<string> GetAvailablePaymentActions(ServiceClientMessageHandle
 		}
   
 		/// <summary> 
-		/// Retrieves information about a specific payment transaction submitted for the specified order.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = PaymentFactory.GetPayment(handler : handler,  orderId :  orderId,  paymentId :  paymentId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Payments.Payment GetPayment(Ser
 				 orderId :  orderId,  paymentId :  paymentId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Payments.Payment GetPayment(Ser
 		}
   
 		/// <summary> 
-		/// Performs the specified action for an individual order payment transaction.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = PaymentFactory.PerformPaymentAction(handler : handler,  action :  action,  orderId :  orderId,  paymentId :  paymentId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.Order PerformPaymentActi
 				 action :  action,  orderId :  orderId,  paymentId :  paymentId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -182,7 +183,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.Order PerformPaymentActi
 		}
   
 		/// <summary> 
-		/// Creates a new payment transaction for the specified order and performs the specified action.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = PaymentFactory.CreatePaymentAction(handler : handler,  action :  action,  orderId :  orderId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -203,7 +204,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.Order CreatePaymentActio
 				 action :  action,  orderId :  orderId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/PickupFactory.cs b/Mozu.Api.Test/Factories/Commerce/Orders/PickupFactory.cs
old mode 100644
new mode 100755
similarity index 92%
rename from Mozu.Api.Test/Factories/PickupFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Orders/PickupFactory.cs
index df07616e..5d7e1534
--- a/Mozu.Api.Test/Factories/PickupFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Orders/PickupFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Orders
 {
 	/// <summary>
 	/// Use the Pickups resource to organize items submitted in an order into pickups that enable the shopper to fulfill the order items using the in-store pickup method.
@@ -30,7 +31,7 @@ public partial class PickupFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a list of the actions available to perform for the pickup specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = PickupFactory.GetAvailablePickupFulfillmentActions(handler : handler,  orderId :  orderId,  pickupId :  pickupId,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static List<string> GetAvailablePickupFulfillmentActions(ServiceClientMes
 				 orderId :  orderId,  pickupId :  pickupId		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static List<string> GetAvailablePickupFulfillmentActions(ServiceClientMes
 		}
   
 		/// <summary> 
-		/// Retrieves the details of the in-store pickup specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = PickupFactory.GetPickup(handler : handler,  orderId :  orderId,  pickupId :  pickupId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Pickup GetPickup(Se
 				 orderId :  orderId,  pickupId :  pickupId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Pickup GetPickup(Se
 		}
   
 		/// <summary> 
-		/// Create a new pickup for the order specified in the request for in-store fufillment.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = PickupFactory.CreatePickup(handler : handler,  pickup :  pickup,  orderId :  orderId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Pickup CreatePickup
 				 pickup :  pickup,  orderId :  orderId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Pickup CreatePickup
 		}
   
 		/// <summary> 
-		/// Updates one or more details of a defined in-store pickup.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = PickupFactory.UpdatePickup(handler : handler,  pickup :  pickup,  orderId :  orderId,  pickupId :  pickupId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Pickup UpdatePickup
 				 pickup :  pickup,  orderId :  orderId,  pickupId :  pickupId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -182,7 +183,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Pickup UpdatePickup
 		}
   
 		/// <summary> 
-		/// Removes a pickup previously defined for order item in-store pickup fulfillment.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = PickupFactory.DeletePickup(handler : handler,  orderId :  orderId,  pickupId :  pickupId,  expectedCode: expectedCode, successCode: successCode); 
@@ -203,7 +204,7 @@ public static void DeletePickup(ServiceClientMessageHandler handler,
 				 orderId :  orderId,  pickupId :  pickupId		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/RefundFactory.cs b/Mozu.Api.Test/Factories/Commerce/Orders/RefundFactory.cs
old mode 100644
new mode 100755
similarity index 91%
rename from Mozu.Api.Test/Factories/RefundFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Orders/RefundFactory.cs
index 69475021..bbff3943
--- a/Mozu.Api.Test/Factories/RefundFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Orders/RefundFactory.cs
@@ -18,19 +18,20 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Orders
 {
 	/// <summary>
-	/// Use the refunds resource to create a refund.
+	/// 
 	/// </summary>
 	public partial class RefundFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Creates a refund based on the information supplied in the request.  
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = RefundFactory.CreateRefund(handler : handler,  refund :  refund,  orderId :  orderId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Refunds.Refund CreateRefund(Ser
 				 refund :  refund,  orderId :  orderId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Refunds.Refund CreateRefund(Ser
 		}
   
 		/// <summary> 
-		/// Resends the order refund email previously sent to the shopper. 
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = RefundFactory.ResendRefundEmail(handler : handler,  orderId :  orderId,  refundId :  refundId,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static void ResendRefundEmail(ServiceClientMessageHandler handler,
 				 orderId :  orderId,  refundId :  refundId		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/StorefrontPackageFactory.cs b/Mozu.Api.Test/Factories/Commerce/Orders/StorefrontPackageFactory.cs
old mode 100644
new mode 100755
similarity index 92%
rename from Mozu.Api.Test/Factories/StorefrontPackageFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Orders/StorefrontPackageFactory.cs
index 0badf14d..4ec2e099
--- a/Mozu.Api.Test/Factories/StorefrontPackageFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Orders/StorefrontPackageFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Orders
 {
 	/// <summary>
 	/// Use the Packages subresource to manage the physical packages to ship for an order.
@@ -30,7 +31,7 @@ public partial class StorefrontPackageFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a list of the actions available to perform for a package associated with order fulfillment.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = PackageFactory.GetAvailablePackageFulfillmentActions(handler : handler,  orderId :  orderId,  packageId :  packageId,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static List<string> GetAvailablePackageFulfillmentActions(ServiceClientMe
 				 orderId :  orderId,  packageId :  packageId		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static List<string> GetAvailablePackageFulfillmentActions(ServiceClientMe
 		}
   
 		/// <summary> 
-		/// Retrieves the package label image supplied by the carrier.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = PackageFactory.GetPackageLabel(handler : handler,  orderId :  orderId,  packageId :  packageId,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static System.IO.Stream GetPackageLabel(ServiceClientMessageHandler handl
 				 orderId :  orderId,  packageId :  packageId		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static System.IO.Stream GetPackageLabel(ServiceClientMessageHandler handl
 		}
   
 		/// <summary> 
-		/// Retrieves the details of a package of order items.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = PackageFactory.GetPackage(handler : handler,  orderId :  orderId,  packageId :  packageId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package GetPackage(
 				 orderId :  orderId,  packageId :  packageId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package GetPackage(
 		}
   
 		/// <summary> 
-		/// Creates a new physical package of order items.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = PackageFactory.CreatePackage(handler : handler,  pkg :  pkg,  orderId :  orderId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package CreatePacka
 				 pkg :  pkg,  orderId :  orderId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -182,7 +183,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package CreatePacka
 		}
   
 		/// <summary> 
-		/// Updates one or more properties of a physical package of order items.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = PackageFactory.UpdatePackage(handler : handler,  pkg :  pkg,  orderId :  orderId,  packageId :  packageId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -203,7 +204,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package UpdatePacka
 				 pkg :  pkg,  orderId :  orderId,  packageId :  packageId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -220,7 +221,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package UpdatePacka
 		}
   
 		/// <summary> 
-		/// Removes a physical package of items from the specified order.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = PackageFactory.DeletePackage(handler : handler,  orderId :  orderId,  packageId :  packageId,  expectedCode: expectedCode, successCode: successCode); 
@@ -241,7 +242,7 @@ public static void DeletePackage(ServiceClientMessageHandler handler,
 				 orderId :  orderId,  packageId :  packageId		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/StorefrontShipmentFactory.cs b/Mozu.Api.Test/Factories/Commerce/Orders/StorefrontShipmentFactory.cs
old mode 100644
new mode 100755
similarity index 91%
rename from Mozu.Api.Test/Factories/StorefrontShipmentFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Orders/StorefrontShipmentFactory.cs
index 68da430e..b75bd8e0
--- a/Mozu.Api.Test/Factories/StorefrontShipmentFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Orders/StorefrontShipmentFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Orders
 {
 	/// <summary>
 	/// Use the shipments resource to manage shipments of collections of packages for an order.
@@ -30,7 +31,7 @@ public partial class StorefrontShipmentFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves the details of the order shipment specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ShipmentFactory.GetShipment(handler : handler,  orderId :  orderId,  shipmentId :  shipmentId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Shipment GetShipmen
 				 orderId :  orderId,  shipmentId :  shipmentId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Shipment GetShipmen
 		}
   
 		/// <summary> 
-		/// Retrieves the available shipping methods applicable to the order. Typically used to display available shipping method options on the checkout page.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ShipmentFactory.GetAvailableShipmentMethods(handler : handler,  orderId :  orderId,  draft :  draft,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Shipment GetShipmen
 				 orderId :  orderId,  draft :  draft		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Shipment GetShipmen
 		}
   
 		/// <summary> 
-		/// Creates a shipment from one or more package associated with an order and assign a label and tracking number to an order shipment.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ShipmentFactory.CreatePackageShipments(handler : handler,  packageIds :  packageIds,  orderId :  orderId,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Shipment GetShipmen
 				 packageIds :  packageIds,  orderId :  orderId		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Shipment GetShipmen
 		}
   
 		/// <summary> 
-		/// Deletes the shipment specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ShipmentFactory.DeleteShipment(handler : handler,  orderId :  orderId,  shipmentId :  shipmentId,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static void DeleteShipment(ServiceClientMessageHandler handler,
 				 orderId :  orderId,  shipmentId :  shipmentId		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/FraudScreenFactory.cs b/Mozu.Api.Test/Factories/Commerce/Payments/FraudScreenFactory.cs
old mode 100644
new mode 100755
similarity index 91%
rename from Mozu.Api.Test/Factories/FraudScreenFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Payments/FraudScreenFactory.cs
index cbec2830..5b38676c
--- a/Mozu.Api.Test/Factories/FraudScreenFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Payments/FraudScreenFactory.cs
@@ -18,19 +18,20 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Payments
 {
 	/// <summary>
-	/// commerce/payments/fraudscreen related resources. DOCUMENT_HERE 
+	/// 
 	/// </summary>
 	public partial class FraudScreenFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// payments-fraudscreen Post Screen description DOCUMENT_HERE 
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = FraudScreenFactory.Screen(handler : handler,  request :  request,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.PaymentService.Response.FraudScreen Screen(Serv
 				 request :  request,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/PublicCardFactory.cs b/Mozu.Api.Test/Factories/Commerce/Payments/PublicCardFactory.cs
old mode 100644
new mode 100755
similarity index 92%
rename from Mozu.Api.Test/Factories/PublicCardFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Payments/PublicCardFactory.cs
index 4e874a6b..95ead004
--- a/Mozu.Api.Test/Factories/PublicCardFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Payments/PublicCardFactory.cs
@@ -18,19 +18,20 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Payments
 {
 	/// <summary>
-	/// commerce/payments/cards related resources. DOCUMENT_HERE 
+	/// 
 	/// </summary>
 	public partial class PublicCardFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// payments-cards Post Create description DOCUMENT_HERE 
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = PublicCardFactory.Create(handler : handler,  request :  request,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.PaymentService.Response.SyncResponse Create(Ser
 				 request :  request,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.PaymentService.Response.SyncResponse Create(Ser
 		}
   
 		/// <summary> 
-		/// payments-cards Put Update description DOCUMENT_HERE 
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = PublicCardFactory.Update(handler : handler,  request :  request,  cardId :  cardId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.PaymentService.Response.SyncResponse Update(Ser
 				 request :  request,  cardId :  cardId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.PaymentService.Response.SyncResponse Update(Ser
 		}
   
 		/// <summary> 
-		/// payments-cards Delete Delete description DOCUMENT_HERE 
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = PublicCardFactory.Delete(handler : handler,  cardId :  cardId,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static void Delete(ServiceClientMessageHandler handler,
 				 cardId :  cardId		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/ReturnFactory.cs b/Mozu.Api.Test/Factories/Commerce/ReturnFactory.cs
old mode 100644
new mode 100755
similarity index 90%
rename from Mozu.Api.Test/Factories/ReturnFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/ReturnFactory.cs
index d318981f..9f86751e
--- a/Mozu.Api.Test/Factories/ReturnFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/ReturnFactory.cs
@@ -18,19 +18,20 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce
 {
 	/// <summary>
-	/// Use the Returns resource to manage returned items that were previously fufilled. Returns can include any number of items associated with an original  order. Each return must either be associated with an original order or a product definition to represent each returned item.Refer to the [Returns API](https://www.mozu.com/docs/developer/api-guides/returns.htm) topic for more information about creating and processing returns using the API.
+	/// Use the Returns resource to manage returned items that were previously fufilled. Returns can include any number of items associated with an original Mozu order. Each return must either be associated with an original order or a product definition to represent each returned item.
 	/// </summary>
 	public partial class ReturnFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a list of all returns according to any filter and sort criteria.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ReturnFactory.GetReturns(handler : handler,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  q :  q,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Returns.ReturnCollection GetRet
 				 startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  q :  q,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Returns.ReturnCollection GetRet
 		}
   
 		/// <summary> 
-		/// Retrieves a list of the actions available to perform for the specified return based on its current state.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ReturnFactory.GetAvailableReturnActions(handler : handler,  returnId :  returnId,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static List<string> GetAvailableReturnActions(ServiceClientMessageHandler
 				 returnId :  returnId		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static List<string> GetAvailableReturnActions(ServiceClientMessageHandler
 		}
   
 		/// <summary> 
-		/// Retrieves the details of a single return item.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ReturnFactory.GetReturnItem(handler : handler,  returnId :  returnId,  returnItemId :  returnItemId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Returns.ReturnItem GetReturnIte
 				 returnId :  returnId,  returnItemId :  returnItemId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Returns.ReturnItem GetReturnIte
 		}
   
 		/// <summary> 
-		/// Retrieves the details of all return items in an order.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ReturnFactory.GetReturnItems(handler : handler,  returnId :  returnId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Returns.ReturnItemCollection Ge
 				 returnId :  returnId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -182,7 +183,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Returns.ReturnItemCollection Ge
 		}
   
 		/// <summary> 
-		/// Retrieves a list of the payment actions available to perform for the specified return when a return results in a refund to the customer.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ReturnFactory.GetAvailablePaymentActionsForReturn(handler : handler,  returnId :  returnId,  paymentId :  paymentId,  expectedCode: expectedCode, successCode: successCode); 
@@ -203,7 +204,7 @@ public static List<string> GetAvailablePaymentActionsForReturn(ServiceClientMess
 				 returnId :  returnId,  paymentId :  paymentId		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -220,7 +221,7 @@ public static List<string> GetAvailablePaymentActionsForReturn(ServiceClientMess
 		}
   
 		/// <summary> 
-		/// Retrieves the details of a payment submitted as part of a refund associated with a customer return.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ReturnFactory.GetPayment(handler : handler,  returnId :  returnId,  paymentId :  paymentId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -241,7 +242,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Payments.Payment GetPayment(Ser
 				 returnId :  returnId,  paymentId :  paymentId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -258,7 +259,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Payments.Payment GetPayment(Ser
 		}
   
 		/// <summary> 
-		/// Retrieves a list of all payments submitted as part of a refund associated with a customer return.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ReturnFactory.GetPayments(handler : handler,  returnId :  returnId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -279,7 +280,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Payments.PaymentCollection GetP
 				 returnId :  returnId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -296,7 +297,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Payments.PaymentCollection GetP
 		}
   
 		/// <summary> 
-		/// Retrieves a list of properties for the specified return.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ReturnFactory.GetReturn(handler : handler,  returnId :  returnId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -317,7 +318,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Returns.Return GetReturn(Servic
 				 returnId :  returnId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -334,7 +335,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Returns.Return GetReturn(Servic
 		}
   
 		/// <summary> 
-		/// Returns a list of reasons for a return.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ReturnFactory.GetReasons(handler : handler,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -355,7 +356,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Returns.ReasonCollection GetRea
 				 responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -372,10 +373,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Returns.ReasonCollection GetRea
 		}
   
 		/// <summary> 
-		/// Creates a return for previously fulfilled items. Each return must either be associated with an original order or a product definition to represent each returned item.When you create a return, you must specify the following fields:
-
-
-
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ReturnFactory.CreateReturn(handler : handler,  ret :  ret,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -396,7 +394,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Returns.Return CreateReturn(Ser
 				 ret :  ret,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -413,7 +411,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Returns.Return CreateReturn(Ser
 		}
   
 		/// <summary> 
-		/// Adds a return item to the return.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ReturnFactory.CreateReturnItem(handler : handler,  returnItem :  returnItem,  returnId :  returnId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -434,7 +432,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Returns.Return CreateReturnItem
 				 returnItem :  returnItem,  returnId :  returnId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -451,7 +449,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Returns.Return CreateReturnItem
 		}
   
 		/// <summary> 
-		/// Updates a refund payment associated with a customer return by performing the specified action.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ReturnFactory.PerformPaymentActionForReturn(handler : handler,  action :  action,  returnId :  returnId,  paymentId :  paymentId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -472,7 +470,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Returns.Return PerformPaymentAc
 				 action :  action,  returnId :  returnId,  paymentId :  paymentId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -489,7 +487,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Returns.Return PerformPaymentAc
 		}
   
 		/// <summary> 
-		/// Creates a new payment for a return that results in a refund to the customer.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ReturnFactory.CreatePaymentActionForReturn(handler : handler,  action :  action,  returnId :  returnId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -510,7 +508,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Returns.Return CreatePaymentAct
 				 action :  action,  returnId :  returnId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -527,7 +525,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Returns.Return CreatePaymentAct
 		}
   
 		/// <summary> 
-		/// Creates a replacement order for the return.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ReturnFactory.CreateReturnShippingOrder(handler : handler,  itemQuantities :  itemQuantities,  returnId :  returnId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -548,7 +546,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.Order CreateReturnShippi
 				 itemQuantities :  itemQuantities,  returnId :  returnId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -565,7 +563,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Orders.Order CreateReturnShippi
 		}
   
 		/// <summary> 
-		/// Updates the return by performing the action specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ReturnFactory.PerformReturnActions(handler : handler,  action :  action,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -586,7 +584,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Returns.ReturnCollection Perfor
 				 action :  action,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -603,7 +601,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Returns.ReturnCollection Perfor
 		}
   
 		/// <summary> 
-		/// Updates one or more properties of a return for items previously shipped in a completed order.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ReturnFactory.UpdateReturn(handler : handler,  ret :  ret,  returnId :  returnId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -624,7 +622,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Returns.Return UpdateReturn(Ser
 				 ret :  ret,  returnId :  returnId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -641,7 +639,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Returns.Return UpdateReturn(Ser
 		}
   
 		/// <summary> 
-		/// Resend the email notification to a shopper that a return has been created.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ReturnFactory.ResendReturnEmail(handler : handler,  action :  action,  expectedCode: expectedCode, successCode: successCode); 
@@ -662,7 +660,7 @@ public static void ResendReturnEmail(ServiceClientMessageHandler handler,
 				 action :  action		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -678,7 +676,7 @@ public static void ResendReturnEmail(ServiceClientMessageHandler handler,
 		}
   
 		/// <summary> 
-		/// Removes a particular order item from the order of the current shopper.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ReturnFactory.DeleteOrderItem(handler : handler,  returnId :  returnId,  returnItemId :  returnItemId,  expectedCode: expectedCode, successCode: successCode); 
@@ -699,7 +697,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Returns.Return DeleteOrderItem(
 				 returnId :  returnId,  returnItemId :  returnItemId		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -716,7 +714,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Returns.Return DeleteOrderItem(
 		}
   
 		/// <summary> 
-		/// Deletes the return specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ReturnFactory.DeleteReturn(handler : handler,  returnId :  returnId,  expectedCode: expectedCode, successCode: successCode); 
@@ -737,7 +735,7 @@ public static void DeleteReturn(ServiceClientMessageHandler handler,
 				 returnId :  returnId		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/EntityListsFactory.cs b/Mozu.Api.Test/Factories/Commerce/Returns/OrderNoteFactory.cs
old mode 100644
new mode 100755
similarity index 57%
rename from Mozu.Api.Test/Factories/EntityListsFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Returns/OrderNoteFactory.cs
index 3ecf3238..82235a26
--- a/Mozu.Api.Test/Factories/EntityListsFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Returns/OrderNoteFactory.cs
@@ -18,40 +18,41 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Returns
 {
 	/// <summary>
-	/// The Entity Lists resource manages all dynamic entities in your Mozu document store of the Mozu cloud. The content is JSON and can have up to five indexed properties (integer, decimal, string, date, and boolean) with support for additional customized elements as needed. Every document in the entity list has a validated unique ID. 
+	/// 
 	/// </summary>
-	public partial class EntityListsFactory : BaseDataFactory
+	public partial class OrderNoteFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Get a filtered list of EntityLists for a specific tenant.
+		/// 
 		/// <example> 
 		///  <code> 
-		/// var result = EntityListsFactory.GetEntityLists(handler : handler,  pageSize :  pageSize,  startIndex :  startIndex,  filter :  filter,  sortBy :  sortBy,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<EntityListCollection/>(result); 
+		/// var result = OrderNoteFactory.GetReturnNotes(handler : handler,  returnId :  returnId,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<List<OrderNote>/>(result); 
 		/// return optionalCasting;
 		///  </code> 
 		/// </example> 
 		/// </summary>
-		public static Mozu.Api.Contracts.MZDB.EntityListCollection GetEntityLists(ServiceClientMessageHandler handler, 
- 		 int? pageSize = null, int? startIndex = null, string filter = null, string sortBy = null, string responseFields = null, 
+		public static List<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote> GetReturnNotes(ServiceClientMessageHandler handler, 
+ 		 string returnId, 
 		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
 		{
 			SetSdKparameters();
 			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
 			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
 			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Platform.EntityLists.EntityListsClient.GetEntityListsClient(
-				 pageSize :  pageSize,  startIndex :  startIndex,  filter :  filter,  sortBy :  sortBy,  responseFields :  responseFields		);
+			var apiClient = Mozu.Api.Clients.Commerce.Returns.OrderNoteClient.GetReturnNotesClient(
+				 returnId :  returnId		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,28 +69,28 @@ public static Mozu.Api.Contracts.MZDB.EntityListCollection GetEntityLists(Servic
 		}
   
 		/// <summary> 
-		/// Get an existing EntityList definition for a specific tenant
+		/// 
 		/// <example> 
 		///  <code> 
-		/// var result = EntityListsFactory.GetEntityList(handler : handler,  entityListFullName :  entityListFullName,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<EntityList/>(result); 
+		/// var result = OrderNoteFactory.GetReturnNote(handler : handler,  returnId :  returnId,  noteId :  noteId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<OrderNote/>(result); 
 		/// return optionalCasting;
 		///  </code> 
 		/// </example> 
 		/// </summary>
-		public static Mozu.Api.Contracts.MZDB.EntityList GetEntityList(ServiceClientMessageHandler handler, 
- 		 string entityListFullName, string responseFields = null, 
+		public static Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote GetReturnNote(ServiceClientMessageHandler handler, 
+ 		 string returnId, string noteId, string responseFields = null, 
 		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
 		{
 			SetSdKparameters();
 			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
 			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
 			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Platform.EntityLists.EntityListsClient.GetEntityListClient(
-				 entityListFullName :  entityListFullName,  responseFields :  responseFields		);
+			var apiClient = Mozu.Api.Clients.Commerce.Returns.OrderNoteClient.GetReturnNoteClient(
+				 returnId :  returnId,  noteId :  noteId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,28 +107,28 @@ public static Mozu.Api.Contracts.MZDB.EntityList GetEntityList(ServiceClientMess
 		}
   
 		/// <summary> 
-		/// Create a new EntityList for a specific tenant.
+		/// 
 		/// <example> 
 		///  <code> 
-		/// var result = EntityListsFactory.CreateEntityList(handler : handler,  entityList :  entityList,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<EntityList/>(result); 
+		/// var result = OrderNoteFactory.CreateReturnNote(handler : handler,  returnNote :  returnNote,  returnId :  returnId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<OrderNote/>(result); 
 		/// return optionalCasting;
 		///  </code> 
 		/// </example> 
 		/// </summary>
-		public static Mozu.Api.Contracts.MZDB.EntityList CreateEntityList(ServiceClientMessageHandler handler, 
- 		 Mozu.Api.Contracts.MZDB.EntityList entityList, string responseFields = null, 
+		public static Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote CreateReturnNote(ServiceClientMessageHandler handler, 
+ 		 Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote returnNote, string returnId, string responseFields = null, 
 		 HttpStatusCode expectedCode = HttpStatusCode.Created, HttpStatusCode successCode = HttpStatusCode.Created)
 		{
 			SetSdKparameters();
 			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
 			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
 			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Platform.EntityLists.EntityListsClient.CreateEntityListClient(
-				 entityList :  entityList,  responseFields :  responseFields		);
+			var apiClient = Mozu.Api.Clients.Commerce.Returns.OrderNoteClient.CreateReturnNoteClient(
+				 returnNote :  returnNote,  returnId :  returnId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,28 +145,28 @@ public static Mozu.Api.Contracts.MZDB.EntityList CreateEntityList(ServiceClientM
 		}
   
 		/// <summary> 
-		/// Update an existing Entitylist for a specific tenant.
+		/// 
 		/// <example> 
 		///  <code> 
-		/// var result = EntityListsFactory.UpdateEntityList(handler : handler,  entityList :  entityList,  entityListFullName :  entityListFullName,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<EntityList/>(result); 
+		/// var result = OrderNoteFactory.UpdateReturnNote(handler : handler,  returnNote :  returnNote,  returnId :  returnId,  noteId :  noteId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<OrderNote/>(result); 
 		/// return optionalCasting;
 		///  </code> 
 		/// </example> 
 		/// </summary>
-		public static Mozu.Api.Contracts.MZDB.EntityList UpdateEntityList(ServiceClientMessageHandler handler, 
- 		 Mozu.Api.Contracts.MZDB.EntityList entityList, string entityListFullName, string responseFields = null, 
+		public static Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote UpdateReturnNote(ServiceClientMessageHandler handler, 
+ 		 Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote returnNote, string returnId, string noteId, string responseFields = null, 
 		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
 		{
 			SetSdKparameters();
 			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
 			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
 			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Platform.EntityLists.EntityListsClient.UpdateEntityListClient(
-				 entityList :  entityList,  entityListFullName :  entityListFullName,  responseFields :  responseFields		);
+			var apiClient = Mozu.Api.Clients.Commerce.Returns.OrderNoteClient.UpdateReturnNoteClient(
+				 returnNote :  returnNote,  returnId :  returnId,  noteId :  noteId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -182,28 +183,28 @@ public static Mozu.Api.Contracts.MZDB.EntityList UpdateEntityList(ServiceClientM
 		}
   
 		/// <summary> 
-		/// Delete an existing EntityList for a specific tenant. This will also delete all Entities in all instances of this EntityList for the tenant.
+		/// 
 		/// <example> 
 		///  <code> 
-		/// var result = EntityListsFactory.DeleteEntityList(handler : handler,  entityListFullName :  entityListFullName,  expectedCode: expectedCode, successCode: successCode); 
+		/// var result = OrderNoteFactory.DeleteReturnNote(handler : handler,  returnId :  returnId,  noteId :  noteId,  expectedCode: expectedCode, successCode: successCode); 
 		/// var optionalCasting = ConvertClass<void/>(result); 
 		/// return optionalCasting;
 		///  </code> 
 		/// </example> 
 		/// </summary>
-		public static void DeleteEntityList(ServiceClientMessageHandler handler, 
- 		string entityListFullName, 
+		public static void DeleteReturnNote(ServiceClientMessageHandler handler, 
+ 		string returnId, string noteId, 
 		 HttpStatusCode expectedCode = HttpStatusCode.NoContent, HttpStatusCode successCode = HttpStatusCode.NoContent)
 		{
 			SetSdKparameters();
 			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
 			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
 			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Platform.EntityLists.EntityListsClient.DeleteEntityListClient(
-				 entityListFullName :  entityListFullName		);
+			var apiClient = Mozu.Api.Clients.Commerce.Returns.OrderNoteClient.DeleteReturnNoteClient(
+				 returnId :  returnId,  noteId :  noteId		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/ReturnsPackageFactory.cs b/Mozu.Api.Test/Factories/Commerce/Returns/ReturnsPackageFactory.cs
old mode 100644
new mode 100755
similarity index 92%
rename from Mozu.Api.Test/Factories/ReturnsPackageFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Returns/ReturnsPackageFactory.cs
index 69345ddb..1a30915a
--- a/Mozu.Api.Test/Factories/ReturnsPackageFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Returns/ReturnsPackageFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Returns
 {
 	/// <summary>
 	/// Use the Return Packages subresource to manage physical packages used to ship return replacement items.
@@ -30,7 +31,7 @@ public partial class ReturnsPackageFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves the package label image supplied by the carrier for a return replacement.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = PackageFactory.GetPackageLabel(handler : handler,  returnId :  returnId,  packageId :  packageId,  returnAsBase64Png :  returnAsBase64Png,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static System.IO.Stream GetPackageLabel(ServiceClientMessageHandler handl
 				 returnId :  returnId,  packageId :  packageId,  returnAsBase64Png :  returnAsBase64Png		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static System.IO.Stream GetPackageLabel(ServiceClientMessageHandler handl
 		}
   
 		/// <summary> 
-		/// Retrieves the details of a package of return replacement items.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = PackageFactory.GetPackage(handler : handler,  returnId :  returnId,  packageId :  packageId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package GetPackage(
 				 returnId :  returnId,  packageId :  packageId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package GetPackage(
 		}
   
 		/// <summary> 
-		/// Creates a new physical package of return replacement items.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = PackageFactory.CreatePackage(handler : handler,  pkg :  pkg,  returnId :  returnId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package CreatePacka
 				 pkg :  pkg,  returnId :  returnId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package CreatePacka
 		}
   
 		/// <summary> 
-		/// Updates one or more properties of a package associated with a return replacement.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = PackageFactory.UpdatePackage(handler : handler,  pkg :  pkg,  returnId :  returnId,  packageId :  packageId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package UpdatePacka
 				 pkg :  pkg,  returnId :  returnId,  packageId :  packageId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -182,7 +183,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package UpdatePacka
 		}
   
 		/// <summary> 
-		/// Deletes a package associated with a return replacement.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = PackageFactory.DeletePackage(handler : handler,  returnId :  returnId,  packageId :  packageId,  expectedCode: expectedCode, successCode: successCode); 
@@ -203,7 +204,7 @@ public static void DeletePackage(ServiceClientMessageHandler handler,
 				 returnId :  returnId,  packageId :  packageId		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/ReturnsShipmentFactory.cs b/Mozu.Api.Test/Factories/Commerce/Returns/ReturnsShipmentFactory.cs
old mode 100644
new mode 100755
similarity index 92%
rename from Mozu.Api.Test/Factories/ReturnsShipmentFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Returns/ReturnsShipmentFactory.cs
index 9108e25c..ac661bd2
--- a/Mozu.Api.Test/Factories/ReturnsShipmentFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Returns/ReturnsShipmentFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Returns
 {
 	/// <summary>
 	/// Use the Return Shipments subresource to manage shipments for a return replacement.
@@ -30,7 +31,7 @@ public partial class ReturnsShipmentFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves the details of the specified return replacement shipment.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ShipmentFactory.GetShipment(handler : handler,  returnId :  returnId,  shipmentId :  shipmentId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Shipment GetShipmen
 				 returnId :  returnId,  shipmentId :  shipmentId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Shipment GetShipmen
 		}
   
 		/// <summary> 
-		/// Creates a shipment from one or more packages associated with a return replacement.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ShipmentFactory.CreatePackageShipments(handler : handler,  packageIds :  packageIds,  returnId :  returnId,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Shipment GetShipmen
 				 packageIds :  packageIds,  returnId :  returnId		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Shipment GetShipmen
 		}
   
 		/// <summary> 
-		/// Deletes a shipment for a return replacement.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ShipmentFactory.DeleteShipment(handler : handler,  returnId :  returnId,  shipmentId :  shipmentId,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static void DeleteShipment(ServiceClientMessageHandler handler,
 				 returnId :  returnId,  shipmentId :  shipmentId		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/ApplicationSettingsFactory.cs b/Mozu.Api.Test/Factories/Commerce/Settings/ApplicationSettingsFactory.cs
old mode 100644
new mode 100755
similarity index 93%
rename from Mozu.Api.Test/Factories/ApplicationSettingsFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Settings/ApplicationSettingsFactory.cs
index 94ff679f..095779a1
--- a/Mozu.Api.Test/Factories/ApplicationSettingsFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Settings/ApplicationSettingsFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Settings
 {
 	/// <summary>
 	/// Use the Applications resource to update site-specific settings for installed applications.
@@ -30,7 +31,7 @@ public partial class ApplicationSettingsFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieve the settings of a third-party application.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ApplicationFactory.ThirdPartyGetApplication(handler : handler,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.SiteSettings.Application.Application ThirdParty
 				 responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.SiteSettings.Application.Application ThirdParty
 		}
   
 		/// <summary> 
-		/// Initializes an application with the necessary configured settings.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ApplicationFactory.ThirdPartyUpdateApplication(handler : handler,  application :  application,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.SiteSettings.Application.Application ThirdParty
 				 application :  application,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/CartSettingsFactory.cs b/Mozu.Api.Test/Factories/Commerce/Settings/CartSettingsFactory.cs
old mode 100644
new mode 100755
similarity index 92%
rename from Mozu.Api.Test/Factories/CartSettingsFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Settings/CartSettingsFactory.cs
index e2ce2d20..12844bd9
--- a/Mozu.Api.Test/Factories/CartSettingsFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Settings/CartSettingsFactory.cs
@@ -18,19 +18,20 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Settings
 {
 	/// <summary>
-	/// Use the cart subresource to manage settings for the cart, such as whether to include handling fees in the cost calculations.
+	/// 
 	/// </summary>
 	public partial class CartSettingsFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves cart settings.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CartSettingsFactory.GetCartSettings(handler : handler,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.SiteSettings.Order.CartSettings GetCartSettings
 				 responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.SiteSettings.Order.CartSettings GetCartSettings
 		}
   
 		/// <summary> 
-		/// Creates cart settings.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CartSettingsFactory.CreateCartSettings(handler : handler,  cartSettings :  cartSettings,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.SiteSettings.Order.CartSettings CreateCartSetti
 				 cartSettings :  cartSettings,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.SiteSettings.Order.CartSettings CreateCartSetti
 		}
   
 		/// <summary> 
-		/// Updates cart settings.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CartSettingsFactory.UpdateCartSettings(handler : handler,  cartSettings :  cartSettings,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.SiteSettings.Order.CartSettings UpdateCartSetti
 				 cartSettings :  cartSettings,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/CustomerCheckoutSettingsFactory.cs b/Mozu.Api.Test/Factories/Commerce/Settings/Checkout/CustomerCheckoutSettingsFactory.cs
old mode 100644
new mode 100755
similarity index 87%
rename from Mozu.Api.Test/Factories/CustomerCheckoutSettingsFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Settings/Checkout/CustomerCheckoutSettingsFactory.cs
index 9ac46b08..00108b20
--- a/Mozu.Api.Test/Factories/CustomerCheckoutSettingsFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Settings/Checkout/CustomerCheckoutSettingsFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Settings.Checkout
 {
 	/// <summary>
 	/// Use the Customer Checkout Settings resource to define login settings that apply when shoppers proceed to checkout.
@@ -30,7 +31,7 @@ public partial class CustomerCheckoutSettingsFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves all checkout settings defined for the site: Payment settings, such as the payment gateway ID and credentials, supported credit cards, and more; Customer Checkout settings, such as whether login is required, and any custom attributes; and Order Processing settings, such as when payment is authorized and captured, and any custom attributes.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CustomerCheckoutSettingsFactory.GetCustomerCheckoutSettings(handler : handler,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.SiteSettings.Order.CustomerCheckoutSettings Get
 				 responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.SiteSettings.Order.CustomerCheckoutSettings Get
 		}
   
 		/// <summary> 
-		/// Modifies existing site checkout settings. Modify Payment, Customer Checkout, and Order Processing settings in one PUT.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CustomerCheckoutSettingsFactory.UpdateCustomerCheckoutSettings(handler : handler,  customerCheckoutSettings :  customerCheckoutSettings,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.SiteSettings.Order.CustomerCheckoutSettings Upd
 				 customerCheckoutSettings :  customerCheckoutSettings,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/PaymentSettingsFactory.cs b/Mozu.Api.Test/Factories/Commerce/Settings/Checkout/PaymentSettingsFactory.cs
old mode 100644
new mode 100755
similarity index 87%
rename from Mozu.Api.Test/Factories/PaymentSettingsFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Settings/Checkout/PaymentSettingsFactory.cs
index 53bb82df..fe11cb4e
--- a/Mozu.Api.Test/Factories/PaymentSettingsFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Settings/Checkout/PaymentSettingsFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Settings.Checkout
 {
 	/// <summary>
 	/// Use the Payment Settings resource to specify settings when creating payments for order checkout on the site.
@@ -30,7 +31,7 @@ public partial class PaymentSettingsFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves the schema and definition along with the actual instance values of the third-party payment service workflow configured for the corresponding fully qualified name.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = PaymentSettingsFactory.GetThirdPartyPaymentWorkflowWithValues(handler : handler,  fullyQualifiedName :  fullyQualifiedName,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.SiteSettings.Order.ExternalPaymentWorkflowDefin
 				 fullyQualifiedName :  fullyQualifiedName,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.SiteSettings.Order.ExternalPaymentWorkflowDefin
 		}
   
 		/// <summary> 
-		/// Retrieves the schema and definition of all third-party payment service workflows configured for the site.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = PaymentSettingsFactory.GetThirdPartyPaymentWorkflows(handler : handler,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.SiteSettings.Order.ExternalPaymentWorkflowDefin
 						);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.SiteSettings.Order.ExternalPaymentWorkflowDefin
 		}
   
 		/// <summary> 
-		/// Adds a third-party payment workflow to the site. A third-party payment workflow is a definition of a process by which a third-party payment provider (such as Amazon Payments or PayPal Express) interacts with the  platform.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = PaymentSettingsFactory.AddThirdPartyPaymentWorkflow(handler : handler,  definition :  definition,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static void AddThirdPartyPaymentWorkflow(ServiceClientMessageHandler hand
 				 definition :  definition		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -143,7 +144,7 @@ public static void AddThirdPartyPaymentWorkflow(ServiceClientMessageHandler hand
 		}
   
 		/// <summary> 
-		/// Deletes a third-party payment workflow. A third-party payment workflow is a definition of a process by which a third-party payment provider (such as Amazon Payments or PayPal Express) interacts with the  platform. 
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = PaymentSettingsFactory.DeleteThirdPartyPaymentWorkflow(handler : handler,  fullyQualifiedName :  fullyQualifiedName,  expectedCode: expectedCode, successCode: successCode); 
@@ -164,7 +165,7 @@ public static void DeleteThirdPartyPaymentWorkflow(ServiceClientMessageHandler h
 				 fullyQualifiedName :  fullyQualifiedName		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/CheckoutSettingsFactory.cs b/Mozu.Api.Test/Factories/Commerce/Settings/CheckoutSettingsFactory.cs
old mode 100644
new mode 100755
similarity index 86%
rename from Mozu.Api.Test/Factories/CheckoutSettingsFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Settings/CheckoutSettingsFactory.cs
index 7daedf35..66f03619
--- a/Mozu.Api.Test/Factories/CheckoutSettingsFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Settings/CheckoutSettingsFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Settings
 {
 	/// <summary>
 	/// Use the Checkout Settings resource to specify the site-wide settings that define checkout and order processing behavior. This resource includes subresources for payment settings, customer checkout settings, and order processing settings.
@@ -30,7 +31,7 @@ public partial class CheckoutSettingsFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves all checkout settings defined for the site including payment settings (payment gateway ID and credentials), shopper checkout settings (login requirement or guest mode and custom attributes), and order processing settings (when payment is authorized and captured plus any custom attributes).
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CheckoutSettingsFactory.GetCheckoutSettings(handler : handler,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.SiteSettings.Order.CheckoutSettings GetCheckout
 				 responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/CustomRouteSettingsFactory.cs b/Mozu.Api.Test/Factories/Commerce/Settings/General/CustomRouteSettingsFactory.cs
old mode 100644
new mode 100755
similarity index 86%
rename from Mozu.Api.Test/Factories/CustomRouteSettingsFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Settings/General/CustomRouteSettingsFactory.cs
index ca9c0ade..c7d1c74d
--- a/Mozu.Api.Test/Factories/CustomRouteSettingsFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Settings/General/CustomRouteSettingsFactory.cs
@@ -18,19 +18,20 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Settings.General
 {
 	/// <summary>
-	/// Use the Custom Routes resource to manage your custom route settings. Custom routing allows you to display SEO-friendly URLs on your site that map behind-the-scenes to conventional  resources such as a product page or a search results page. With custom routing, you gain advanced control over the URL structures on your site and can more visibly highlight the products or categories your shoppers are interested in purchasing.To learn more about custom routing, refer to the [Custom Route Settings](../../../guides/settings/custom-routes.htm) topic.
+	/// 
 	/// </summary>
 	public partial class CustomRouteSettingsFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves the custom route settings configured for a site. These are the same settings configured through  in the Custom Routing JSON Editor.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CustomRouteSettingsFactory.GetCustomRouteSettings(handler : handler,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.SiteSettings.General.General.Routing.CustomRout
 				 responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.SiteSettings.General.General.Routing.CustomRout
 		}
   
 		/// <summary> 
-		/// Create new custom route settings.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CustomRouteSettingsFactory.CreateCustomRouteSettings(handler : handler,  settings :  settings,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.SiteSettings.General.General.Routing.CustomRout
 				 settings :  settings,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.SiteSettings.General.General.Routing.CustomRout
 		}
   
 		/// <summary> 
-		/// Updates custom route settings.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CustomRouteSettingsFactory.UpdateCustomRouteSettings(handler : handler,  settings :  settings,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.SiteSettings.General.General.Routing.CustomRout
 				 settings :  settings,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.SiteSettings.General.General.Routing.CustomRout
 		}
   
 		/// <summary> 
-		/// Deletes all the custom route settings for a site, returning all routes to their  defaults.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CustomRouteSettingsFactory.DeleteCustomRouteSettings(handler : handler,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static void DeleteCustomRouteSettings(ServiceClientMessageHandler handler
 						);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/TaxableTerritoryFactory.cs b/Mozu.Api.Test/Factories/Commerce/Settings/General/TaxableTerritoryFactory.cs
old mode 100644
new mode 100755
similarity index 93%
rename from Mozu.Api.Test/Factories/TaxableTerritoryFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Settings/General/TaxableTerritoryFactory.cs
index 9d84bb77..28edd620
--- a/Mozu.Api.Test/Factories/TaxableTerritoryFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Settings/General/TaxableTerritoryFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Settings.General
 {
 	/// <summary>
 	/// Use the taxable territories subresource to manage the regional territories for this site that are subejct to sales tax.
@@ -30,7 +31,7 @@ public partial class TaxableTerritoryFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a list of the taxable territories configured for the site.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = TaxableTerritoryFactory.GetTaxableTerritories(handler : handler,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public partial class TaxableTerritoryFactory : BaseDataFactory
 						);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public partial class TaxableTerritoryFactory : BaseDataFactory
 		}
   
 		/// <summary> 
-		/// Creates a new territory for which to calculate sales tax.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = TaxableTerritoryFactory.AddTaxableTerritory(handler : handler,  taxableTerritory :  taxableTerritory,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.SiteSettings.General.TaxableTerritory AddTaxabl
 				 taxableTerritory :  taxableTerritory,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.SiteSettings.General.TaxableTerritory AddTaxabl
 		}
   
 		/// <summary> 
-		/// Updates one or more taxable territories configured for a site.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = TaxableTerritoryFactory.UpdateTaxableTerritories(handler : handler,  taxableterritories :  taxableterritories,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.SiteSettings.General.TaxableTerritory AddTaxabl
 				 taxableterritories :  taxableterritories		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/GeneralSettingsFactory.cs b/Mozu.Api.Test/Factories/Commerce/Settings/GeneralSettingsFactory.cs
old mode 100644
new mode 100755
similarity index 93%
rename from Mozu.Api.Test/Factories/GeneralSettingsFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Settings/GeneralSettingsFactory.cs
index a2175d18..57da10d1
--- a/Mozu.Api.Test/Factories/GeneralSettingsFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Settings/GeneralSettingsFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Settings
 {
 	/// <summary>
 	/// Define global site settings such as the site name, shipping and email addresses, and logo images. Block undesirable IP addresses using this resource.
@@ -30,7 +31,7 @@ public partial class GeneralSettingsFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieve a site's general global settings.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = GeneralSettingsFactory.GetGeneralSettings(handler : handler,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.SiteSettings.General.GeneralSettings GetGeneral
 				 responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.SiteSettings.General.GeneralSettings GetGeneral
 		}
   
 		/// <summary> 
-		/// Updates a site's general global settings.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = GeneralSettingsFactory.UpdateGeneralSettings(handler : handler,  generalSettings :  generalSettings,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.SiteSettings.General.GeneralSettings UpdateGene
 				 generalSettings :  generalSettings,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/LocationUsageFactory.cs b/Mozu.Api.Test/Factories/Commerce/Settings/LocationUsageFactory.cs
old mode 100644
new mode 100755
similarity index 92%
rename from Mozu.Api.Test/Factories/LocationUsageFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Settings/LocationUsageFactory.cs
index de927760..136a78cb
--- a/Mozu.Api.Test/Factories/LocationUsageFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Settings/LocationUsageFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Settings
 {
 	/// <summary>
 	/// Use the Location Usages resource to define the locations and location types that interact with the specified site. The system creates three default location usage types for each site after provisioning a new tenant - one for direct ship (DS), one for in-store pickup (SP), and one for store finder (storeFinder). Each site can only use a single location for the direct ship location usage type, and the location must support the direct ship fulfillment type (DS). For the in-store pickup location usage type, each site can use one or more location types. The location service identifies all locations of the specified type that support the in-store pickup fulfillment type (SP). For the store finder location usage type, each site can use one or more location types. The location service identifies all locations of the type. Locations configured for the store finder type do not typically maintain inventory. You cannot create additional location usage types at this time.
@@ -30,7 +31,7 @@ public partial class LocationUsageFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves the configured site location usages for the location usage code specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = LocationUsageFactory.GetLocationUsages(handler : handler,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.Location.LocationUsageCollection GetLocationUsa
 				 responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.Location.LocationUsageCollection GetLocationUsa
 		}
   
 		/// <summary> 
-		/// Retrieves the location usages for the site specified in the request header.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = LocationUsageFactory.GetLocationUsage(handler : handler,  code :  code,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.Location.LocationUsage GetLocationUsage(Service
 				 code :  code,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.Location.LocationUsage GetLocationUsage(Service
 		}
   
 		/// <summary> 
-		/// Updates the location usage for the site based on the location usage code specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = LocationUsageFactory.UpdateLocationUsage(handler : handler,  usage :  usage,  code :  code,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.Location.LocationUsage UpdateLocationUsage(Serv
 				 usage :  usage,  code :  code,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/SiteShippingHandlingFeeFactory.cs b/Mozu.Api.Test/Factories/Commerce/Settings/Shipping/SiteShippingHandlingFeeFactory.cs
old mode 100644
new mode 100755
similarity index 93%
rename from Mozu.Api.Test/Factories/SiteShippingHandlingFeeFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Settings/Shipping/SiteShippingHandlingFeeFactory.cs
index 647f1d54..233dd090
--- a/Mozu.Api.Test/Factories/SiteShippingHandlingFeeFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Settings/Shipping/SiteShippingHandlingFeeFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Settings.Shipping
 {
 	/// <summary>
 	/// Use the Order Handling Fee subresource to configure any shipping and handling fees to apply to orders for this site.
@@ -30,7 +31,7 @@ public partial class SiteShippingHandlingFeeFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves the details of the order handling fee configured for the site.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = SiteShippingHandlingFeeFactory.GetOrderHandlingFee(handler : handler,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.SiteSettings.Shipping.SiteShippingHandlingFee G
 				 responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.SiteSettings.Shipping.SiteShippingHandlingFee G
 		}
   
 		/// <summary> 
-		/// Creates a new order handling fee for the site.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = SiteShippingHandlingFeeFactory.CreateOrderHandlingFee(handler : handler,  orderHandlingFee :  orderHandlingFee,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.SiteSettings.Shipping.SiteShippingHandlingFee C
 				 orderHandlingFee :  orderHandlingFee,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.SiteSettings.Shipping.SiteShippingHandlingFee C
 		}
   
 		/// <summary> 
-		/// Updates the order handling fee amount for the site.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = SiteShippingHandlingFeeFactory.UpdateOrderHandlingFee(handler : handler,  orderHandlingFee :  orderHandlingFee,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.SiteSettings.Shipping.SiteShippingHandlingFee U
 				 orderHandlingFee :  orderHandlingFee,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/SiteShippingSettingsFactory.cs b/Mozu.Api.Test/Factories/Commerce/Settings/SiteShippingSettingsFactory.cs
old mode 100644
new mode 100755
similarity index 93%
rename from Mozu.Api.Test/Factories/SiteShippingSettingsFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Settings/SiteShippingSettingsFactory.cs
index 6a1a7df9..081357b6
--- a/Mozu.Api.Test/Factories/SiteShippingSettingsFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Settings/SiteShippingSettingsFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Settings
 {
 	/// <summary>
 	/// Use the shipping subresource to manage settings for the site shipping information, such as origin address information, carrier shipping methods, shipping rate providers, and regions available for shipping.
@@ -30,7 +31,7 @@ public partial class SiteShippingSettingsFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a list of the shipping settings configured for a site.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = SiteShippingSettingsFactory.GetSiteShippingSettings(handler : handler,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.SiteSettings.Shipping.SiteShippingSettings GetS
 				 responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/CarrierConfigurationFactory.cs b/Mozu.Api.Test/Factories/Commerce/Shipping/Admin/CarrierConfigurationFactory.cs
old mode 100644
new mode 100755
similarity index 92%
rename from Mozu.Api.Test/Factories/CarrierConfigurationFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Shipping/Admin/CarrierConfigurationFactory.cs
index bae26316..895a6a11
--- a/Mozu.Api.Test/Factories/CarrierConfigurationFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Shipping/Admin/CarrierConfigurationFactory.cs
@@ -18,19 +18,20 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Shipping.Admin
 {
 	/// <summary>
-	/// Use the Carriers resource to configure and manage your supported shipping carrier configurations.
+	/// 
 	/// </summary>
 	public partial class CarrierConfigurationFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a list of carrier configurations and their details according to any specified facets, filter criteria, and sort options.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CarrierConfigurationFactory.GetConfigurations(handler : handler,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.ShippingAdmin.CarrierConfigurationCollection Ge
 				 startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.ShippingAdmin.CarrierConfigurationCollection Ge
 		}
   
 		/// <summary> 
-		/// Retrieves the details of the specified carrier configuration.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CarrierConfigurationFactory.GetConfiguration(handler : handler,  carrierId :  carrierId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.ShippingAdmin.CarrierConfiguration GetConfigura
 				 carrierId :  carrierId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.ShippingAdmin.CarrierConfiguration GetConfigura
 		}
   
 		/// <summary> 
-		/// Creates a new carrier configuration.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CarrierConfigurationFactory.CreateConfiguration(handler : handler,  carrierConfiguration :  carrierConfiguration,  carrierId :  carrierId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.ShippingAdmin.CarrierConfiguration CreateConfig
 				 carrierConfiguration :  carrierConfiguration,  carrierId :  carrierId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.ShippingAdmin.CarrierConfiguration CreateConfig
 		}
   
 		/// <summary> 
-		/// Updates the details of the specified carrier configuration.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CarrierConfigurationFactory.UpdateConfiguration(handler : handler,  carrierConfiguration :  carrierConfiguration,  carrierId :  carrierId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static Mozu.Api.Contracts.ShippingAdmin.CarrierConfiguration UpdateConfig
 				 carrierConfiguration :  carrierConfiguration,  carrierId :  carrierId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -182,7 +183,7 @@ public static Mozu.Api.Contracts.ShippingAdmin.CarrierConfiguration UpdateConfig
 		}
   
 		/// <summary> 
-		/// Deletes the specified carrier configuration.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CarrierConfigurationFactory.DeleteConfiguration(handler : handler,  carrierId :  carrierId,  expectedCode: expectedCode, successCode: successCode); 
@@ -203,7 +204,7 @@ public static void DeleteConfiguration(ServiceClientMessageHandler handler,
 				 carrierId :  carrierId		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/Commerce/Shipping/Admin/Profiles/OrderHandlingFeeRulesFactory.cs b/Mozu.Api.Test/Factories/Commerce/Shipping/Admin/Profiles/OrderHandlingFeeRulesFactory.cs
new file mode 100755
index 00000000..d6c27477
--- /dev/null
+++ b/Mozu.Api.Test/Factories/Commerce/Shipping/Admin/Profiles/OrderHandlingFeeRulesFactory.cs
@@ -0,0 +1,227 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+#region Usings Setup
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Net;
+using Mozu.Api;
+using Mozu.Api.Security;
+using Mozu.Api.Test.Helpers;
+using System.Diagnostics;
+using Newtonsoft.Json.Linq;
+using System.Threading;
+
+#endregion
+
+namespace Mozu.Api.Test.Factories.Commerce.Shipping.Admin.Profiles
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	public partial class OrderHandlingFeeRulesFactory : BaseDataFactory
+	{
+
+		/// <summary> 
+		/// 
+		/// <example> 
+		///  <code> 
+		/// var result = OrderHandlingFeeRulesFactory.GetOrderHandlingFeeRule(handler : handler,  profilecode :  profilecode,  id :  id,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<HandlingFeeRule/>(result); 
+		/// return optionalCasting;
+		///  </code> 
+		/// </example> 
+		/// </summary>
+		public static Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule GetOrderHandlingFeeRule(ServiceClientMessageHandler handler, 
+ 		 string profilecode, string id, string responseFields = null, 
+		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
+		{
+			SetSdKparameters();
+			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
+			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
+			var apiClient = Mozu.Api.Clients.Commerce.Shipping.Admin.Profiles.OrderHandlingFeeRulesClient.GetOrderHandlingFeeRuleClient(
+				 profilecode :  profilecode,  id :  id,  responseFields :  responseFields		);
+			try
+			{
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
+			}
+			catch (ApiException ex)
+			{
+				// Custom error handling for test cases can be placed here
+				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
+				if (customException != null)
+					throw customException;
+				return null;
+			}
+			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
+					 ? (apiClient.Result()) 
+					 : null;
+
+		}
+  
+		/// <summary> 
+		/// 
+		/// <example> 
+		///  <code> 
+		/// var result = OrderHandlingFeeRulesFactory.GetOrderHandlingFeeRules(handler : handler,  profilecode :  profilecode,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<HandlingFeeRuleCollection/>(result); 
+		/// return optionalCasting;
+		///  </code> 
+		/// </example> 
+		/// </summary>
+		public static Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRuleCollection GetOrderHandlingFeeRules(ServiceClientMessageHandler handler, 
+ 		 string profilecode, string responseFields = null, 
+		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
+		{
+			SetSdKparameters();
+			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
+			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
+			var apiClient = Mozu.Api.Clients.Commerce.Shipping.Admin.Profiles.OrderHandlingFeeRulesClient.GetOrderHandlingFeeRulesClient(
+				 profilecode :  profilecode,  responseFields :  responseFields		);
+			try
+			{
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
+			}
+			catch (ApiException ex)
+			{
+				// Custom error handling for test cases can be placed here
+				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
+				if (customException != null)
+					throw customException;
+				return null;
+			}
+			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
+					 ? (apiClient.Result()) 
+					 : null;
+
+		}
+  
+		/// <summary> 
+		/// 
+		/// <example> 
+		///  <code> 
+		/// var result = OrderHandlingFeeRulesFactory.CreateOrderHandlingFeeRule(handler : handler,  rule :  rule,  profilecode :  profilecode,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<HandlingFeeRule/>(result); 
+		/// return optionalCasting;
+		///  </code> 
+		/// </example> 
+		/// </summary>
+		public static Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule CreateOrderHandlingFeeRule(ServiceClientMessageHandler handler, 
+ 		 Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule rule, string profilecode, string responseFields = null, 
+		 HttpStatusCode expectedCode = HttpStatusCode.Created, HttpStatusCode successCode = HttpStatusCode.Created)
+		{
+			SetSdKparameters();
+			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
+			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
+			var apiClient = Mozu.Api.Clients.Commerce.Shipping.Admin.Profiles.OrderHandlingFeeRulesClient.CreateOrderHandlingFeeRuleClient(
+				 rule :  rule,  profilecode :  profilecode,  responseFields :  responseFields		);
+			try
+			{
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
+			}
+			catch (ApiException ex)
+			{
+				// Custom error handling for test cases can be placed here
+				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
+				if (customException != null)
+					throw customException;
+				return null;
+			}
+			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
+					 ? (apiClient.Result()) 
+					 : null;
+
+		}
+  
+		/// <summary> 
+		/// 
+		/// <example> 
+		///  <code> 
+		/// var result = OrderHandlingFeeRulesFactory.UpdateOrderHandlingFeeRule(handler : handler,  rule :  rule,  profilecode :  profilecode,  id :  id,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<HandlingFeeRule/>(result); 
+		/// return optionalCasting;
+		///  </code> 
+		/// </example> 
+		/// </summary>
+		public static Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule UpdateOrderHandlingFeeRule(ServiceClientMessageHandler handler, 
+ 		 Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule rule, string profilecode, string id, string responseFields = null, 
+		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
+		{
+			SetSdKparameters();
+			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
+			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
+			var apiClient = Mozu.Api.Clients.Commerce.Shipping.Admin.Profiles.OrderHandlingFeeRulesClient.UpdateOrderHandlingFeeRuleClient(
+				 rule :  rule,  profilecode :  profilecode,  id :  id,  responseFields :  responseFields		);
+			try
+			{
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
+			}
+			catch (ApiException ex)
+			{
+				// Custom error handling for test cases can be placed here
+				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
+				if (customException != null)
+					throw customException;
+				return null;
+			}
+			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
+					 ? (apiClient.Result()) 
+					 : null;
+
+		}
+  
+		/// <summary> 
+		/// 
+		/// <example> 
+		///  <code> 
+		/// var result = OrderHandlingFeeRulesFactory.DeleteOrderHandlingFeeRule(handler : handler,  profilecode :  profilecode,  id :  id,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<void/>(result); 
+		/// return optionalCasting;
+		///  </code> 
+		/// </example> 
+		/// </summary>
+		public static void DeleteOrderHandlingFeeRule(ServiceClientMessageHandler handler, 
+ 		string profilecode, string id, 
+		 HttpStatusCode expectedCode = HttpStatusCode.NoContent, HttpStatusCode successCode = HttpStatusCode.NoContent)
+		{
+			SetSdKparameters();
+			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
+			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
+			var apiClient = Mozu.Api.Clients.Commerce.Shipping.Admin.Profiles.OrderHandlingFeeRulesClient.DeleteOrderHandlingFeeRuleClient(
+				 profilecode :  profilecode,  id :  id		);
+			try
+			{
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
+			}
+			catch (ApiException ex)
+			{
+				// Custom error handling for test cases can be placed here
+				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
+				if (customException != null)
+					throw customException;
+			}
+			var noResponse = ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
+					 ? (apiClient.Result()) 
+					 : null;
+
+		}
+  
+
+	}
+
+}
+
+
diff --git a/Mozu.Api.Test/Factories/HandlingFeeRuleFactory.cs b/Mozu.Api.Test/Factories/Commerce/Shipping/Admin/Profiles/ProductHandlingFeeRulesFactory.cs
old mode 100644
new mode 100755
similarity index 77%
rename from Mozu.Api.Test/Factories/HandlingFeeRuleFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Shipping/Admin/Profiles/ProductHandlingFeeRulesFactory.cs
index d7217320..015f3ee9
--- a/Mozu.Api.Test/Factories/HandlingFeeRuleFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Shipping/Admin/Profiles/ProductHandlingFeeRulesFactory.cs
@@ -18,22 +18,23 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Shipping.Admin.Profiles
 {
 	/// <summary>
-	/// Use the ProductHandlingFeeRules sub-resource to manage your product handling fee rules that are associated with a specific shipping profile.
+	/// 
 	/// </summary>
-	public partial class HandlingFeeRuleFactory : BaseDataFactory
+	public partial class ProductHandlingFeeRulesFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves the details of the specified product handling fee rule.
+		/// 
 		/// <example> 
 		///  <code> 
-		/// var result = HandlingFeeRuleFactory.GetProductHandlingFeeRule(handler : handler,  profilecode :  profilecode,  id :  id,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
+		/// var result = ProductHandlingFeeRulesFactory.GetProductHandlingFeeRule(handler : handler,  profilecode :  profilecode,  id :  id,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
 		/// var optionalCasting = ConvertClass<HandlingFeeRule/>(result); 
 		/// return optionalCasting;
 		///  </code> 
@@ -47,11 +48,11 @@ public static Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule GetProduc
 			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
 			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
 			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Commerce.Shipping.Admin.Profiles.HandlingFeeRuleClient.GetProductHandlingFeeRuleClient(
+			var apiClient = Mozu.Api.Clients.Commerce.Shipping.Admin.Profiles.ProductHandlingFeeRulesClient.GetProductHandlingFeeRuleClient(
 				 profilecode :  profilecode,  id :  id,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,10 +69,10 @@ public static Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule GetProduc
 		}
   
 		/// <summary> 
-		/// Retrieves a list of product handling fee rules and their details.
+		/// 
 		/// <example> 
 		///  <code> 
-		/// var result = HandlingFeeRuleFactory.GetProductHandlingFeeRules(handler : handler,  profilecode :  profilecode,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
+		/// var result = ProductHandlingFeeRulesFactory.GetProductHandlingFeeRules(handler : handler,  profilecode :  profilecode,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
 		/// var optionalCasting = ConvertClass<HandlingFeeRuleCollection/>(result); 
 		/// return optionalCasting;
 		///  </code> 
@@ -85,11 +86,11 @@ public static Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRuleCollection
 			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
 			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
 			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Commerce.Shipping.Admin.Profiles.HandlingFeeRuleClient.GetProductHandlingFeeRulesClient(
+			var apiClient = Mozu.Api.Clients.Commerce.Shipping.Admin.Profiles.ProductHandlingFeeRulesClient.GetProductHandlingFeeRulesClient(
 				 profilecode :  profilecode,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,10 +107,10 @@ public static Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRuleCollection
 		}
   
 		/// <summary> 
-		/// Creates a new product handling fee rule.
+		/// 
 		/// <example> 
 		///  <code> 
-		/// var result = HandlingFeeRuleFactory.CreateProductHandlingFeeRule(handler : handler,  rule :  rule,  profilecode :  profilecode,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var result = ProductHandlingFeeRulesFactory.CreateProductHandlingFeeRule(handler : handler,  rule :  rule,  profilecode :  profilecode,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
 		/// var optionalCasting = ConvertClass<HandlingFeeRule/>(result); 
 		/// return optionalCasting;
 		///  </code> 
@@ -123,11 +124,11 @@ public static Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule CreatePro
 			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
 			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
 			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Commerce.Shipping.Admin.Profiles.HandlingFeeRuleClient.CreateProductHandlingFeeRuleClient(
+			var apiClient = Mozu.Api.Clients.Commerce.Shipping.Admin.Profiles.ProductHandlingFeeRulesClient.CreateProductHandlingFeeRuleClient(
 				 rule :  rule,  profilecode :  profilecode,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,10 +145,10 @@ public static Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule CreatePro
 		}
   
 		/// <summary> 
-		/// Updates the details of the specified product handling fee rule.
+		/// 
 		/// <example> 
 		///  <code> 
-		/// var result = HandlingFeeRuleFactory.UpdateProductHandlingFeeRule(handler : handler,  rule :  rule,  profilecode :  profilecode,  id :  id,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
+		/// var result = ProductHandlingFeeRulesFactory.UpdateProductHandlingFeeRule(handler : handler,  rule :  rule,  profilecode :  profilecode,  id :  id,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
 		/// var optionalCasting = ConvertClass<HandlingFeeRule/>(result); 
 		/// return optionalCasting;
 		///  </code> 
@@ -161,11 +162,11 @@ public static Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule UpdatePro
 			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
 			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
 			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Commerce.Shipping.Admin.Profiles.HandlingFeeRuleClient.UpdateProductHandlingFeeRuleClient(
+			var apiClient = Mozu.Api.Clients.Commerce.Shipping.Admin.Profiles.ProductHandlingFeeRulesClient.UpdateProductHandlingFeeRuleClient(
 				 rule :  rule,  profilecode :  profilecode,  id :  id,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -182,10 +183,10 @@ public static Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule UpdatePro
 		}
   
 		/// <summary> 
-		/// Deletes the specified product handling fee rule.
+		/// 
 		/// <example> 
 		///  <code> 
-		/// var result = HandlingFeeRuleFactory.DeleteProductHandlingFeeRule(handler : handler,  profilecode :  profilecode,  id :  id,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
+		/// var result = ProductHandlingFeeRulesFactory.DeleteProductHandlingFeeRule(handler : handler,  profilecode :  profilecode,  id :  id,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
 		/// var optionalCasting = ConvertClass<void/>(result); 
 		/// return optionalCasting;
 		///  </code> 
@@ -199,11 +200,11 @@ public static void DeleteProductHandlingFeeRule(ServiceClientMessageHandler hand
 			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
 			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
 			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Commerce.Shipping.Admin.Profiles.HandlingFeeRuleClient.DeleteProductHandlingFeeRuleClient(
+			var apiClient = Mozu.Api.Clients.Commerce.Shipping.Admin.Profiles.ProductHandlingFeeRulesClient.DeleteProductHandlingFeeRuleClient(
 				 profilecode :  profilecode,  id :  id, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/ShippingInclusionRuleFactory.cs b/Mozu.Api.Test/Factories/Commerce/Shipping/Admin/Profiles/ShippingInclusionRuleFactory.cs
old mode 100644
new mode 100755
similarity index 92%
rename from Mozu.Api.Test/Factories/ShippingInclusionRuleFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Shipping/Admin/Profiles/ShippingInclusionRuleFactory.cs
index 8f852215..32b2f419
--- a/Mozu.Api.Test/Factories/ShippingInclusionRuleFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Shipping/Admin/Profiles/ShippingInclusionRuleFactory.cs
@@ -18,19 +18,20 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Shipping.Admin.Profiles
 {
 	/// <summary>
-	/// Use the ShippingInclusionRules sub-resource to manage your shipping inclusion rules that are associated with a specific shipping profile.
+	/// 
 	/// </summary>
 	public partial class ShippingInclusionRuleFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves the details of the specified shipping inclusion rule.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ShippingInclusionRuleFactory.GetShippingInclusionRule(handler : handler,  profilecode :  profilecode,  id :  id,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingInclusionRule Get
 				 profilecode :  profilecode,  id :  id,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingInclusionRule Get
 		}
   
 		/// <summary> 
-		/// Retrieves a list of shipping inclusion rules and their details.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ShippingInclusionRuleFactory.GetShippingInclusionRules(handler : handler,  profilecode :  profilecode,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingInclusionRuleColl
 				 profilecode :  profilecode,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingInclusionRuleColl
 		}
   
 		/// <summary> 
-		/// Creates a new shipping inclusion rule.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ShippingInclusionRuleFactory.CreateShippingInclusionRule(handler : handler,  rule :  rule,  profilecode :  profilecode,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingInclusionRule Cre
 				 rule :  rule,  profilecode :  profilecode,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingInclusionRule Cre
 		}
   
 		/// <summary> 
-		/// Updates the details of the specified shipping inclusion rule.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ShippingInclusionRuleFactory.UpdateShippingInclusionRule(handler : handler,  rule :  rule,  profilecode :  profilecode,  id :  id,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingInclusionRule Upd
 				 rule :  rule,  profilecode :  profilecode,  id :  id,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -182,7 +183,7 @@ public static Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingInclusionRule Upd
 		}
   
 		/// <summary> 
-		/// Deletes the specified shipping inclusion rule.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ShippingInclusionRuleFactory.DeleteShippingInclusionRule(handler : handler,  profilecode :  profilecode,  id :  id,  expectedCode: expectedCode, successCode: successCode); 
@@ -203,7 +204,7 @@ public static void DeleteShippingInclusionRule(ServiceClientMessageHandler handl
 				 profilecode :  profilecode,  id :  id		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/ShippingStatesFactory.cs b/Mozu.Api.Test/Factories/Commerce/Shipping/Admin/Profiles/ShippingStatesFactory.cs
old mode 100644
new mode 100755
similarity index 87%
rename from Mozu.Api.Test/Factories/ShippingStatesFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Shipping/Admin/Profiles/ShippingStatesFactory.cs
index 9fa42598..2625e5c8
--- a/Mozu.Api.Test/Factories/ShippingStatesFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Shipping/Admin/Profiles/ShippingStatesFactory.cs
@@ -18,19 +18,20 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Shipping.Admin.Profiles
 {
 	/// <summary>
-	/// Use the ShippingStates sub-resource to manage the states your shipping profile supports. For example, you can specify one of your shipping profiles to only support Texas, Oklahoma, Arkansas, Louisiana, and New Mexico.Each shipping state is composed of a user-definied code and name.
+	/// 
 	/// </summary>
 	public partial class ShippingStatesFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a list of shipping states and their details.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ShippingStatesFactory.GetStates(handler : handler,  profileCode :  profileCode,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public partial class ShippingStatesFactory : BaseDataFactory
 				 profileCode :  profileCode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public partial class ShippingStatesFactory : BaseDataFactory
 		}
   
 		/// <summary> 
-		/// Updates the details of the shipping states.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ShippingStatesFactory.UpdateStates(handler : handler,  states :  states,  profilecode :  profilecode,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public partial class ShippingStatesFactory : BaseDataFactory
 				 states :  states,  profilecode :  profilecode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/ShippingProfileFactory.cs b/Mozu.Api.Test/Factories/Commerce/Shipping/Admin/ShippingProfileFactory.cs
old mode 100644
new mode 100755
similarity index 91%
rename from Mozu.Api.Test/Factories/ShippingProfileFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Shipping/Admin/ShippingProfileFactory.cs
index b9d143ba..278b1cac
--- a/Mozu.Api.Test/Factories/ShippingProfileFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Shipping/Admin/ShippingProfileFactory.cs
@@ -18,19 +18,20 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Shipping.Admin
 {
 	/// <summary>
-	/// Use the Profiles resource to manage your shipping profiles.
+	/// 
 	/// </summary>
 	public partial class ShippingProfileFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a list of shipping profiles.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ShippingProfileFactory.GetProfiles(handler : handler,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingProfileCollection
 				 responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/TargetRuleFactory.cs b/Mozu.Api.Test/Factories/Commerce/TargetRuleFactory.cs
old mode 100644
new mode 100755
similarity index 91%
rename from Mozu.Api.Test/Factories/TargetRuleFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/TargetRuleFactory.cs
index 5eb84c0e..db00a9f4
--- a/Mozu.Api.Test/Factories/TargetRuleFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/TargetRuleFactory.cs
@@ -18,19 +18,20 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce
 {
 	/// <summary>
-	/// Use the TargetRules resource to manage your target rules for products and zones. For example, you can set specific rules that dictate shipping options for specific products.
+	/// 
 	/// </summary>
 	public partial class TargetRuleFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a list of target rules and their details according to any specified facets, filter criteria, and sort options.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = TargetRuleFactory.GetTargetRules(handler : handler,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.ShippingAdmin.TargetRuleCollection GetTargetRul
 				 startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.ShippingAdmin.TargetRuleCollection GetTargetRul
 		}
   
 		/// <summary> 
-		/// Retrieves the details of the specified target rule.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = TargetRuleFactory.GetTargetRule(handler : handler,  code :  code,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.ShippingAdmin.TargetRule GetTargetRule(ServiceC
 				 code :  code,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.ShippingAdmin.TargetRule GetTargetRule(ServiceC
 		}
   
 		/// <summary> 
-		/// Creates a new target rule.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = TargetRuleFactory.CreateTargetRule(handler : handler,  targetRule :  targetRule,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.ShippingAdmin.TargetRule CreateTargetRule(Servi
 				 targetRule :  targetRule,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.ShippingAdmin.TargetRule CreateTargetRule(Servi
 		}
   
 		/// <summary> 
-		/// Validates the details of a target rule.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = TargetRuleFactory.ValidateTargetRule(handler : handler,  targetRule :  targetRule,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static void ValidateTargetRule(ServiceClientMessageHandler handler,
 				 targetRule :  targetRule		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -181,7 +182,7 @@ public static void ValidateTargetRule(ServiceClientMessageHandler handler,
 		}
   
 		/// <summary> 
-		/// Updates the details of the specified target rule.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = TargetRuleFactory.UpdateTargetRule(handler : handler,  targetRule :  targetRule,  code :  code,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -202,7 +203,7 @@ public static Mozu.Api.Contracts.ShippingAdmin.TargetRule UpdateTargetRule(Servi
 				 targetRule :  targetRule,  code :  code,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -219,7 +220,7 @@ public static Mozu.Api.Contracts.ShippingAdmin.TargetRule UpdateTargetRule(Servi
 		}
   
 		/// <summary> 
-		/// Deletes the specified target rule.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = TargetRuleFactory.DeleteTargetRule(handler : handler,  code :  code,  expectedCode: expectedCode, successCode: successCode); 
@@ -240,7 +241,7 @@ public static void DeleteTargetRule(ServiceClientMessageHandler handler,
 				 code :  code		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/WishlistFactory.cs b/Mozu.Api.Test/Factories/Commerce/WishlistFactory.cs
old mode 100644
new mode 100755
similarity index 91%
rename from Mozu.Api.Test/Factories/WishlistFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/WishlistFactory.cs
index 84b42230..e753619b
--- a/Mozu.Api.Test/Factories/WishlistFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/WishlistFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce
 {
 	/// <summary>
 	/// Use the Wish Lists resource to manage the shopper wish lists of products associated with a customer account. Although customer accounts are managed at the tenant level, the system stores shopper wish lists at the site level. This enables the same customer to have wish lists for each of a merchant's sites. Use the Wish List Items resource to manage items in a wish list.
@@ -30,7 +31,7 @@ public partial class WishlistFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a list of shopper wish lists according to any filter and sort criteria.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = WishlistFactory.GetWishlists(handler : handler,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  q :  q,  qLimit :  qLimit,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistCollection Ge
 				 startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  q :  q,  qLimit :  qLimit,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistCollection Ge
 		}
   
 		/// <summary> 
-		/// Retrieves the details of the shopper wish list specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = WishlistFactory.GetWishlist(handler : handler,  wishlistId :  wishlistId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist GetWishlist(
 				 wishlistId :  wishlistId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist GetWishlist(
 		}
   
 		/// <summary> 
-		/// Retrieves the details of a wish list by supplying the wish list name.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = WishlistFactory.GetWishlistByName(handler : handler,  customerAccountId :  customerAccountId,  wishlistName :  wishlistName,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist GetWishlistB
 				 customerAccountId :  customerAccountId,  wishlistName :  wishlistName,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist GetWishlistB
 		}
   
 		/// <summary> 
-		/// Creates a new shopper wish list for the associated customer account. Although customer accounts are maintained at the tenant level, the system stores wish lists at the site level. Newly created wish lists do not have any items.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = WishlistFactory.CreateWishlist(handler : handler,  wishlist :  wishlist,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist CreateWishli
 				 wishlist :  wishlist,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -182,7 +183,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist CreateWishli
 		}
   
 		/// <summary> 
-		/// Updates one or more properties of a shopper wish list defined for a customer account.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = WishlistFactory.UpdateWishlist(handler : handler,  wishlist :  wishlist,  wishlistId :  wishlistId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -203,7 +204,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist UpdateWishli
 				 wishlist :  wishlist,  wishlistId :  wishlistId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -220,7 +221,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist UpdateWishli
 		}
   
 		/// <summary> 
-		/// Deletes the shopper wish list specified in the request and all items associated with it.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = WishlistFactory.DeleteWishlist(handler : handler,  wishlistId :  wishlistId,  expectedCode: expectedCode, successCode: successCode); 
@@ -241,7 +242,7 @@ public static void DeleteWishlist(ServiceClientMessageHandler handler,
 				 wishlistId :  wishlistId		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/WishlistItemFactory.cs b/Mozu.Api.Test/Factories/Commerce/Wishlists/WishlistItemFactory.cs
old mode 100644
new mode 100755
similarity index 93%
rename from Mozu.Api.Test/Factories/WishlistItemFactory.cs
rename to Mozu.Api.Test/Factories/Commerce/Wishlists/WishlistItemFactory.cs
index 41eaa09a..13344f8d
--- a/Mozu.Api.Test/Factories/WishlistItemFactory.cs
+++ b/Mozu.Api.Test/Factories/Commerce/Wishlists/WishlistItemFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Commerce.Wishlists
 {
 	/// <summary>
 	/// Use the Wish List Items subresource to manage items in a shopper wish list. The same product can be defined as an item in any number of wish lists for the customer account. Use the Wish Lists resource to manage shopper wish lists.
@@ -30,7 +31,7 @@ public partial class WishlistItemFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves the details of an item in a shopper wish list.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = WishlistItemFactory.GetWishlistItem(handler : handler,  wishlistId :  wishlistId,  wishlistItemId :  wishlistItemId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItem GetWishl
 				 wishlistId :  wishlistId,  wishlistItemId :  wishlistItemId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItem GetWishl
 		}
   
 		/// <summary> 
-		/// Retrieves a list of items in a shopper wish list according to any specified filter and sort criteria.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = WishlistItemFactory.GetWishlistItems(handler : handler,  wishlistId :  wishlistId,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItemCollectio
 				 wishlistId :  wishlistId,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItemCollectio
 		}
   
 		/// <summary> 
-		/// Retrieve a list of items in a customer wish list by supplying the wish list name.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = WishlistItemFactory.GetWishlistItemsByWishlistName(handler : handler,  customerAccountId :  customerAccountId,  wishlistName :  wishlistName,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItemCollectio
 				 customerAccountId :  customerAccountId,  wishlistName :  wishlistName,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItemCollectio
 		}
   
 		/// <summary> 
-		/// Adds a product in a site's catalog as an item in a shopper wish list.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = WishlistItemFactory.AddItemToWishlist(handler : handler,  wishlistItem :  wishlistItem,  wishlistId :  wishlistId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItem AddItemT
 				 wishlistItem :  wishlistItem,  wishlistId :  wishlistId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -182,7 +183,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItem AddItemT
 		}
   
 		/// <summary> 
-		/// Updates the quantity of an item in a shopper wish list.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = WishlistItemFactory.UpdateWishlistItemQuantity(handler : handler,  wishlistId :  wishlistId,  wishlistItemId :  wishlistItemId,  quantity :  quantity,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -203,7 +204,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItem UpdateWi
 				 wishlistId :  wishlistId,  wishlistItemId :  wishlistItemId,  quantity :  quantity,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -220,7 +221,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItem UpdateWi
 		}
   
 		/// <summary> 
-		/// Updates the details of an item in a shopper wish list.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = WishlistItemFactory.UpdateWishlistItem(handler : handler,  wishlistItem :  wishlistItem,  wishlistId :  wishlistId,  wishlistItemId :  wishlistItemId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -241,7 +242,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItem UpdateWi
 				 wishlistItem :  wishlistItem,  wishlistId :  wishlistId,  wishlistItemId :  wishlistItemId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -258,7 +259,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItem UpdateWi
 		}
   
 		/// <summary> 
-		/// Removes all items associated with a shopper wish list.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = WishlistItemFactory.RemoveAllWishlistItems(handler : handler,  wishlistId :  wishlistId,  expectedCode: expectedCode, successCode: successCode); 
@@ -279,7 +280,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist RemoveAllWis
 				 wishlistId :  wishlistId		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -296,7 +297,7 @@ public static Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist RemoveAllWis
 		}
   
 		/// <summary> 
-		/// Removes an item from the wish list specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = WishlistItemFactory.DeleteWishlistItem(handler : handler,  wishlistId :  wishlistId,  wishlistItemId :  wishlistItemId,  expectedCode: expectedCode, successCode: successCode); 
@@ -317,7 +318,7 @@ public static void DeleteWishlistItem(ServiceClientMessageHandler handler,
 				 wishlistId :  wishlistId,  wishlistItemId :  wishlistItemId		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/DocumentDraftSummaryFactory.cs b/Mozu.Api.Test/Factories/Content/DocumentDraftSummaryFactory.cs
old mode 100644
new mode 100755
similarity index 92%
rename from Mozu.Api.Test/Factories/DocumentDraftSummaryFactory.cs
rename to Mozu.Api.Test/Factories/Content/DocumentDraftSummaryFactory.cs
index e1c7670d..9212102e
--- a/Mozu.Api.Test/Factories/DocumentDraftSummaryFactory.cs
+++ b/Mozu.Api.Test/Factories/Content/DocumentDraftSummaryFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Content
 {
 	/// <summary>
 	/// Use the document publishing subresource to manage and publish document drafts in the Content service.
@@ -30,7 +31,7 @@ public partial class DocumentDraftSummaryFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a list of the documents currently in draft state, according to any defined filter and sort criteria.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = DocumentDraftSummaryFactory.ListDocumentDraftSummaries(handler : handler,  pageSize :  pageSize,  startIndex :  startIndex,  documentLists :  documentLists,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.Content.DocumentDraftSummaryPagedCollection Lis
 				 pageSize :  pageSize,  startIndex :  startIndex,  documentLists :  documentLists,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.Content.DocumentDraftSummaryPagedCollection Lis
 		}
   
 		/// <summary> 
-		/// Deletes the drafts of the specified documents. Published documents cannot be deleted.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = DocumentDraftSummaryFactory.DeleteDocumentDrafts(handler : handler,  documentIds :  documentIds,  documentLists :  documentLists,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static void DeleteDocumentDrafts(ServiceClientMessageHandler handler,
 				 documentIds :  documentIds,  documentLists :  documentLists		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -105,7 +106,7 @@ public static void DeleteDocumentDrafts(ServiceClientMessageHandler handler,
 		}
   
 		/// <summary> 
-		/// Publish one or more document drafts to live content on the site.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = DocumentDraftSummaryFactory.PublishDocuments(handler : handler,  documentIds :  documentIds,  documentLists :  documentLists,  expectedCode: expectedCode, successCode: successCode); 
@@ -126,7 +127,7 @@ public static void PublishDocuments(ServiceClientMessageHandler handler,
 				 documentIds :  documentIds,  documentLists :  documentLists		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/DocumentListFactory.cs b/Mozu.Api.Test/Factories/Content/DocumentListFactory.cs
old mode 100644
new mode 100755
similarity index 94%
rename from Mozu.Api.Test/Factories/DocumentListFactory.cs
rename to Mozu.Api.Test/Factories/Content/DocumentListFactory.cs
index 08b113cd..0e88beaf
--- a/Mozu.Api.Test/Factories/DocumentListFactory.cs
+++ b/Mozu.Api.Test/Factories/Content/DocumentListFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Content
 {
 	/// <summary>
 	/// Use the document lists resource to organize your site's documents into a hierarchy. Document lists can contain documents, folders, and complete hierarchies of folders, which contain documents with unique names.
@@ -30,7 +31,7 @@ public partial class DocumentListFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a collection of document lists.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = DocumentListFactory.GetDocumentLists(handler : handler,  pageSize :  pageSize,  startIndex :  startIndex,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.Content.DocumentListCollection GetDocumentLists
 				 pageSize :  pageSize,  startIndex :  startIndex,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.Content.DocumentListCollection GetDocumentLists
 		}
   
 		/// <summary> 
-		/// Retrieve the details of a document list by providing the list name.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = DocumentListFactory.GetDocumentList(handler : handler,  documentListName :  documentListName,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.Content.DocumentList GetDocumentList(ServiceCli
 				 documentListName :  documentListName,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.Content.DocumentList GetDocumentList(ServiceCli
 		}
   
 		/// <summary> 
-		/// Creates a new documentList
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = DocumentListFactory.CreateDocumentList(handler : handler,  list :  list,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.Content.DocumentList CreateDocumentList(Service
 				 list :  list,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.Content.DocumentList CreateDocumentList(Service
 		}
   
 		/// <summary> 
-		/// Updates a `DocumentListName`.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = DocumentListFactory.UpdateDocumentList(handler : handler,  list :  list,  documentListName :  documentListName,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static Mozu.Api.Contracts.Content.DocumentList UpdateDocumentList(Service
 				 list :  list,  documentListName :  documentListName,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -182,7 +183,7 @@ public static Mozu.Api.Contracts.Content.DocumentList UpdateDocumentList(Service
 		}
   
 		/// <summary> 
-		/// Deletes the specified `DocumentListName`.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = DocumentListFactory.DeleteDocumentList(handler : handler,  documentListName :  documentListName,  expectedCode: expectedCode, successCode: successCode); 
@@ -203,7 +204,7 @@ public static void DeleteDocumentList(ServiceClientMessageHandler handler,
 				 documentListName :  documentListName		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/DocumentListTypeFactory.cs b/Mozu.Api.Test/Factories/Content/DocumentListTypeFactory.cs
old mode 100644
new mode 100755
similarity index 92%
rename from Mozu.Api.Test/Factories/DocumentListTypeFactory.cs
rename to Mozu.Api.Test/Factories/Content/DocumentListTypeFactory.cs
index 17221360..569bf158
--- a/Mozu.Api.Test/Factories/DocumentListTypeFactory.cs
+++ b/Mozu.Api.Test/Factories/Content/DocumentListTypeFactory.cs
@@ -18,19 +18,20 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Content
 {
 	/// <summary>
-	/// Use the Document List Types resource to manage the types of document lists in your site's document hierarchy. The type denotes a content type for that list of folders, sub-folders, and documents such as `web_pages`.
+	/// 
 	/// </summary>
 	public partial class DocumentListTypeFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Gets all the available documentListTypes.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = DocumentListTypeFactory.GetDocumentListTypes(handler : handler,  pageSize :  pageSize,  startIndex :  startIndex,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.Content.DocumentListTypeCollection GetDocumentL
 				 pageSize :  pageSize,  startIndex :  startIndex,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.Content.DocumentListTypeCollection GetDocumentL
 		}
   
 		/// <summary> 
-		/// Gets a documentListType.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = DocumentListTypeFactory.GetDocumentListType(handler : handler,  documentListTypeFQN :  documentListTypeFQN,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.Content.DocumentListType GetDocumentListType(Se
 				 documentListTypeFQN :  documentListTypeFQN,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.Content.DocumentListType GetDocumentListType(Se
 		}
   
 		/// <summary> 
-		/// Creates a new documentListType.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = DocumentListTypeFactory.CreateDocumentListType(handler : handler,  list :  list,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.Content.DocumentListType CreateDocumentListType
 				 list :  list,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.Content.DocumentListType CreateDocumentListType
 		}
   
 		/// <summary> 
-		/// Updates a DocumentListType
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = DocumentListTypeFactory.UpdateDocumentListType(handler : handler,  list :  list,  documentListTypeFQN :  documentListTypeFQN,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static Mozu.Api.Contracts.Content.DocumentListType UpdateDocumentListType
 				 list :  list,  documentListTypeFQN :  documentListTypeFQN,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/DocumentTypeFactory.cs b/Mozu.Api.Test/Factories/Content/DocumentTypeFactory.cs
old mode 100644
new mode 100755
similarity index 94%
rename from Mozu.Api.Test/Factories/DocumentTypeFactory.cs
rename to Mozu.Api.Test/Factories/Content/DocumentTypeFactory.cs
index f42ef5e0..ee07e0e0
--- a/Mozu.Api.Test/Factories/DocumentTypeFactory.cs
+++ b/Mozu.Api.Test/Factories/Content/DocumentTypeFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Content
 {
 	/// <summary>
 	/// Use the Document Types resource to view the document types supplied by the Content API.
@@ -30,7 +31,7 @@ public partial class DocumentTypeFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a paged list of the system-defined document types.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = DocumentTypeFactory.GetDocumentTypes(handler : handler,  pageSize :  pageSize,  startIndex :  startIndex,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.Content.DocumentTypeCollection GetDocumentTypes
 				 pageSize :  pageSize,  startIndex :  startIndex,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.Content.DocumentTypeCollection GetDocumentTypes
 		}
   
 		/// <summary> 
-		/// Retrieves a system-defined document type.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = DocumentTypeFactory.GetDocumentType(handler : handler,  documentTypeName :  documentTypeName,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.Content.DocumentType GetDocumentType(ServiceCli
 				 documentTypeName :  documentTypeName,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.Content.DocumentType GetDocumentType(ServiceCli
 		}
   
 		/// <summary> 
-		/// Creates a new DocumentType
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = DocumentTypeFactory.CreateDocumentType(handler : handler,  documentType :  documentType,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.Content.DocumentType CreateDocumentType(Service
 				 documentType :  documentType,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.Content.DocumentType CreateDocumentType(Service
 		}
   
 		/// <summary> 
-		/// Updates a DocumentType
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = DocumentTypeFactory.UpdateDocumentType(handler : handler,  documentType :  documentType,  documentTypeName :  documentTypeName,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static Mozu.Api.Contracts.Content.DocumentType UpdateDocumentType(Service
 				 documentType :  documentType,  documentTypeName :  documentTypeName,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/DocumentFactory.cs b/Mozu.Api.Test/Factories/Content/Documentlists/DocumentFactory.cs
old mode 100644
new mode 100755
similarity index 92%
rename from Mozu.Api.Test/Factories/DocumentFactory.cs
rename to Mozu.Api.Test/Factories/Content/Documentlists/DocumentFactory.cs
index db16f94f..776a547a
--- a/Mozu.Api.Test/Factories/DocumentFactory.cs
+++ b/Mozu.Api.Test/Factories/Content/Documentlists/DocumentFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Content.Documentlists
 {
 	/// <summary>
 	/// Use this subresource to manage documents in a document list.
@@ -30,7 +31,7 @@ public partial class DocumentFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieve the content associated with a document, such as a product image or PDF specifications file, by supplying the document ID.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = DocumentFactory.GetDocumentContent(handler : handler,  documentListName :  documentListName,  documentId :  documentId,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static System.IO.Stream GetDocumentContent(ServiceClientMessageHandler ha
 				 documentListName :  documentListName,  documentId :  documentId, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static System.IO.Stream GetDocumentContent(ServiceClientMessageHandler ha
 		}
   
 		/// <summary> 
-		/// Performs transformations on a document. For example, resizing an image.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = DocumentFactory.TransformDocumentContent(handler : handler,  documentListName :  documentListName,  documentId :  documentId,  width :  width,  height :  height,  max :  max,  maxWidth :  maxWidth,  maxHeight :  maxHeight,  crop :  crop,  quality :  quality,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static System.IO.Stream TransformDocumentContent(ServiceClientMessageHand
 				 documentListName :  documentListName,  documentId :  documentId,  width :  width,  height :  height,  max :  max,  maxWidth :  maxWidth,  maxHeight :  maxHeight,  crop :  crop,  quality :  quality		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static System.IO.Stream TransformDocumentContent(ServiceClientMessageHand
 		}
   
 		/// <summary> 
-		/// Retrieves a document within the specified document list.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = DocumentFactory.GetDocument(handler : handler,  documentListName :  documentListName,  documentId :  documentId,  includeInactive :  includeInactive,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.Content.Document GetDocument(ServiceClientMessa
 				 documentListName :  documentListName,  documentId :  documentId,  includeInactive :  includeInactive,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.Content.Document GetDocument(ServiceClientMessa
 		}
   
 		/// <summary> 
-		/// Retrieves a collection of documents according to any filter and sort criteria.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = DocumentFactory.GetDocuments(handler : handler,  documentListName :  documentListName,  filter :  filter,  sortBy :  sortBy,  pageSize :  pageSize,  startIndex :  startIndex,  includeInactive :  includeInactive,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static Mozu.Api.Contracts.Content.DocumentCollection GetDocuments(Service
 				 documentListName :  documentListName,  filter :  filter,  sortBy :  sortBy,  pageSize :  pageSize,  startIndex :  startIndex,  includeInactive :  includeInactive,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -182,7 +183,7 @@ public static Mozu.Api.Contracts.Content.DocumentCollection GetDocuments(Service
 		}
   
 		/// <summary> 
-		/// Creates a new document in an defined document list.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = DocumentFactory.CreateDocument(handler : handler,  document :  document,  documentListName :  documentListName,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -203,7 +204,7 @@ public static Mozu.Api.Contracts.Content.Document CreateDocument(ServiceClientMe
 				 document :  document,  documentListName :  documentListName,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -220,7 +221,7 @@ public static Mozu.Api.Contracts.Content.Document CreateDocument(ServiceClientMe
 		}
   
 		/// <summary> 
-		/// Updates the binary data or content associated with a document, such as a product image or PDF specifications file, by supplying the document ID.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = DocumentFactory.UpdateDocumentContent(handler : handler,  stream :  stream,  documentListName :  documentListName,  documentId :  documentId,  expectedCode: expectedCode, successCode: successCode); 
@@ -241,7 +242,7 @@ public static void UpdateDocumentContent(ServiceClientMessageHandler handler,
 				 stream :  stream,  documentListName :  documentListName,  documentId :  documentId		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -257,7 +258,7 @@ public static void UpdateDocumentContent(ServiceClientMessageHandler handler,
 		}
   
 		/// <summary> 
-		/// Updates a document in a document list.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = DocumentFactory.UpdateDocument(handler : handler,  document :  document,  documentListName :  documentListName,  documentId :  documentId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -278,7 +279,7 @@ public static Mozu.Api.Contracts.Content.Document UpdateDocument(ServiceClientMe
 				 document :  document,  documentListName :  documentListName,  documentId :  documentId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -295,7 +296,7 @@ public static Mozu.Api.Contracts.Content.Document UpdateDocument(ServiceClientMe
 		}
   
 		/// <summary> 
-		/// Deletes a specific document based on the specified document ID.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = DocumentFactory.DeleteDocument(handler : handler,  documentListName :  documentListName,  documentId :  documentId,  expectedCode: expectedCode, successCode: successCode); 
@@ -316,7 +317,7 @@ public static void DeleteDocument(ServiceClientMessageHandler handler,
 				 documentListName :  documentListName,  documentId :  documentId		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -332,7 +333,7 @@ public static void DeleteDocument(ServiceClientMessageHandler handler,
 		}
   
 		/// <summary> 
-		/// Deletes the content associated with a document, such as a product image or PDF specification, by supplying the document ID.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = DocumentFactory.DeleteDocumentContent(handler : handler,  documentListName :  documentListName,  documentId :  documentId,  expectedCode: expectedCode, successCode: successCode); 
@@ -353,7 +354,7 @@ public static void DeleteDocumentContent(ServiceClientMessageHandler handler,
 				 documentListName :  documentListName,  documentId :  documentId		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/DocumentTreeFactory.cs b/Mozu.Api.Test/Factories/Content/Documentlists/DocumentTreeFactory.cs
old mode 100644
new mode 100755
similarity index 91%
rename from Mozu.Api.Test/Factories/DocumentTreeFactory.cs
rename to Mozu.Api.Test/Factories/Content/Documentlists/DocumentTreeFactory.cs
index a2e66250..5a927c26
--- a/Mozu.Api.Test/Factories/DocumentTreeFactory.cs
+++ b/Mozu.Api.Test/Factories/Content/Documentlists/DocumentTreeFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Content.Documentlists
 {
 	/// <summary>
 	/// Use the document tree subresource to retrieve documents and manage content within the document hierarchy.
@@ -30,7 +31,7 @@ public partial class DocumentTreeFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieve the content associated with the document, such as a product image or PDF specifications file.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = DocumentTreeFactory.GetTreeDocumentContent(handler : handler,  documentListName :  documentListName,  documentName :  documentName,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static System.IO.Stream GetTreeDocumentContent(ServiceClientMessageHandle
 				 documentListName :  documentListName,  documentName :  documentName, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static System.IO.Stream GetTreeDocumentContent(ServiceClientMessageHandle
 		}
   
 		/// <summary> 
-		/// Performs transformations on a document. For example, resizing an image.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = DocumentTreeFactory.TransformTreeDocumentContent(handler : handler,  documentListName :  documentListName,  documentName :  documentName,  width :  width,  height :  height,  max :  max,  maxWidth :  maxWidth,  maxHeight :  maxHeight,  crop :  crop,  quality :  quality,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static System.IO.Stream TransformTreeDocumentContent(ServiceClientMessage
 				 documentListName :  documentListName,  documentName :  documentName,  width :  width,  height :  height,  max :  max,  maxWidth :  maxWidth,  maxHeight :  maxHeight,  crop :  crop,  quality :  quality		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static System.IO.Stream TransformTreeDocumentContent(ServiceClientMessage
 		}
   
 		/// <summary> 
-		/// Retrieves a document based on its document list and folder path in the document hierarchy.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = DocumentTreeFactory.GetTreeDocument(handler : handler,  documentListName :  documentListName,  documentName :  documentName,  includeInactive :  includeInactive,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.Content.Document GetTreeDocument(ServiceClientM
 				 documentListName :  documentListName,  documentName :  documentName,  includeInactive :  includeInactive,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.Content.Document GetTreeDocument(ServiceClientM
 		}
   
 		/// <summary> 
-		/// Updates the binary data or content associated with a document, such as a product image or PDF specifications file, by supplying the document name.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = DocumentTreeFactory.UpdateTreeDocumentContent(handler : handler,  stream :  stream,  documentListName :  documentListName,  documentName :  documentName,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static void UpdateTreeDocumentContent(ServiceClientMessageHandler handler
 				 stream :  stream,  documentListName :  documentListName,  documentName :  documentName		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -181,7 +182,7 @@ public static void UpdateTreeDocumentContent(ServiceClientMessageHandler handler
 		}
   
 		/// <summary> 
-		/// Deletes the content associated with a document, such as a product image or PDF specifications file.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = DocumentTreeFactory.DeleteTreeDocumentContent(handler : handler,  stream :  stream,  documentListName :  documentListName,  documentName :  documentName,  expectedCode: expectedCode, successCode: successCode); 
@@ -202,7 +203,7 @@ public static void DeleteTreeDocumentContent(ServiceClientMessageHandler handler
 				 stream :  stream,  documentListName :  documentListName,  documentName :  documentName		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/FacetFactory.cs b/Mozu.Api.Test/Factories/Content/Documentlists/FacetFactory.cs
old mode 100644
new mode 100755
similarity index 92%
rename from Mozu.Api.Test/Factories/FacetFactory.cs
rename to Mozu.Api.Test/Factories/Content/Documentlists/FacetFactory.cs
index 7107238e..b7d9f641
--- a/Mozu.Api.Test/Factories/FacetFactory.cs
+++ b/Mozu.Api.Test/Factories/Content/Documentlists/FacetFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Content.Documentlists
 {
 	/// <summary>
 	/// Use the facets subresource to allow a merchant to add information for product indexing and searching.
@@ -30,7 +31,7 @@ public partial class FacetFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves the properties of facets that aid in indexing and searching.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = FacetFactory.GetFacets(handler : handler,  documentListName :  documentListName,  propertyName :  propertyName,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public partial class FacetFactory : BaseDataFactory
 				 documentListName :  documentListName,  propertyName :  propertyName		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/ViewFactory.cs b/Mozu.Api.Test/Factories/Content/Documentlists/ViewFactory.cs
old mode 100644
new mode 100755
similarity index 89%
rename from Mozu.Api.Test/Factories/ViewFactory.cs
rename to Mozu.Api.Test/Factories/Content/Documentlists/ViewFactory.cs
index 843fcebe..dcfa70c5
--- a/Mozu.Api.Test/Factories/ViewFactory.cs
+++ b/Mozu.Api.Test/Factories/Content/Documentlists/ViewFactory.cs
@@ -18,19 +18,20 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Content.Documentlists
 {
 	/// <summary>
-	/// Properties and content for views within a site/tenant. Views provide the schema, formatting, and associated content and entities for displaying content within a site/tenant.
+	/// 
 	/// </summary>
 	public partial class ViewFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a collection of documents associated with a view.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ViewFactory.GetViewDocuments(handler : handler,  documentListName :  documentListName,  viewName :  viewName,  filter :  filter,  sortBy :  sortBy,  pageSize :  pageSize,  startIndex :  startIndex,  includeInactive :  includeInactive,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.Content.DocumentCollection GetViewDocuments(Ser
 				 documentListName :  documentListName,  viewName :  viewName,  filter :  filter,  sortBy :  sortBy,  pageSize :  pageSize,  startIndex :  startIndex,  includeInactive :  includeInactive,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/PropertyTypeFactory.cs b/Mozu.Api.Test/Factories/Content/PropertyTypeFactory.cs
old mode 100644
new mode 100755
similarity index 94%
rename from Mozu.Api.Test/Factories/PropertyTypeFactory.cs
rename to Mozu.Api.Test/Factories/Content/PropertyTypeFactory.cs
index 92bae043..68903b6a
--- a/Mozu.Api.Test/Factories/PropertyTypeFactory.cs
+++ b/Mozu.Api.Test/Factories/Content/PropertyTypeFactory.cs
@@ -18,10 +18,11 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Content
 {
 	/// <summary>
 	/// Use the property types subresource to manage content properties.
@@ -30,7 +31,7 @@ public partial class PropertyTypeFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a list of the content property types.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = PropertyTypeFactory.GetPropertyTypes(handler : handler,  pageSize :  pageSize,  startIndex :  startIndex,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.Content.PropertyTypeCollection GetPropertyTypes
 				 pageSize :  pageSize,  startIndex :  startIndex,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.Content.PropertyTypeCollection GetPropertyTypes
 		}
   
 		/// <summary> 
-		/// Retrieves the details of the content property type.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = PropertyTypeFactory.GetPropertyType(handler : handler,  propertyTypeName :  propertyTypeName,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.Content.PropertyType GetPropertyType(ServiceCli
 				 propertyTypeName :  propertyTypeName,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.Content.PropertyType GetPropertyType(ServiceCli
 		}
   
 		/// <summary> 
-		/// Creates a new
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = PropertyTypeFactory.CreatePropertyType(handler : handler,  propertyType :  propertyType,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.Content.PropertyType CreatePropertyType(Service
 				 propertyType :  propertyType,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.Content.PropertyType CreatePropertyType(Service
 		}
   
 		/// <summary> 
-		/// Updates a
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = PropertyTypeFactory.UpdatePropertyType(handler : handler,  propertyType :  propertyType,  propertyTypeName :  propertyTypeName,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static Mozu.Api.Contracts.Content.PropertyType UpdatePropertyType(Service
 				 propertyType :  propertyType,  propertyTypeName :  propertyTypeName,  responseFields :  responseFields, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -182,7 +183,7 @@ public static Mozu.Api.Contracts.Content.PropertyType UpdatePropertyType(Service
 		}
   
 		/// <summary> 
-		/// Delete a specific
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = PropertyTypeFactory.DeletePropertyType(handler : handler,  propertyTypeName :  propertyTypeName,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
@@ -203,7 +204,7 @@ public static void DeletePropertyType(ServiceClientMessageHandler handler,
 				 propertyTypeName :  propertyTypeName, dataViewMode: dataViewMode		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/PublishSetSummaryFactory.cs b/Mozu.Api.Test/Factories/Content/PublishSetSummaryFactory.cs
old mode 100644
new mode 100755
similarity index 90%
rename from Mozu.Api.Test/Factories/PublishSetSummaryFactory.cs
rename to Mozu.Api.Test/Factories/Content/PublishSetSummaryFactory.cs
index 6705a19b..2590a584
--- a/Mozu.Api.Test/Factories/PublishSetSummaryFactory.cs
+++ b/Mozu.Api.Test/Factories/Content/PublishSetSummaryFactory.cs
@@ -18,19 +18,20 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Content
 {
 	/// <summary>
-	/// Use the Content Publish Set resource to manage content publish sets and the pending content drafts.You can use content publish sets to group pending content changes together and publish them all at the same time.
+	/// 
 	/// </summary>
 	public partial class PublishSetSummaryFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Returns a list of content publish sets.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = PublishSetSummaryFactory.GetPublishSets(handler : handler,  pageSize :  pageSize,  startIndex :  startIndex,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.Content.PublishSetSummaryPagedCollection GetPub
 				 pageSize :  pageSize,  startIndex :  startIndex,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.Content.PublishSetSummaryPagedCollection GetPub
 		}
   
 		/// <summary> 
-		/// Retrieves a list of content publish sets and their properties.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = PublishSetSummaryFactory.GetPublishSetItems(handler : handler,  code :  code,  pageSize :  pageSize,  startIndex :  startIndex,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.Content.DocumentDraftSummaryPagedCollection Get
 				 code :  code,  pageSize :  pageSize,  startIndex :  startIndex,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.Content.DocumentDraftSummaryPagedCollection Get
 		}
   
 		/// <summary> 
-		/// Deletes the specified content publish set. You can use the shouldDiscard parameter to specify whether to discard the content drafts assigned to the content publish set.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = PublishSetSummaryFactory.DeletePublishSet(handler : handler,  code :  code,  shouldDiscard :  shouldDiscard,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static object DeletePublishSet(ServiceClientMessageHandler handler,
 				 code :  code,  shouldDiscard :  shouldDiscard,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static object DeletePublishSet(ServiceClientMessageHandler handler,
 		}
   
 		/// <summary> 
-		/// Adds a set of documents by id to a specified publish set.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = PublishSetSummaryFactory.AddPublishSetItems(handler : handler,  itemsToPublish :  itemsToPublish,  code :  code,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static object AddPublishSetItems(ServiceClientMessageHandler handler,
 				 itemsToPublish :  itemsToPublish,  code :  code,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/CustomerVisitFactory.cs b/Mozu.Api.Test/Factories/CustomerVisitFactory.cs
deleted file mode 100644
index ae647685..00000000
--- a/Mozu.Api.Test/Factories/CustomerVisitFactory.cs
+++ /dev/null
@@ -1,189 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.     
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-#region Usings Setup
-
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Net;
-using Mozu.Api;
-using Mozu.Api.Security;
-using Mozu.Api.Test.Helpers;
-using System.Diagnostics;
-using Newtonsoft.Json.Linq;
-
-#endregion
-
-namespace Mozu.Api.Test.Factories
-{
-	/// <summary>
-	/// Use the Visits resource to manage all visits a customer makes to a tenant's sites and measure the level of transactions a customer performs during a unique visit for customer account analytics. Clients can track customer visits by site (including online and in-person interactions), the transactions a customer performs during the visit, and the device type associated with the visit, if any.
-	/// </summary>
-	public partial class CustomerVisitFactory : BaseDataFactory
-	{
-
-		/// <summary> 
-		/// Retrieves a list of customer visits according to any filter or sort criteria specified in the request.
-		/// <example> 
-		///  <code> 
-		/// var result = CustomerVisitFactory.GetVisits(handler : handler,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<VisitCollection/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.Customer.VisitCollection GetVisits(ServiceClientMessageHandler handler, 
- 		 int? startIndex = null, int? pageSize = null, string sortBy = null, string filter = null, string responseFields = null, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Commerce.Customer.VisitClient.GetVisitsClient(
-				 startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-		/// <summary> 
-		/// Retrieves the details of the customer visit specified in the request.
-		/// <example> 
-		///  <code> 
-		/// var result = CustomerVisitFactory.GetVisit(handler : handler,  visitId :  visitId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<Visit/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.Customer.Visit GetVisit(ServiceClientMessageHandler handler, 
- 		 string visitId, string responseFields = null, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Commerce.Customer.VisitClient.GetVisitClient(
-				 visitId :  visitId,  responseFields :  responseFields		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-		/// <summary> 
-		/// Creates a new visit for the customer account specified in the request.
-		/// <example> 
-		///  <code> 
-		/// var result = CustomerVisitFactory.AddVisit(handler : handler,  visit :  visit,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<Visit/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.Customer.Visit AddVisit(ServiceClientMessageHandler handler, 
- 		 Mozu.Api.Contracts.Customer.Visit visit, string responseFields = null, 
-		 HttpStatusCode expectedCode = HttpStatusCode.Created, HttpStatusCode successCode = HttpStatusCode.Created)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Commerce.Customer.VisitClient.AddVisitClient(
-				 visit :  visit,  responseFields :  responseFields		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-		/// <summary> 
-		/// Updates one or more properties of a defined customer visit.
-		/// <example> 
-		///  <code> 
-		/// var result = CustomerVisitFactory.UpdateVisit(handler : handler,  visit :  visit,  visitId :  visitId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<Visit/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.Customer.Visit UpdateVisit(ServiceClientMessageHandler handler, 
- 		 Mozu.Api.Contracts.Customer.Visit visit, string visitId, string responseFields = null, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Commerce.Customer.VisitClient.UpdateVisitClient(
-				 visit :  visit,  visitId :  visitId,  responseFields :  responseFields		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-
-	}
-
-}
-
-
diff --git a/Mozu.Api.Test/Factories/DocumentPublishSetFactory.cs b/Mozu.Api.Test/Factories/DocumentPublishSetFactory.cs
deleted file mode 100644
index 94ce5017..00000000
--- a/Mozu.Api.Test/Factories/DocumentPublishSetFactory.cs
+++ /dev/null
@@ -1,189 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.     
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-#region Usings Setup
-
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Net;
-using Mozu.Api;
-using Mozu.Api.Security;
-using Mozu.Api.Test.Helpers;
-using System.Diagnostics;
-using Newtonsoft.Json.Linq;
-
-#endregion
-
-namespace Mozu.Api.Test.Factories
-{
-	/// <summary>
-	/// 
-	/// </summary>
-	public partial class DocumentPublishSetFactory : BaseDataFactory
-	{
-
-		/// <summary> 
-		/// 
-		/// <example> 
-		///  <code> 
-		/// var result = DocumentPublishSetFactory.GetPublishSets(handler : handler,  pageSize :  pageSize,  startIndex :  startIndex,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<PublishSetSummaryPagedCollection/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.Content.PublishSetSummaryPagedCollection GetPublishSets(ServiceClientMessageHandler handler, 
- 		 int? pageSize = null, int? startIndex = null, string responseFields = null, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Content.DocumentDraftSummaryClient.GetPublishSetsClient(
-				 pageSize :  pageSize,  startIndex :  startIndex,  responseFields :  responseFields		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-		/// <summary> 
-		/// 
-		/// <example> 
-		///  <code> 
-		/// var result = DocumentPublishSetFactory.GetPublishSetItems(handler : handler,  code :  code,  pageSize :  pageSize,  startIndex :  startIndex,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<DocumentDraftSummaryPagedCollection/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.Content.DocumentDraftSummaryPagedCollection GetPublishSetItems(ServiceClientMessageHandler handler, 
- 		 string code, int? pageSize = null, int? startIndex = null, string responseFields = null, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Content.DocumentDraftSummaryClient.GetPublishSetItemsClient(
-				 code :  code,  pageSize :  pageSize,  startIndex :  startIndex,  responseFields :  responseFields		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-		/// <summary> 
-		/// 
-		/// <example> 
-		///  <code> 
-		/// var result = DocumentPublishSetFactory.DeletePublishSet(handler : handler,  code :  code,  shouldDiscard :  shouldDiscard,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<object/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static object DeletePublishSet(ServiceClientMessageHandler handler, 
- 		 string code, bool? shouldDiscard = null, string responseFields = null, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Content.DocumentDraftSummaryClient.DeletePublishSetClient(
-				 code :  code,  shouldDiscard :  shouldDiscard,  responseFields :  responseFields		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-		/// <summary> 
-		/// 
-		/// <example> 
-		///  <code> 
-		/// var result = DocumentPublishSetFactory.AddPublishSetItems(handler : handler,  documentIds :  documentIds,  code :  code,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<object/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static object AddPublishSetItems(ServiceClientMessageHandler handler, 
- 		 List<string> documentIds, string code, string responseFields = null, 
-		 HttpStatusCode expectedCode = HttpStatusCode.Created, HttpStatusCode successCode = HttpStatusCode.Created)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Content.DocumentDraftSummaryClient.AddPublishSetItemsClient(
-				 documentIds :  documentIds,  code :  code,  responseFields :  responseFields		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-
-	}
-
-}
-
-
diff --git a/Mozu.Api.Test/Factories/DocumentPublishingFactory.cs b/Mozu.Api.Test/Factories/DocumentPublishingFactory.cs
deleted file mode 100644
index 8c070a00..00000000
--- a/Mozu.Api.Test/Factories/DocumentPublishingFactory.cs
+++ /dev/null
@@ -1,149 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.     
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-#region Usings Setup
-
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Net;
-using Mozu.Api;
-using Mozu.Api.Security;
-using Mozu.Api.Test.Helpers;
-using System.Diagnostics;
-using Newtonsoft.Json.Linq;
-
-#endregion
-
-namespace Mozu.Api.Test.Factories
-{
-	/// <summary>
-	/// Use the document publishing subresource to manage and publish document drafts in the Content service.
-	/// </summary>
-	public partial class DocumentPublishingFactory : BaseDataFactory
-	{
-
-		/// <summary> 
-		/// Retrieves a list of the documents currently in draft state, according to any defined filter and sort criteria.
-		/// <example> 
-		///  <code> 
-		/// var result = DocumentPublishingFactory.ListDocumentDraftSummaries(handler : handler,  pageSize :  pageSize,  startIndex :  startIndex,  documentLists :  documentLists,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<DocumentDraftSummaryPagedCollection/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.Content.DocumentDraftSummaryPagedCollection ListDocumentDraftSummaries(ServiceClientMessageHandler handler, 
- 		 int? pageSize = null, int? startIndex = null, string documentLists = null, string responseFields = null, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Content.DocumentPublishingClient.ListDocumentDraftSummariesClient(
-				 pageSize :  pageSize,  startIndex :  startIndex,  documentLists :  documentLists,  responseFields :  responseFields		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-		/// <summary> 
-		/// Deletes the drafts of the specified documents. Published documents cannot be deleted.
-		/// <example> 
-		///  <code> 
-		/// var result = DocumentPublishingFactory.DeleteDocumentDrafts(handler : handler,  documentIds :  documentIds,  documentLists :  documentLists,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<void/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static void DeleteDocumentDrafts(ServiceClientMessageHandler handler, 
- 		List<string> documentIds, string documentLists = null, 
-		 HttpStatusCode expectedCode = HttpStatusCode.NoContent, HttpStatusCode successCode = HttpStatusCode.NoContent)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Content.DocumentPublishingClient.DeleteDocumentDraftsClient(
-				 documentIds :  documentIds,  documentLists :  documentLists		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-			}
-			var noResponse = ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-		/// <summary> 
-		/// Publish one or more document drafts to live content on the site.
-		/// <example> 
-		///  <code> 
-		/// var result = DocumentPublishingFactory.PublishDocuments(handler : handler,  documentIds :  documentIds,  documentLists :  documentLists,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<void/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static void PublishDocuments(ServiceClientMessageHandler handler, 
- 		List<string> documentIds, string documentLists = null, 
-		 HttpStatusCode expectedCode = HttpStatusCode.NoContent, HttpStatusCode successCode = HttpStatusCode.NoContent)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Content.DocumentPublishingClient.PublishDocumentsClient(
-				 documentIds :  documentIds,  documentLists :  documentLists		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-			}
-			var noResponse = ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-
-	}
-
-}
-
-
diff --git a/Mozu.Api.Test/Factories/EventNotificationFactory.cs b/Mozu.Api.Test/Factories/Event/EventNotificationFactory.cs
old mode 100644
new mode 100755
similarity index 87%
rename from Mozu.Api.Test/Factories/EventNotificationFactory.cs
rename to Mozu.Api.Test/Factories/Event/EventNotificationFactory.cs
index 66ae0895..3ba2296a
--- a/Mozu.Api.Test/Factories/EventNotificationFactory.cs
+++ b/Mozu.Api.Test/Factories/Event/EventNotificationFactory.cs
@@ -18,19 +18,20 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Event
 {
 	/// <summary>
-	/// Events are notifications  publishes to the application when a create, read, update, or delete operation is performed. If the application subscribes to the event, you can use the Events resource to query for recent events  published to your application or events that were not published successfully.
+	/// Events are notifications Mozu publishes to the application when a create, read, update, or delete operation is performed. If the application subscribes to the event, you can use the Events resource to query for recent events Mozu published to your application or events that were not published successfully.
 	/// </summary>
 	public partial class EventNotificationFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a list of events.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = EventNotificationFactory.GetEvents(handler : handler,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.Event.EventCollection GetEvents(ServiceClientMe
 				 startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.Event.EventCollection GetEvents(ServiceClientMe
 		}
   
 		/// <summary> 
-		/// Retrieves an event by providing the event ID.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = EventNotificationFactory.GetEvent(handler : handler,  eventId :  eventId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.Event.Event GetEvent(ServiceClientMessageHandle
 				 eventId :  eventId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/SubscriptionFactory.cs b/Mozu.Api.Test/Factories/Event/Push/SubscriptionFactory.cs
old mode 100644
new mode 100755
similarity index 85%
rename from Mozu.Api.Test/Factories/SubscriptionFactory.cs
rename to Mozu.Api.Test/Factories/Event/Push/SubscriptionFactory.cs
index f95be25a..1dc93c84
--- a/Mozu.Api.Test/Factories/SubscriptionFactory.cs
+++ b/Mozu.Api.Test/Factories/Event/Push/SubscriptionFactory.cs
@@ -18,19 +18,20 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Event.Push
 {
 	/// <summary>
-	/// The Subscriptions resource triggers a push service to sent immediate notifications to the subscribed tenants and applications when triggers. The resource sends messages regarding a subscription event tha occurs in the tenant or site.
+	/// 
 	/// </summary>
 	public partial class SubscriptionFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a list of events according to any specified filter criteria and sort options.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = SubscriptionFactory.GetSubscriptions(handler : handler,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.Event.SubscriptionCollection GetSubscriptions(S
 				 startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/EventDeliverySummaryFactory.cs b/Mozu.Api.Test/Factories/Event/Push/Subscriptions/EventDeliverySummaryFactory.cs
old mode 100644
new mode 100755
similarity index 83%
rename from Mozu.Api.Test/Factories/EventDeliverySummaryFactory.cs
rename to Mozu.Api.Test/Factories/Event/Push/Subscriptions/EventDeliverySummaryFactory.cs
index 8614e960..33e1b15a
--- a/Mozu.Api.Test/Factories/EventDeliverySummaryFactory.cs
+++ b/Mozu.Api.Test/Factories/Event/Push/Subscriptions/EventDeliverySummaryFactory.cs
@@ -18,29 +18,30 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Event.Push.Subscriptions
 {
 	/// <summary>
-	/// Provides details for each attempted delivery of the event to the endpoint.
+	/// 
 	/// </summary>
 	public partial class EventDeliverySummaryFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// This operation method is the external/public event entity used specifically in pull/poll event scenarios.
+		/// 
 		/// <example> 
 		///  <code> 
-		/// var result = EventDeliverySummaryFactory.GetDeliveryAttemptSummary(handler : handler,  subscriptionId :  subscriptionId,  id :  id,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var result = EventDeliverySummaryFactory.GetDeliveryAttemptSummary(handler : handler,  subscriptionId :  subscriptionId,  processId :  processId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
 		/// var optionalCasting = ConvertClass<EventDeliverySummary/>(result); 
 		/// return optionalCasting;
 		///  </code> 
 		/// </example> 
 		/// </summary>
 		public static Mozu.Api.Contracts.Event.EventDeliverySummary GetDeliveryAttemptSummary(ServiceClientMessageHandler handler, 
- 		 string subscriptionId, int? id = null, string responseFields = null, 
+ 		 string subscriptionId, int? processId = null, string responseFields = null, 
 		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
 		{
 			SetSdKparameters();
@@ -48,10 +49,10 @@ public static Mozu.Api.Contracts.Event.EventDeliverySummary GetDeliveryAttemptSu
 			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
 			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
 			var apiClient = Mozu.Api.Clients.Event.Push.Subscriptions.EventDeliverySummaryClient.GetDeliveryAttemptSummaryClient(
-				 subscriptionId :  subscriptionId,  id :  id,  responseFields :  responseFields		);
+				 subscriptionId :  subscriptionId,  processId :  processId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.Event.EventDeliverySummary GetDeliveryAttemptSu
 		}
   
 		/// <summary> 
-		/// Retrieves a collection of data for delivery attempts of events and notifications. These are notifications sent to subscribing sites and tenants. A paged list is returned sorted and filtered per the entered parameters.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = EventDeliverySummaryFactory.GetDeliveryAttemptSummaries(handler : handler,  subscriptionId :  subscriptionId,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.Event.EventDeliverySummaryCollection GetDeliver
 				 subscriptionId :  subscriptionId,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/ExtensionFactory.cs b/Mozu.Api.Test/Factories/ExtensionFactory.cs
deleted file mode 100644
index ee718f2b..00000000
--- a/Mozu.Api.Test/Factories/ExtensionFactory.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.     
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-#region Usings Setup
-
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Net;
-using Mozu.Api;
-using Mozu.Api.Security;
-using Mozu.Api.Test.Helpers;
-using System.Diagnostics;
-using Newtonsoft.Json.Linq;
-
-#endregion
-
-namespace Mozu.Api.Test.Factories
-{
-	/// <summary>
-	/// platform/extensions related resources. DOCUMENT_HERE 
-	/// </summary>
-	public partial class ExtensionFactory : BaseDataFactory
-	{
-
-		/// <summary> 
-		/// platform-extensions Get GetExtensions description DOCUMENT_HERE 
-		/// <example> 
-		///  <code> 
-		/// var result = ExtensionFactory.GetExtensions(handler : handler,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<TenantExtensions/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.InstalledApplications.TenantExtensions GetExtensions(ServiceClientMessageHandler handler, 
- 		 string responseFields = null, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Platform.TenantExtensionsClient.GetExtensionsClient(
-				 responseFields :  responseFields		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-		/// <summary> 
-		/// platform-extensions Put UpdateExtensions description DOCUMENT_HERE 
-		/// <example> 
-		///  <code> 
-		/// var result = ExtensionFactory.UpdateExtensions(handler : handler,  extensions :  extensions,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<TenantExtensions/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.InstalledApplications.TenantExtensions UpdateExtensions(ServiceClientMessageHandler handler, 
- 		 Mozu.Api.Contracts.InstalledApplications.TenantExtensions extensions, string responseFields = null, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Platform.TenantExtensionsClient.UpdateExtensionsClient(
-				 extensions :  extensions,  responseFields :  responseFields		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-
-	}
-
-}
-
-
diff --git a/Mozu.Api.Test/Factories/ExternalApplicationsFactory.cs b/Mozu.Api.Test/Factories/ExternalApplicationsFactory.cs
deleted file mode 100644
index e988edfb..00000000
--- a/Mozu.Api.Test/Factories/ExternalApplicationsFactory.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.     
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-#region Usings Setup
-
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Net;
-using Mozu.Api;
-using Mozu.Api.Security;
-using Mozu.Api.Test.Helpers;
-using System.Diagnostics;
-using Newtonsoft.Json.Linq;
-
-#endregion
-
-namespace Mozu.Api.Test.Factories
-{
-	/// <summary>
-	/// Use the Applications resource to update and retrieve details about the applications installed for your tenant.
-	/// </summary>
-	public partial class ExternalApplicationsFactory : BaseDataFactory
-	{
-
-		/// <summary> 
-		/// Retrieves the details of the installed application specified in the request.
-		/// <example> 
-		///  <code> 
-		/// var result = ExternalApplicationsFactory.GetApplication(handler : handler,  appId :  appId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<Application/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.InstalledApplications.Application GetApplication(ServiceClientMessageHandler handler, 
- 		 string appId, string responseFields = null, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Platform.ExternalApplicationsClient.GetApplicationClient(
-				 appId :  appId,  responseFields :  responseFields		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-		/// <summary> 
-		/// Updates one or more properties of the application specified in the request.
-		/// <example> 
-		///  <code> 
-		/// var result = ExternalApplicationsFactory.UpdateApplication(handler : handler,  application :  application,  appId :  appId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<Application/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.InstalledApplications.Application UpdateApplication(ServiceClientMessageHandler handler, 
- 		 Mozu.Api.Contracts.InstalledApplications.Application application, string appId, string responseFields = null, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Platform.ExternalApplicationsClient.UpdateApplicationClient(
-				 application :  application,  appId :  appId,  responseFields :  responseFields		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-
-	}
-
-}
-
-
diff --git a/Mozu.Api.Test/Factories/FraudScreenResponseFactory.cs b/Mozu.Api.Test/Factories/FraudScreenResponseFactory.cs
deleted file mode 100644
index e498d023..00000000
--- a/Mozu.Api.Test/Factories/FraudScreenResponseFactory.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.     
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-#region Usings Setup
-
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Net;
-using Mozu.Api;
-using Mozu.Api.Security;
-using Mozu.Api.Test.Helpers;
-using System.Diagnostics;
-using Newtonsoft.Json.Linq;
-
-#endregion
-
-namespace Mozu.Api.Test.Factories
-{
-	/// <summary>
-	/// 
-	/// </summary>
-	public partial class FraudScreenResponseFactory : BaseDataFactory
-	{
-
-		/// <summary> 
-		/// 
-		/// <example> 
-		///  <code> 
-		/// var result = FraudScreenResponseFactory.Screen(handler : handler,  request :  request,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<FraudScreenResponse/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.PaymentService.Response.FraudScreenResponse Screen(ServiceClientMessageHandler handler, 
- 		 Mozu.Api.Contracts.PaymentService.Request.FraudScreenRequest request, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Commerce.Payments.FraudScreenResponseClient.ScreenClient(
-				 request :  request		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-
-	}
-
-}
-
-
diff --git a/Mozu.Api.Test/Factories/LocationRuntimeFactory.cs b/Mozu.Api.Test/Factories/LocationRuntimeFactory.cs
deleted file mode 100644
index bd208cc9..00000000
--- a/Mozu.Api.Test/Factories/LocationRuntimeFactory.cs
+++ /dev/null
@@ -1,227 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.     
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-#region Usings Setup
-
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Net;
-using Mozu.Api;
-using Mozu.Api.Security;
-using Mozu.Api.Test.Helpers;
-using System.Diagnostics;
-using Newtonsoft.Json.Linq;
-
-#endregion
-
-namespace Mozu.Api.Test.Factories
-{
-	/// <summary>
-	/// Use the Location resource to retrieve details about a location from a Mozu hosted storefront.
-	/// </summary>
-	public partial class LocationRuntimeFactory : BaseDataFactory
-	{
-
-		/// <summary> 
-		/// Retrieves the details of the location specified in the request.
-		/// <example> 
-		///  <code> 
-		/// var result = LocationRuntimeFactory.GetLocation(handler : handler,  code :  code,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<Location/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.Location.Location GetLocation(ServiceClientMessageHandler handler, 
- 		 string code, string responseFields = null, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Commerce.LocationClient.GetLocationClient(
-				 code :  code,  responseFields :  responseFields		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-		/// <summary> 
-		/// Retrieves a list of the locations configured for a specified location usage type for the specified site, according to any defined filter or sort criteria.
-		/// <example> 
-		///  <code> 
-		/// var result = LocationRuntimeFactory.GetLocationsInUsageType(handler : handler,  locationUsageType :  locationUsageType,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<LocationCollection/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.Location.LocationCollection GetLocationsInUsageType(ServiceClientMessageHandler handler, 
- 		 string locationUsageType, int? startIndex = null, int? pageSize = null, string sortBy = null, string filter = null, string responseFields = null, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Commerce.LocationClient.GetLocationsInUsageTypeClient(
-				 locationUsageType :  locationUsageType,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-		/// <summary> 
-		/// Retrieves the details of the location configured for the direct shipping (DS) location usage type for the site specified in the request. This location acts as an origin address from which order packages will ship, as well as the location where product reservations are created when order items are submitted with the direct ship fulfillment type (DS). If the direct ship location usage type is not configured for this site, the operation returns an error.
-		/// <example> 
-		///  <code> 
-		/// var result = LocationRuntimeFactory.GetDirectShipLocation(handler : handler,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<Location/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.Location.Location GetDirectShipLocation(ServiceClientMessageHandler handler, 
- 		 string responseFields = null, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Commerce.LocationClient.GetDirectShipLocationClient(
-				 responseFields :  responseFields		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-		/// <summary> 
-		/// Retrieves the details of the location configured for the in-store pickup (SP) location usage type for the site specified in the request. If the location is not associated with a location type configured for the in-store pickup location usage type (SP), the operation returns an error.
-		/// <example> 
-		///  <code> 
-		/// var result = LocationRuntimeFactory.GetInStorePickupLocation(handler : handler,  code :  code,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<Location/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.Location.Location GetInStorePickupLocation(ServiceClientMessageHandler handler, 
- 		 string code, string responseFields = null, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Commerce.LocationClient.GetInStorePickupLocationClient(
-				 code :  code,  responseFields :  responseFields		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-		/// <summary> 
-		/// Retrieves a list of locations valid for in-store pickup of an item in an order according to any filter and sort criteria. For example, an application could use this operation to provide a store finder feature based on the shopper's GPS coordinates. If the location types for the in-store pickup location usage type are not configured for the site, this operation returns an error.
-		/// <example> 
-		///  <code> 
-		/// var result = LocationRuntimeFactory.GetInStorePickupLocations(handler : handler,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<LocationCollection/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.Location.LocationCollection GetInStorePickupLocations(ServiceClientMessageHandler handler, 
- 		 int? startIndex = null, int? pageSize = null, string sortBy = null, string filter = null, string responseFields = null, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Commerce.LocationClient.GetInStorePickupLocationsClient(
-				 startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-
-	}
-
-}
-
-
diff --git a/Mozu.Api.Test/Factories/LocationSettingFactory.cs b/Mozu.Api.Test/Factories/LocationSettingFactory.cs
deleted file mode 100644
index cbd87bf4..00000000
--- a/Mozu.Api.Test/Factories/LocationSettingFactory.cs
+++ /dev/null
@@ -1,151 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.     
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-#region Usings Setup
-
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Net;
-using Mozu.Api;
-using Mozu.Api.Security;
-using Mozu.Api.Test.Helpers;
-using System.Diagnostics;
-using Newtonsoft.Json.Linq;
-
-#endregion
-
-namespace Mozu.Api.Test.Factories
-{
-	/// <summary>
-	/// Use the Location Usages resource to define the locations and location types that interact with the specified site. The system creates three default location usage types for each site after provisioning a new tenant - one for direct ship (DS), one for in-store pickup (SP), and one for store finder (storeFinder). Each site can only use a single location for the direct ship location usage type, and the location must support the direct ship fulfillment type (DS). For the in-store pickup location usage type, each site can use one or more location types. The location service identifies all locations of the specified type that support the in-store pickup fulfillment type (SP). For the store finder location usage type, each site can use one or more location types. The location service identifies all locations of the type. Locations configured for the store finder type do not typically maintain inventory. You cannot create additional location usage types at this time.
-	/// </summary>
-	public partial class LocationSettingFactory : BaseDataFactory
-	{
-
-		/// <summary> 
-		/// Retrieves the configured site location usages for the location usage code specified in the request.
-		/// <example> 
-		///  <code> 
-		/// var result = LocationSettingFactory.GetLocationUsages(handler : handler,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<LocationUsageCollection/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.Location.LocationUsageCollection GetLocationUsages(ServiceClientMessageHandler handler, 
- 		 string responseFields = null, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Commerce.Settings.LocationUsageClient.GetLocationUsagesClient(
-				 responseFields :  responseFields		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-		/// <summary> 
-		/// Retrieves the location usages for the site specified in the request header.
-		/// <example> 
-		///  <code> 
-		/// var result = LocationSettingFactory.GetLocationUsage(handler : handler,  code :  code,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<LocationUsage/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.Location.LocationUsage GetLocationUsage(ServiceClientMessageHandler handler, 
- 		 string code, string responseFields = null, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Commerce.Settings.LocationUsageClient.GetLocationUsageClient(
-				 code :  code,  responseFields :  responseFields		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-		/// <summary> 
-		/// Updates the location usage for the site based on the location usage code specified in the request.
-		/// <example> 
-		///  <code> 
-		/// var result = LocationSettingFactory.UpdateLocationUsage(handler : handler,  usage :  usage,  code :  code,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<LocationUsage/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.Location.LocationUsage UpdateLocationUsage(ServiceClientMessageHandler handler, 
- 		 Mozu.Api.Contracts.Location.LocationUsage usage, string code, string responseFields = null, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Commerce.Settings.LocationUsageClient.UpdateLocationUsageClient(
-				 usage :  usage,  code :  code,  responseFields :  responseFields		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-
-	}
-
-}
-
-
diff --git a/Mozu.Api.Test/Factories/LocationSettingsFactory.cs b/Mozu.Api.Test/Factories/LocationSettingsFactory.cs
deleted file mode 100644
index 9fd54619..00000000
--- a/Mozu.Api.Test/Factories/LocationSettingsFactory.cs
+++ /dev/null
@@ -1,151 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.     
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-#region Usings Setup
-
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Net;
-using Mozu.Api;
-using Mozu.Api.Security;
-using Mozu.Api.Test.Helpers;
-using System.Diagnostics;
-using Newtonsoft.Json.Linq;
-
-#endregion
-
-namespace Mozu.Api.Test.Factories
-{
-	/// <summary>
-	/// Use the Location Usages resource to define the locations and location types that interact with the specified site. The system creates three default location usage types for each site after provisioning a new tenant - one for direct ship (DS), one for in-store pickup (SP), and one for store finder (storeFinder). Each site can only use a single location for the direct ship location usage type, and the location must support the direct ship fulfillment type (DS). For the in-store pickup location usage type, each site can use one or more location types. The location service identifies all locations of the specified type that support the in-store pickup fulfillment type (SP). For the store finder location usage type, each site can use one or more location types. The location service identifies all locations of the type. Locations configured for the store finder type do not typically maintain inventory. You cannot create additional location usage types at this time.
-	/// </summary>
-	public partial class LocationSettingsFactory : BaseDataFactory
-	{
-
-		/// <summary> 
-		/// Retrieves the configured site location usages for the location usage code specified in the request.
-		/// <example> 
-		///  <code> 
-		/// var result = LocationSettingsFactory.GetLocationUsages(handler : handler,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<LocationUsageCollection/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.Location.LocationUsageCollection GetLocationUsages(ServiceClientMessageHandler handler, 
- 		 string responseFields = null, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Commerce.Settings.LocationSettingsClient.GetLocationUsagesClient(
-				 responseFields :  responseFields		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-		/// <summary> 
-		/// Retrieves the location usages for the site specified in the request header.
-		/// <example> 
-		///  <code> 
-		/// var result = LocationSettingsFactory.GetLocationUsage(handler : handler,  code :  code,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<LocationUsage/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.Location.LocationUsage GetLocationUsage(ServiceClientMessageHandler handler, 
- 		 string code, string responseFields = null, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Commerce.Settings.LocationSettingsClient.GetLocationUsageClient(
-				 code :  code,  responseFields :  responseFields		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-		/// <summary> 
-		/// Updates the location usage for the site based on the location usage code specified in the request.
-		/// <example> 
-		///  <code> 
-		/// var result = LocationSettingsFactory.UpdateLocationUsage(handler : handler,  usage :  usage,  code :  code,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<LocationUsage/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.Location.LocationUsage UpdateLocationUsage(ServiceClientMessageHandler handler, 
- 		 Mozu.Api.Contracts.Location.LocationUsage usage, string code, string responseFields = null, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Commerce.Settings.LocationSettingsClient.UpdateLocationUsageClient(
-				 usage :  usage,  code :  code,  responseFields :  responseFields		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-
-	}
-
-}
-
-
diff --git a/Mozu.Api.Test/Factories/AdminUserFactory.cs b/Mozu.Api.Test/Factories/Platform/Adminuser/AdminUserFactory.cs
old mode 100644
new mode 100755
similarity index 88%
rename from Mozu.Api.Test/Factories/AdminUserFactory.cs
rename to Mozu.Api.Test/Factories/Platform/Adminuser/AdminUserFactory.cs
index 2b95ca0b..4733628f
--- a/Mozu.Api.Test/Factories/AdminUserFactory.cs
+++ b/Mozu.Api.Test/Factories/Platform/Adminuser/AdminUserFactory.cs
@@ -18,19 +18,20 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Platform.Adminuser
 {
 	/// <summary>
-	/// The Accounts resource displays the user accounts and account details associated with a developer or  tenant administrator. Email addresses uniquely identify admin user accounts.
+	/// Displays the user accounts and account details associated with a developer or Mozu tenant administrator. Email addresses uniquely identify admin user accounts.
 	/// </summary>
 	public partial class AdminUserFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a list of the  tenants or development stores for which the specified user has an assigned role.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = AdminUserFactory.GetTenantScopesForUser(handler : handler,  userId :  userId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.Tenant.TenantCollection GetTenantScopesForUser(
 				 userId :  userId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.Tenant.TenantCollection GetTenantScopesForUser(
 		}
   
 		/// <summary> 
-		/// Retrieves the details of the specified administrator user account.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = AdminUserFactory.GetUser(handler : handler,  userId :  userId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.Core.User GetUser(ServiceClientMessageHandler h
 				 userId :  userId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/TenantAdminUserAuthTicketFactory.cs b/Mozu.Api.Test/Factories/Platform/Adminuser/TenantAdminUserAuthTicketFactory.cs
old mode 100644
new mode 100755
similarity index 89%
rename from Mozu.Api.Test/Factories/TenantAdminUserAuthTicketFactory.cs
rename to Mozu.Api.Test/Factories/Platform/Adminuser/TenantAdminUserAuthTicketFactory.cs
index 62143794..2a0e01b6
--- a/Mozu.Api.Test/Factories/TenantAdminUserAuthTicketFactory.cs
+++ b/Mozu.Api.Test/Factories/Platform/Adminuser/TenantAdminUserAuthTicketFactory.cs
@@ -18,19 +18,20 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Platform.Adminuser
 {
 	/// <summary>
-	/// Use the Admin User authentication tickets resource to generate and refresh authentication tickets that enable  administrator or developer account users to access development or production tenants.
+	/// Use the Admin User authentication tickets resource to generate and refresh authentication tickets that enable Mozu administrator or developer account users to access development or production tenants.
 	/// </summary>
 	public partial class TenantAdminUserAuthTicketFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Creates an authentication ticket for the supplied user to specify in API requests associated with the supplied tenant.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = TenantAdminUserAuthTicketFactory.CreateUserAuthTicket(handler : handler,  userAuthInfo :  userAuthInfo,  tenantId :  tenantId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.AdminUser.TenantAdminUserAuthTicket CreateUserA
 				 userAuthInfo :  userAuthInfo,  tenantId :  tenantId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.AdminUser.TenantAdminUserAuthTicket CreateUserA
 		}
   
 		/// <summary> 
-		/// Generates a new user authentication ticket for the specified tenant by supplying the user's existing refresh token information.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = TenantAdminUserAuthTicketFactory.RefreshAuthTicket(handler : handler,  existingAuthTicket :  existingAuthTicket,  tenantId :  tenantId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.AdminUser.TenantAdminUserAuthTicket RefreshAuth
 				 existingAuthTicket :  existingAuthTicket,  tenantId :  tenantId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.AdminUser.TenantAdminUserAuthTicket RefreshAuth
 		}
   
 		/// <summary> 
-		/// Deletes the authentication ticket for the user by supplying the refresh token.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = TenantAdminUserAuthTicketFactory.DeleteUserAuthTicket(handler : handler,  refreshToken :  refreshToken,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static void DeleteUserAuthTicket(ServiceClientMessageHandler handler,
 				 refreshToken :  refreshToken		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/Platform/Appdev/AppPackageFactory.cs b/Mozu.Api.Test/Factories/Platform/Appdev/AppPackageFactory.cs
new file mode 100755
index 00000000..fa7dfc57
--- /dev/null
+++ b/Mozu.Api.Test/Factories/Platform/Appdev/AppPackageFactory.cs
@@ -0,0 +1,417 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+#region Usings Setup
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Net;
+using Mozu.Api;
+using Mozu.Api.Security;
+using Mozu.Api.Test.Helpers;
+using System.Diagnostics;
+using Newtonsoft.Json.Linq;
+using System.Threading;
+
+#endregion
+
+namespace Mozu.Api.Test.Factories.Platform.Appdev
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	public partial class AppPackageFactory : BaseDataFactory
+	{
+
+		/// <summary> 
+		/// 
+		/// <example> 
+		///  <code> 
+		/// var result = AppPackageFactory.GetAllPackages(handler : handler,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<PackageSummaryCollection/>(result); 
+		/// return optionalCasting;
+		///  </code> 
+		/// </example> 
+		/// </summary>
+		public static Mozu.Api.Contracts.AppDev.PackageSummaryCollection GetAllPackages(ServiceClientMessageHandler handler, 
+ 		 int? startIndex = null, int? pageSize = null, string sortBy = null, string filter = null, string responseFields = null, 
+		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
+		{
+			SetSdKparameters();
+			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
+			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
+			var apiClient = Mozu.Api.Clients.Platform.Appdev.AppPackageClient.GetAllPackagesClient(
+				 startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields		);
+			try
+			{
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
+			}
+			catch (ApiException ex)
+			{
+				// Custom error handling for test cases can be placed here
+				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
+				if (customException != null)
+					throw customException;
+				return null;
+			}
+			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
+					 ? (apiClient.Result()) 
+					 : null;
+
+		}
+  
+		/// <summary> 
+		/// 
+		/// <example> 
+		///  <code> 
+		/// var result = AppPackageFactory.GetPackage(handler : handler,  applicationKey :  applicationKey,  includeChildren :  includeChildren,  skipDevAccountCheck :  skipDevAccountCheck,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<Package/>(result); 
+		/// return optionalCasting;
+		///  </code> 
+		/// </example> 
+		/// </summary>
+		public static Mozu.Api.Contracts.AppDev.Package GetPackage(ServiceClientMessageHandler handler, 
+ 		 string applicationKey, bool? includeChildren = null, bool? skipDevAccountCheck = null, string responseFields = null, 
+		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
+		{
+			SetSdKparameters();
+			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
+			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
+			var apiClient = Mozu.Api.Clients.Platform.Appdev.AppPackageClient.GetPackageClient(
+				 applicationKey :  applicationKey,  includeChildren :  includeChildren,  skipDevAccountCheck :  skipDevAccountCheck,  responseFields :  responseFields		);
+			try
+			{
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
+			}
+			catch (ApiException ex)
+			{
+				// Custom error handling for test cases can be placed here
+				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
+				if (customException != null)
+					throw customException;
+				return null;
+			}
+			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
+					 ? (apiClient.Result()) 
+					 : null;
+
+		}
+  
+		/// <summary> 
+		/// 
+		/// <example> 
+		///  <code> 
+		/// var result = AppPackageFactory.GetPackages(handler : handler,  applicationKey :  applicationKey,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<PackageCollection/>(result); 
+		/// return optionalCasting;
+		///  </code> 
+		/// </example> 
+		/// </summary>
+		public static Mozu.Api.Contracts.AppDev.PackageCollection GetPackages(ServiceClientMessageHandler handler, 
+ 		 string applicationKey, int? startIndex = null, int? pageSize = null, string sortBy = null, string filter = null, string responseFields = null, 
+		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
+		{
+			SetSdKparameters();
+			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
+			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
+			var apiClient = Mozu.Api.Clients.Platform.Appdev.AppPackageClient.GetPackagesClient(
+				 applicationKey :  applicationKey,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields		);
+			try
+			{
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
+			}
+			catch (ApiException ex)
+			{
+				// Custom error handling for test cases can be placed here
+				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
+				if (customException != null)
+					throw customException;
+				return null;
+			}
+			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
+					 ? (apiClient.Result()) 
+					 : null;
+
+		}
+  
+		/// <summary> 
+		/// 
+		/// <example> 
+		///  <code> 
+		/// var result = AppPackageFactory.GetApplicationSummaryChildren(handler : handler,  appId :  appId,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<List<ApplicationSummary>/>(result); 
+		/// return optionalCasting;
+		///  </code> 
+		/// </example> 
+		/// </summary>
+		public static List<Mozu.Api.Contracts.AppDev.ApplicationSummary> GetApplicationSummaryChildren(ServiceClientMessageHandler handler, 
+ 		 string appId, 
+		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
+		{
+			SetSdKparameters();
+			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
+			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
+			var apiClient = Mozu.Api.Clients.Platform.Appdev.AppPackageClient.GetApplicationSummaryChildrenClient(
+				 appId :  appId		);
+			try
+			{
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
+			}
+			catch (ApiException ex)
+			{
+				// Custom error handling for test cases can be placed here
+				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
+				if (customException != null)
+					throw customException;
+				return null;
+			}
+			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
+					 ? (apiClient.Result()) 
+					 : null;
+
+		}
+  
+		/// <summary> 
+		/// 
+		/// <example> 
+		///  <code> 
+		/// var result = AppPackageFactory.GetApplicationSummaryParents(handler : handler,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<ApplicationSummaryCollection/>(result); 
+		/// return optionalCasting;
+		///  </code> 
+		/// </example> 
+		/// </summary>
+		public static Mozu.Api.Contracts.AppDev.ApplicationSummaryCollection GetApplicationSummaryParents(ServiceClientMessageHandler handler, 
+ 		 int? startIndex = null, int? pageSize = null, string sortBy = null, string filter = null, string responseFields = null, 
+		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
+		{
+			SetSdKparameters();
+			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
+			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
+			var apiClient = Mozu.Api.Clients.Platform.Appdev.AppPackageClient.GetApplicationSummaryParentsClient(
+				 startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  filter :  filter,  responseFields :  responseFields		);
+			try
+			{
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
+			}
+			catch (ApiException ex)
+			{
+				// Custom error handling for test cases can be placed here
+				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
+				if (customException != null)
+					throw customException;
+				return null;
+			}
+			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
+					 ? (apiClient.Result()) 
+					 : null;
+
+		}
+  
+		/// <summary> 
+		/// 
+		/// <example> 
+		///  <code> 
+		/// var result = AppPackageFactory.ClonePackage(handler : handler,  applicationKey :  applicationKey,  packageName :  packageName,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<Package/>(result); 
+		/// return optionalCasting;
+		///  </code> 
+		/// </example> 
+		/// </summary>
+		public static Mozu.Api.Contracts.AppDev.Package ClonePackage(ServiceClientMessageHandler handler, 
+ 		 string applicationKey, string packageName, string responseFields = null, 
+		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
+		{
+			SetSdKparameters();
+			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
+			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
+			var apiClient = Mozu.Api.Clients.Platform.Appdev.AppPackageClient.ClonePackageClient(
+				 applicationKey :  applicationKey,  packageName :  packageName,  responseFields :  responseFields		);
+			try
+			{
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
+			}
+			catch (ApiException ex)
+			{
+				// Custom error handling for test cases can be placed here
+				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
+				if (customException != null)
+					throw customException;
+				return null;
+			}
+			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
+					 ? (apiClient.Result()) 
+					 : null;
+
+		}
+  
+		/// <summary> 
+		/// 
+		/// <example> 
+		///  <code> 
+		/// var result = AppPackageFactory.CreateNewCorePackage(handler : handler,  packageRequest :  packageRequest,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<Package/>(result); 
+		/// return optionalCasting;
+		///  </code> 
+		/// </example> 
+		/// </summary>
+		public static Mozu.Api.Contracts.AppDev.Package CreateNewCorePackage(ServiceClientMessageHandler handler, 
+ 		 Mozu.Api.Contracts.AppDev.PackageRequest packageRequest, string responseFields = null, 
+		 HttpStatusCode expectedCode = HttpStatusCode.Created, HttpStatusCode successCode = HttpStatusCode.Created)
+		{
+			SetSdKparameters();
+			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
+			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
+			var apiClient = Mozu.Api.Clients.Platform.Appdev.AppPackageClient.CreateNewCorePackageClient(
+				 packageRequest :  packageRequest,  responseFields :  responseFields		);
+			try
+			{
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
+			}
+			catch (ApiException ex)
+			{
+				// Custom error handling for test cases can be placed here
+				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
+				if (customException != null)
+					throw customException;
+				return null;
+			}
+			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
+					 ? (apiClient.Result()) 
+					 : null;
+
+		}
+  
+		/// <summary> 
+		/// 
+		/// <example> 
+		///  <code> 
+		/// var result = AppPackageFactory.CreatePackage(handler : handler,  pkg :  pkg,  projectId :  projectId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<Package/>(result); 
+		/// return optionalCasting;
+		///  </code> 
+		/// </example> 
+		/// </summary>
+		public static Mozu.Api.Contracts.AppDev.Package CreatePackage(ServiceClientMessageHandler handler, 
+ 		 Mozu.Api.Contracts.AppDev.Package pkg, int? projectId = null, string responseFields = null, 
+		 HttpStatusCode expectedCode = HttpStatusCode.Created, HttpStatusCode successCode = HttpStatusCode.Created)
+		{
+			SetSdKparameters();
+			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
+			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
+			var apiClient = Mozu.Api.Clients.Platform.Appdev.AppPackageClient.CreatePackageClient(
+				 pkg :  pkg,  projectId :  projectId,  responseFields :  responseFields		);
+			try
+			{
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
+			}
+			catch (ApiException ex)
+			{
+				// Custom error handling for test cases can be placed here
+				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
+				if (customException != null)
+					throw customException;
+				return null;
+			}
+			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
+					 ? (apiClient.Result()) 
+					 : null;
+
+		}
+  
+		/// <summary> 
+		/// 
+		/// <example> 
+		///  <code> 
+		/// var result = AppPackageFactory.UpdatePackage(handler : handler,  pkg :  pkg,  applicationKey :  applicationKey,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<Package/>(result); 
+		/// return optionalCasting;
+		///  </code> 
+		/// </example> 
+		/// </summary>
+		public static Mozu.Api.Contracts.AppDev.Package UpdatePackage(ServiceClientMessageHandler handler, 
+ 		 Mozu.Api.Contracts.AppDev.Package pkg, string applicationKey, string responseFields = null, 
+		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
+		{
+			SetSdKparameters();
+			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
+			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
+			var apiClient = Mozu.Api.Clients.Platform.Appdev.AppPackageClient.UpdatePackageClient(
+				 pkg :  pkg,  applicationKey :  applicationKey,  responseFields :  responseFields		);
+			try
+			{
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
+			}
+			catch (ApiException ex)
+			{
+				// Custom error handling for test cases can be placed here
+				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
+				if (customException != null)
+					throw customException;
+				return null;
+			}
+			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
+					 ? (apiClient.Result()) 
+					 : null;
+
+		}
+  
+		/// <summary> 
+		/// 
+		/// <example> 
+		///  <code> 
+		/// var result = AppPackageFactory.DeletePackage(handler : handler,  applicationKey :  applicationKey,  expectedCode: expectedCode, successCode: successCode); 
+		/// var optionalCasting = ConvertClass<void/>(result); 
+		/// return optionalCasting;
+		///  </code> 
+		/// </example> 
+		/// </summary>
+		public static void DeletePackage(ServiceClientMessageHandler handler, 
+ 		string applicationKey, 
+		 HttpStatusCode expectedCode = HttpStatusCode.NoContent, HttpStatusCode successCode = HttpStatusCode.NoContent)
+		{
+			SetSdKparameters();
+			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
+			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
+			var apiClient = Mozu.Api.Clients.Platform.Appdev.AppPackageClient.DeletePackageClient(
+				 applicationKey :  applicationKey		);
+			try
+			{
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
+			}
+			catch (ApiException ex)
+			{
+				// Custom error handling for test cases can be placed here
+				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
+				if (customException != null)
+					throw customException;
+			}
+			var noResponse = ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
+					 ? (apiClient.Result()) 
+					 : null;
+
+		}
+  
+
+	}
+
+}
+
+
diff --git a/Mozu.Api.Test/Factories/PackageFactory.cs b/Mozu.Api.Test/Factories/Platform/Appdev/PackageFactory.cs
old mode 100644
new mode 100755
similarity index 92%
rename from Mozu.Api.Test/Factories/PackageFactory.cs
rename to Mozu.Api.Test/Factories/Platform/Appdev/PackageFactory.cs
index c13f4e17..fba31104
--- a/Mozu.Api.Test/Factories/PackageFactory.cs
+++ b/Mozu.Api.Test/Factories/Platform/Appdev/PackageFactory.cs
@@ -18,19 +18,20 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Platform.Appdev
 {
 	/// <summary>
-	/// This resource is not public.
+	/// 
 	/// </summary>
 	public partial class PackageFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// This operation is not public.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = PackageFactory.GetFile(handler : handler,  applicationKey :  applicationKey,  fileName :  fileName,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static System.IO.Stream GetFile(ServiceClientMessageHandler handler,
 				 applicationKey :  applicationKey,  fileName :  fileName		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/ApplicationFactory.cs b/Mozu.Api.Test/Factories/Platform/ApplicationFactory.cs
old mode 100644
new mode 100755
similarity index 92%
rename from Mozu.Api.Test/Factories/ApplicationFactory.cs
rename to Mozu.Api.Test/Factories/Platform/ApplicationFactory.cs
index 2c23e525..386f29a9
--- a/Mozu.Api.Test/Factories/ApplicationFactory.cs
+++ b/Mozu.Api.Test/Factories/Platform/ApplicationFactory.cs
@@ -18,19 +18,20 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Platform
 {
 	/// <summary>
-	/// Use the Developer resource to view and update information and files related to application packages.
+	/// 
 	/// </summary>
 	public partial class ApplicationFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Returns a collection of package names for the application specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ApplicationFactory.GetAppPackageNames(handler : handler,  applicationKey :  applicationKey,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.AppDev.PackageNamesCollection GetAppPackageName
 				 applicationKey :  applicationKey,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.AppDev.PackageNamesCollection GetAppPackageName
 		}
   
 		/// <summary> 
-		/// Retrieves the available versions for the application specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ApplicationFactory.GetAppVersions(handler : handler,  nsAndAppId :  nsAndAppId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.AppDev.ApplicationVersionsCollection GetAppVers
 				 nsAndAppId :  nsAndAppId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.AppDev.ApplicationVersionsCollection GetAppVers
 		}
   
 		/// <summary> 
-		/// Retrieves the metadata for a file in an application package.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ApplicationFactory.GetPackageFileMetadata(handler : handler,  applicationKey :  applicationKey,  filepath :  filepath,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.AppDev.FileMetadata GetPackageFileMetadata(Serv
 				 applicationKey :  applicationKey,  filepath :  filepath,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.AppDev.FileMetadata GetPackageFileMetadata(Serv
 		}
   
 		/// <summary> 
-		/// Retrieves the metadata for a folder in an application package.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ApplicationFactory.GetPackageMetadata(handler : handler,  applicationKey :  applicationKey,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static Mozu.Api.Contracts.AppDev.FolderMetadata GetPackageMetadata(Servic
 				 applicationKey :  applicationKey,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -182,7 +183,7 @@ public static Mozu.Api.Contracts.AppDev.FolderMetadata GetPackageMetadata(Servic
 		}
   
 		/// <summary> 
-		/// Insert or update the specified file into the specified application package.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ApplicationFactory.UpsertPackageFile(handler : handler,  stream :  stream,  applicationKey :  applicationKey,  filepath :  filepath,  lastModifiedTime :  lastModifiedTime,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -203,7 +204,7 @@ public static Mozu.Api.Contracts.AppDev.FileMetadata UpsertPackageFile(ServiceCl
 				 stream :  stream,  applicationKey :  applicationKey,  filepath :  filepath,  lastModifiedTime :  lastModifiedTime,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -220,7 +221,7 @@ public static Mozu.Api.Contracts.AppDev.FileMetadata UpsertPackageFile(ServiceCl
 		}
   
 		/// <summary> 
-		/// Renames a file in an application package.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ApplicationFactory.RenamePackageFile(handler : handler,  renameInfo :  renameInfo,  applicationKey :  applicationKey,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -241,7 +242,7 @@ public static Mozu.Api.Contracts.AppDev.FileMetadata RenamePackageFile(ServiceCl
 				 renameInfo :  renameInfo,  applicationKey :  applicationKey,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -258,7 +259,7 @@ public static Mozu.Api.Contracts.AppDev.FileMetadata RenamePackageFile(ServiceCl
 		}
   
 		/// <summary> 
-		/// Deletes the specified file from the specified application package.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ApplicationFactory.DeletePackageFile(handler : handler,  applicationKey :  applicationKey,  filepath :  filepath,  expectedCode: expectedCode, successCode: successCode); 
@@ -279,7 +280,7 @@ public static void DeletePackageFile(ServiceClientMessageHandler handler,
 				 applicationKey :  applicationKey,  filepath :  filepath		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/AuthTicketFactory.cs b/Mozu.Api.Test/Factories/Platform/Applications/AuthTicketFactory.cs
old mode 100644
new mode 100755
similarity index 90%
rename from Mozu.Api.Test/Factories/AuthTicketFactory.cs
rename to Mozu.Api.Test/Factories/Platform/Applications/AuthTicketFactory.cs
index 23744f5c..cdc7b6e7
--- a/Mozu.Api.Test/Factories/AuthTicketFactory.cs
+++ b/Mozu.Api.Test/Factories/Platform/Applications/AuthTicketFactory.cs
@@ -18,19 +18,20 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Platform.Applications
 {
 	/// <summary>
-	/// Use the Authetickets for applications resource to manage authentication tickets for your apps.
+	/// Use this resource to manage authentication tickets for your applications.
 	/// </summary>
 	public partial class AuthTicketFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Generate an authentication ticket for an application.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = AuthTicketFactory.AuthenticateApp(handler : handler,  appAuthInfo :  appAuthInfo,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.AppDev.AuthTicket AuthenticateApp(ServiceClient
 				 appAuthInfo :  appAuthInfo,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.AppDev.AuthTicket AuthenticateApp(ServiceClient
 		}
   
 		/// <summary> 
-		/// Refreshes the application's authentication ticket and generates a new access token by providing the refresh token string.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = AuthTicketFactory.RefreshAppAuthTicket(handler : handler,  authTicketRequest :  authTicketRequest,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.AppDev.AuthTicket RefreshAppAuthTicket(ServiceC
 				 authTicketRequest :  authTicketRequest,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.AppDev.AuthTicket RefreshAppAuthTicket(ServiceC
 		}
   
 		/// <summary> 
-		/// Deletes an authentication for an application based on the specified refresh token.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = AuthTicketFactory.DeleteAppAuthTicket(handler : handler,  refreshToken :  refreshToken,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static void DeleteAppAuthTicket(ServiceClientMessageHandler handler,
 				 refreshToken :  refreshToken		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/DeveloperAdminUserAuthTicketFactory.cs b/Mozu.Api.Test/Factories/Platform/Developer/DeveloperAdminUserAuthTicketFactory.cs
old mode 100644
new mode 100755
similarity index 90%
rename from Mozu.Api.Test/Factories/DeveloperAdminUserAuthTicketFactory.cs
rename to Mozu.Api.Test/Factories/Platform/Developer/DeveloperAdminUserAuthTicketFactory.cs
index 56675c2c..7419ee36
--- a/Mozu.Api.Test/Factories/DeveloperAdminUserAuthTicketFactory.cs
+++ b/Mozu.Api.Test/Factories/Platform/Developer/DeveloperAdminUserAuthTicketFactory.cs
@@ -18,19 +18,20 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Platform.Developer
 {
 	/// <summary>
-	/// Use the Authtickets resource to manage authentication tickets for your developer account.
+	/// Use this resource to manage authentication tickets for your developer account.
 	/// </summary>
 	public partial class DeveloperAdminUserAuthTicketFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Generate an authentication ticket for a developer account.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = DeveloperAdminUserAuthTicketFactory.CreateDeveloperUserAuthTicket(handler : handler,  userAuthInfo :  userAuthInfo,  developerAccountId :  developerAccountId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.AdminUser.DeveloperAdminUserAuthTicket CreateDe
 				 userAuthInfo :  userAuthInfo,  developerAccountId :  developerAccountId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.AdminUser.DeveloperAdminUserAuthTicket CreateDe
 		}
   
 		/// <summary> 
-		/// Generates a new developer account authentication ticket for the specified tenant by supplying the defined refresh token information.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = DeveloperAdminUserAuthTicketFactory.RefreshDeveloperAuthTicket(handler : handler,  existingAuthTicket :  existingAuthTicket,  developerAccountId :  developerAccountId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.AdminUser.DeveloperAdminUserAuthTicket RefreshD
 				 existingAuthTicket :  existingAuthTicket,  developerAccountId :  developerAccountId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.AdminUser.DeveloperAdminUserAuthTicket RefreshD
 		}
   
 		/// <summary> 
-		/// Deletes the authentication ticket for the developer account by supplying the refresh token.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = DeveloperAdminUserAuthTicketFactory.DeleteUserAuthTicket(handler : handler,  refreshToken :  refreshToken,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static void DeleteUserAuthTicket(ServiceClientMessageHandler handler,
 				 refreshToken :  refreshToken		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/EntityListFactory.cs b/Mozu.Api.Test/Factories/Platform/EntityListFactory.cs
old mode 100644
new mode 100755
similarity index 89%
rename from Mozu.Api.Test/Factories/EntityListFactory.cs
rename to Mozu.Api.Test/Factories/Platform/EntityListFactory.cs
index 867be955..1555aa21
--- a/Mozu.Api.Test/Factories/EntityListFactory.cs
+++ b/Mozu.Api.Test/Factories/Platform/EntityListFactory.cs
@@ -18,19 +18,20 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Platform
 {
 	/// <summary>
-	/// The Entity Lists resource manages all dynamic entities in your  document store of the  cloud. The content is JSON and can have up to five indexed properties (integer, decimal, string, date, and boolean) with support for additional customized elements as needed. Every document in the entity list has a validated unique ID.
+	/// 
 	/// </summary>
 	public partial class EntityListFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Get a filtered list of EntityLists for a specific tenant.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = EntityListFactory.GetEntityLists(handler : handler,  pageSize :  pageSize,  startIndex :  startIndex,  filter :  filter,  sortBy :  sortBy,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.MZDB.EntityListCollection GetEntityLists(Servic
 				 pageSize :  pageSize,  startIndex :  startIndex,  filter :  filter,  sortBy :  sortBy,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.MZDB.EntityListCollection GetEntityLists(Servic
 		}
   
 		/// <summary> 
-		/// Get an existing EntityList definition for a specific tenant
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = EntityListFactory.GetEntityList(handler : handler,  entityListFullName :  entityListFullName,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.MZDB.EntityList GetEntityList(ServiceClientMess
 				 entityListFullName :  entityListFullName,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.MZDB.EntityList GetEntityList(ServiceClientMess
 		}
   
 		/// <summary> 
-		/// Create a new EntityList for a specific tenant.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = EntityListFactory.CreateEntityList(handler : handler,  entityList :  entityList,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.MZDB.EntityList CreateEntityList(ServiceClientM
 				 entityList :  entityList,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.MZDB.EntityList CreateEntityList(ServiceClientM
 		}
   
 		/// <summary> 
-		/// Update an existing Entitylist for a specific tenant.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = EntityListFactory.UpdateEntityList(handler : handler,  entityList :  entityList,  entityListFullName :  entityListFullName,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static Mozu.Api.Contracts.MZDB.EntityList UpdateEntityList(ServiceClientM
 				 entityList :  entityList,  entityListFullName :  entityListFullName,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -182,7 +183,7 @@ public static Mozu.Api.Contracts.MZDB.EntityList UpdateEntityList(ServiceClientM
 		}
   
 		/// <summary> 
-		/// Delete an existing EntityList for a specific tenant. This will also delete all Entities in all instances of this EntityList for the tenant.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = EntityListFactory.DeleteEntityList(handler : handler,  entityListFullName :  entityListFullName,  expectedCode: expectedCode, successCode: successCode); 
@@ -203,7 +204,7 @@ public static void DeleteEntityList(ServiceClientMessageHandler handler,
 				 entityListFullName :  entityListFullName		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/EntityContainerFactory.cs b/Mozu.Api.Test/Factories/Platform/Entitylists/EntityContainerFactory.cs
old mode 100644
new mode 100755
similarity index 88%
rename from Mozu.Api.Test/Factories/EntityContainerFactory.cs
rename to Mozu.Api.Test/Factories/Platform/Entitylists/EntityContainerFactory.cs
index a6e59fe5..268b5aec
--- a/Mozu.Api.Test/Factories/EntityContainerFactory.cs
+++ b/Mozu.Api.Test/Factories/Platform/Entitylists/EntityContainerFactory.cs
@@ -18,19 +18,20 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Platform.Entitylists
 {
 	/// <summary>
-	/// Entity containers provide all properties and data for entities within a site/tenant. This data encapsulates all associated IDs including entity lists, entity views, site, tenant, entities, and more.
+	/// 
 	/// </summary>
 	public partial class EntityContainerFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves an entity container, providing all schema and rules and associated IDs for entities.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = EntityContainerFactory.GetEntityContainer(handler : handler,  entityListFullName :  entityListFullName,  id :  id,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.MZDB.EntityContainer GetEntityContainer(Service
 				 entityListFullName :  entityListFullName,  id :  id,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.MZDB.EntityContainer GetEntityContainer(Service
 		}
   
 		/// <summary> 
-		/// Retrieves a collection of entity containers. Each container holds a set of entities per ID. 
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = EntityContainerFactory.GetEntityContainers(handler : handler,  entityListFullName :  entityListFullName,  pageSize :  pageSize,  startIndex :  startIndex,  filter :  filter,  sortBy :  sortBy,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.MZDB.EntityContainerCollection GetEntityContain
 				 entityListFullName :  entityListFullName,  pageSize :  pageSize,  startIndex :  startIndex,  filter :  filter,  sortBy :  sortBy,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/EntityFactory.cs b/Mozu.Api.Test/Factories/Platform/Entitylists/EntityFactory.cs
old mode 100644
new mode 100755
similarity index 87%
rename from Mozu.Api.Test/Factories/EntityFactory.cs
rename to Mozu.Api.Test/Factories/Platform/Entitylists/EntityFactory.cs
index 4b7e614f..acdf1379
--- a/Mozu.Api.Test/Factories/EntityFactory.cs
+++ b/Mozu.Api.Test/Factories/Platform/Entitylists/EntityFactory.cs
@@ -18,19 +18,20 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Platform.Entitylists
 {
 	/// <summary>
-	/// Entities are JSON entries within the MZDB ( Mongo DB) for handling large data sets to heavily filter (&gt;2,000 items). Each entity is associated to an EntityList with schema, rules, and formatting for storing the content. This content can be accessed via the  API and  Hypr tags.
+	/// 
 	/// </summary>
 	public partial class EntityFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves an entity with an associated entity list and context level at tenant, master catalog, catalog, or site. 
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = EntityFactory.GetEntity(handler : handler,  entityListFullName :  entityListFullName,  id :  id,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static JObject GetEntity(ServiceClientMessageHandler handler,
 				 entityListFullName :  entityListFullName,  id :  id,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static JObject GetEntity(ServiceClientMessageHandler handler,
 		}
   
 		/// <summary> 
-		/// Retrieves a collection of entities with an associated entity list and context level at tenant, master catalog, catalog, or site. 
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = EntityFactory.GetEntities(handler : handler,  entityListFullName :  entityListFullName,  pageSize :  pageSize,  startIndex :  startIndex,  filter :  filter,  sortBy :  sortBy,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.MZDB.EntityCollection GetEntities(ServiceClient
 				 entityListFullName :  entityListFullName,  pageSize :  pageSize,  startIndex :  startIndex,  filter :  filter,  sortBy :  sortBy,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.MZDB.EntityCollection GetEntities(ServiceClient
 		}
   
 		/// <summary> 
-		/// Inserts a new entity per the entered item, the entity list full name, and associated response fields. 
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = EntityFactory.InsertEntity(handler : handler,  item :  item,  entityListFullName :  entityListFullName,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static JObject InsertEntity(ServiceClientMessageHandler handler,
 				 item :  item,  entityListFullName :  entityListFullName,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static JObject InsertEntity(ServiceClientMessageHandler handler,
 		}
   
 		/// <summary> 
-		/// Updates the content and associations for an existing entity.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = EntityFactory.UpdateEntity(handler : handler,  item :  item,  entityListFullName :  entityListFullName,  id :  id,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static JObject UpdateEntity(ServiceClientMessageHandler handler,
 				 item :  item,  entityListFullName :  entityListFullName,  id :  id,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -182,7 +183,7 @@ public static JObject UpdateEntity(ServiceClientMessageHandler handler,
 		}
   
 		/// <summary> 
-		/// Deletes an entity depending on the context of tenant, master catalog, catalog, or site level. Entities are associated to an entity list (schema and formatting) for displaying within a namespace and context level.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = EntityFactory.DeleteEntity(handler : handler,  entityListFullName :  entityListFullName,  id :  id,  expectedCode: expectedCode, successCode: successCode); 
@@ -203,7 +204,7 @@ public static void DeleteEntity(ServiceClientMessageHandler handler,
 				 entityListFullName :  entityListFullName,  id :  id		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/ListViewFactory.cs b/Mozu.Api.Test/Factories/Platform/Entitylists/ListViewFactory.cs
old mode 100644
new mode 100755
similarity index 89%
rename from Mozu.Api.Test/Factories/ListViewFactory.cs
rename to Mozu.Api.Test/Factories/Platform/Entitylists/ListViewFactory.cs
index 3059e4a8..b7a5fcc6
--- a/Mozu.Api.Test/Factories/ListViewFactory.cs
+++ b/Mozu.Api.Test/Factories/Platform/Entitylists/ListViewFactory.cs
@@ -18,19 +18,20 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Platform.Entitylists
 {
 	/// <summary>
-	/// Provides settings and options for displaying associated content within a context level of site, tenant, catalog, or master catalog. ListViews can be associated with entity lists and entities.
+	/// 
 	/// </summary>
 	public partial class ListViewFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a view for associated entities. A view provides display context levels (site, tenant, catalog, master catalog) and settings.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ListViewFactory.GetViewEntity(handler : handler,  entityListFullName :  entityListFullName,  viewName :  viewName,  entityId :  entityId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static JObject GetViewEntity(ServiceClientMessageHandler handler,
 				 entityListFullName :  entityListFullName,  viewName :  viewName,  entityId :  entityId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static JObject GetViewEntity(ServiceClientMessageHandler handler,
 		}
   
 		/// <summary> 
-		/// Retrieves a collection of views for associated entities. Each view provides display context levels (site, tenant, catalog, master catalog) and settings.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ListViewFactory.GetViewEntities(handler : handler,  entityListFullName :  entityListFullName,  viewName :  viewName,  pageSize :  pageSize,  startIndex :  startIndex,  filter :  filter,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.MZDB.EntityCollection GetViewEntities(ServiceCl
 				 entityListFullName :  entityListFullName,  viewName :  viewName,  pageSize :  pageSize,  startIndex :  startIndex,  filter :  filter,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.MZDB.EntityCollection GetViewEntities(ServiceCl
 		}
   
 		/// <summary> 
-		/// Retrieves a collection of container data for creating and displaying a view of entities. 
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ListViewFactory.GetViewEntityContainer(handler : handler,  entityListFullName :  entityListFullName,  viewName :  viewName,  entityId :  entityId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.MZDB.EntityContainer GetViewEntityContainer(Ser
 				 entityListFullName :  entityListFullName,  viewName :  viewName,  entityId :  entityId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.MZDB.EntityContainer GetViewEntityContainer(Ser
 		}
   
 		/// <summary> 
-		/// Retrieves a collection of container data for creating and displaying a view of entities. 
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ListViewFactory.GetViewEntityContainers(handler : handler,  entityListFullName :  entityListFullName,  viewName :  viewName,  pageSize :  pageSize,  startIndex :  startIndex,  filter :  filter,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static Mozu.Api.Contracts.MZDB.EntityContainerCollection GetViewEntityCon
 				 entityListFullName :  entityListFullName,  viewName :  viewName,  pageSize :  pageSize,  startIndex :  startIndex,  filter :  filter,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -182,7 +183,7 @@ public static Mozu.Api.Contracts.MZDB.EntityContainerCollection GetViewEntityCon
 		}
   
 		/// <summary> 
-		/// Retrieves a specific `EntityListView`. These views provide schema, rules, and formatting for all associated entities. 
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ListViewFactory.GetEntityListView(handler : handler,  entityListFullName :  entityListFullName,  viewName :  viewName,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -203,7 +204,7 @@ public static Mozu.Api.Contracts.MZDB.ListView GetEntityListView(ServiceClientMe
 				 entityListFullName :  entityListFullName,  viewName :  viewName,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -220,7 +221,7 @@ public static Mozu.Api.Contracts.MZDB.ListView GetEntityListView(ServiceClientMe
 		}
   
 		/// <summary> 
-		/// Retrieves a collection of `EntityListViews`. These views provide schema, rules, and formatting for all associated entities. 
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ListViewFactory.GetEntityListViews(handler : handler,  entityListFullName :  entityListFullName,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -241,7 +242,7 @@ public static Mozu.Api.Contracts.MZDB.ListViewCollection GetEntityListViews(Serv
 				 entityListFullName :  entityListFullName,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -258,7 +259,7 @@ public static Mozu.Api.Contracts.MZDB.ListViewCollection GetEntityListViews(Serv
 		}
   
 		/// <summary> 
-		/// Creates an entity list view. Each view provides display context levels (site, tenant, catalog, master catalog) and settings for the list of entities.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ListViewFactory.CreateEntityListView(handler : handler,  listView :  listView,  entityListFullName :  entityListFullName,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -279,7 +280,7 @@ public static Mozu.Api.Contracts.MZDB.ListView CreateEntityListView(ServiceClien
 				 listView :  listView,  entityListFullName :  entityListFullName,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -296,7 +297,7 @@ public static Mozu.Api.Contracts.MZDB.ListView CreateEntityListView(ServiceClien
 		}
   
 		/// <summary> 
-		/// Updates an existing entity list view. Each view provides display context levels (site, tenant, catalog, master catalog) and settings for the list of entities.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ListViewFactory.UpdateEntityListView(handler : handler,  listView :  listView,  entityListFullName :  entityListFullName,  viewName :  viewName,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -317,7 +318,7 @@ public static Mozu.Api.Contracts.MZDB.ListView UpdateEntityListView(ServiceClien
 				 listView :  listView,  entityListFullName :  entityListFullName,  viewName :  viewName,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -334,7 +335,7 @@ public static Mozu.Api.Contracts.MZDB.ListView UpdateEntityListView(ServiceClien
 		}
   
 		/// <summary> 
-		/// Deletes an entity list view. Any associated entities have the association removed.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ListViewFactory.DeleteEntityListView(handler : handler,  entityListFullName :  entityListFullName,  viewName :  viewName,  expectedCode: expectedCode, successCode: successCode); 
@@ -355,7 +356,7 @@ public static void DeleteEntityListView(ServiceClientMessageHandler handler,
 				 entityListFullName :  entityListFullName,  viewName :  viewName		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/CredentialStoreEntryFactory.cs b/Mozu.Api.Test/Factories/Platform/Extensions/CredentialStoreEntryFactory.cs
old mode 100644
new mode 100755
similarity index 75%
rename from Mozu.Api.Test/Factories/CredentialStoreEntryFactory.cs
rename to Mozu.Api.Test/Factories/Platform/Extensions/CredentialStoreEntryFactory.cs
index 4ae88b40..ba60a2f2
--- a/Mozu.Api.Test/Factories/CredentialStoreEntryFactory.cs
+++ b/Mozu.Api.Test/Factories/Platform/Extensions/CredentialStoreEntryFactory.cs
@@ -18,19 +18,20 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Platform.Extensions
 {
 	/// <summary>
-	/// The CredentialStore resource allows you to encrypt and store sensitive data on your tenant. You can then decrypt and access that data using an Arc.js application, as described in the Arc.js [Programming Patterns](https://www.mozu.com/docs/developer/arcjs-guides/programming-patterns.htm#securely_store_and_access_sensitive_data) topic.
+	/// 
 	/// </summary>
 	public partial class CredentialStoreEntryFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Encrypts and stores data contained in the  JSON object. You can decrypt and access the secured data using an Arc.js application, as described in the Arc.js [Programming Patterns](https://www.mozu.com/docs/developer/arcjs-guides/programming-patterns.htm#securely_store_and_access_sensitive_data) topic.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = CredentialStoreEntryFactory.StoreCredentials(handler : handler,  credentials :  credentials,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static void StoreCredentials(ServiceClientMessageHandler handler,
 				 credentials :  credentials		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/ExternalApplicationFactory.cs b/Mozu.Api.Test/Factories/Platform/InstalledApplicationsFactory.cs
old mode 100644
new mode 100755
similarity index 77%
rename from Mozu.Api.Test/Factories/ExternalApplicationFactory.cs
rename to Mozu.Api.Test/Factories/Platform/InstalledApplicationsFactory.cs
index c634b97e..6a500277
--- a/Mozu.Api.Test/Factories/ExternalApplicationFactory.cs
+++ b/Mozu.Api.Test/Factories/Platform/InstalledApplicationsFactory.cs
@@ -18,22 +18,23 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Platform
 {
 	/// <summary>
 	/// Use the Applications resource to update and retrieve details about the applications installed for your tenant.
 	/// </summary>
-	public partial class ExternalApplicationFactory : BaseDataFactory
+	public partial class InstalledApplicationsFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves the details of the installed application specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
-		/// var result = ExternalApplicationFactory.GetApplication(handler : handler,  appId :  appId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var result = InstalledApplicationsFactory.GetApplication(handler : handler,  appId :  appId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
 		/// var optionalCasting = ConvertClass<Application/>(result); 
 		/// return optionalCasting;
 		///  </code> 
@@ -47,11 +48,11 @@ public static Mozu.Api.Contracts.InstalledApplications.Application GetApplicatio
 			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
 			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
 			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Platform.ExternalApplicationClient.GetApplicationClient(
+			var apiClient = Mozu.Api.Clients.Platform.InstalledApplicationsClient.GetApplicationClient(
 				 appId :  appId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,10 +69,10 @@ public static Mozu.Api.Contracts.InstalledApplications.Application GetApplicatio
 		}
   
 		/// <summary> 
-		/// Updates one or more properties of the application specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
-		/// var result = ExternalApplicationFactory.UpdateApplication(handler : handler,  application :  application,  appId :  appId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
+		/// var result = InstalledApplicationsFactory.UpdateApplication(handler : handler,  application :  application,  appId :  appId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
 		/// var optionalCasting = ConvertClass<Application/>(result); 
 		/// return optionalCasting;
 		///  </code> 
@@ -85,11 +86,11 @@ public static Mozu.Api.Contracts.InstalledApplications.Application UpdateApplica
 			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
 			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
 			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Platform.ExternalApplicationClient.UpdateApplicationClient(
+			var apiClient = Mozu.Api.Clients.Platform.InstalledApplicationsClient.UpdateApplicationClient(
 				 application :  application,  appId :  appId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/ReferenceDataFactory.cs b/Mozu.Api.Test/Factories/Platform/ReferenceDataFactory.cs
old mode 100644
new mode 100755
similarity index 91%
rename from Mozu.Api.Test/Factories/ReferenceDataFactory.cs
rename to Mozu.Api.Test/Factories/Platform/ReferenceDataFactory.cs
index 376d8e9c..329ca239
--- a/Mozu.Api.Test/Factories/ReferenceDataFactory.cs
+++ b/Mozu.Api.Test/Factories/Platform/ReferenceDataFactory.cs
@@ -18,19 +18,20 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Platform
 {
 	/// <summary>
-	/// The Reference resource retrieves collections of standards the  system currently supports. This includes content locales, top-level domains, units of measure, countries, currencies, time zones, and shipping or billing address schemas.
+	/// The Reference resource retrieves collections of standards the Mozu system currently supports. This includes content locales, top-level domains, units of measure, countries, currencies, time zones, and shipping or billing address schemas.
 	/// </summary>
 	public partial class ReferenceDataFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves a specific address schema based on the country code provided. This operation allows the creation of custom shipping and billing address fields.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ReferenceDataFactory.GetAddressSchema(handler : handler,  countryCode :  countryCode,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.Reference.AddressSchema GetAddressSchema(Servic
 				 countryCode :  countryCode,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.Reference.AddressSchema GetAddressSchema(Servic
 		}
   
 		/// <summary> 
-		/// Retrieves the entire list of address schemas that the system supports.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ReferenceDataFactory.GetAddressSchemas(handler : handler,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.Reference.AddressSchemaCollection GetAddressSch
 				 responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -106,7 +107,7 @@ public static Mozu.Api.Contracts.Reference.AddressSchemaCollection GetAddressSch
 		}
   
 		/// <summary> 
-		/// Retrieves the details of a behavior based on the behavior ID specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ReferenceDataFactory.GetBehavior(handler : handler,  behaviorId :  behaviorId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -127,7 +128,7 @@ public static Mozu.Api.Contracts.Core.Behavior GetBehavior(ServiceClientMessageH
 				 behaviorId :  behaviorId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -144,7 +145,7 @@ public static Mozu.Api.Contracts.Core.Behavior GetBehavior(ServiceClientMessageH
 		}
   
 		/// <summary> 
-		/// Retrieves the details of the behavior category specified in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ReferenceDataFactory.GetBehaviorCategory(handler : handler,  categoryId :  categoryId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -165,7 +166,7 @@ public static Mozu.Api.Contracts.Core.BehaviorCategory GetBehaviorCategory(Servi
 				 categoryId :  categoryId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -182,7 +183,7 @@ public static Mozu.Api.Contracts.Core.BehaviorCategory GetBehaviorCategory(Servi
 		}
   
 		/// <summary> 
-		/// Retrieves the list of behavior categories.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ReferenceDataFactory.GetBehaviorCategories(handler : handler,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -203,7 +204,7 @@ public static Mozu.Api.Contracts.Core.BehaviorCategoryCollection GetBehaviorCate
 				 responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -220,7 +221,7 @@ public static Mozu.Api.Contracts.Core.BehaviorCategoryCollection GetBehaviorCate
 		}
   
 		/// <summary> 
-		/// Retrieves a list of application behaviors.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ReferenceDataFactory.GetBehaviors(handler : handler,  userType :  userType,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -241,7 +242,7 @@ public static Mozu.Api.Contracts.Core.BehaviorCollection GetBehaviors(ServiceCli
 				 userType :  userType,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -258,7 +259,7 @@ public static Mozu.Api.Contracts.Core.BehaviorCollection GetBehaviors(ServiceCli
 		}
   
 		/// <summary> 
-		/// Retrieves the list of content locales the system supports. Content locales indicate the language used and the country where the language is used.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ReferenceDataFactory.GetContentLocales(handler : handler,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -279,7 +280,7 @@ public static Mozu.Api.Contracts.Reference.ContentLocaleCollection GetContentLoc
 				 responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -296,7 +297,7 @@ public static Mozu.Api.Contracts.Reference.ContentLocaleCollection GetContentLoc
 		}
   
 		/// <summary> 
-		/// Retrieves the entire list of countries that the system supports.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ReferenceDataFactory.GetCountries(handler : handler,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -317,7 +318,7 @@ public static Mozu.Api.Contracts.Reference.CountryCollection GetCountries(Servic
 				 responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -334,7 +335,7 @@ public static Mozu.Api.Contracts.Reference.CountryCollection GetCountries(Servic
 		}
   
 		/// <summary> 
-		/// Retrieves the entire list of countries that the system supports.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ReferenceDataFactory.GetCountriesWithStates(handler : handler,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -355,7 +356,7 @@ public static Mozu.Api.Contracts.Reference.CountryWithStatesCollection GetCountr
 				 responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -372,7 +373,7 @@ public static Mozu.Api.Contracts.Reference.CountryWithStatesCollection GetCountr
 		}
   
 		/// <summary> 
-		/// Retrieves the entire list of currencies that the system supports.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ReferenceDataFactory.GetCurrencies(handler : handler,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -393,7 +394,7 @@ public static Mozu.Api.Contracts.Reference.CurrencyCollection GetCurrencies(Serv
 				 responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -410,7 +411,7 @@ public static Mozu.Api.Contracts.Reference.CurrencyCollection GetCurrencies(Serv
 		}
   
 		/// <summary> 
-		/// Retrieves the entire list of time zones that the system supports.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ReferenceDataFactory.GetTimeZones(handler : handler,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -431,7 +432,7 @@ public static Mozu.Api.Contracts.Reference.TimeZoneCollection GetTimeZones(Servi
 				 responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -448,7 +449,7 @@ public static Mozu.Api.Contracts.Reference.TimeZoneCollection GetTimeZones(Servi
 		}
   
 		/// <summary> 
-		/// Retrieves the entire list of top-level internet domains that the system supports.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ReferenceDataFactory.GetTopLevelDomains(handler : handler,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -469,7 +470,7 @@ public static Mozu.Api.Contracts.Reference.TopLevelDomainCollection GetTopLevelD
 				 responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -486,7 +487,7 @@ public static Mozu.Api.Contracts.Reference.TopLevelDomainCollection GetTopLevelD
 		}
   
 		/// <summary> 
-		/// Retrieves an array list of all units of measure the system supports.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = ReferenceDataFactory.GetUnitsOfMeasure(handler : handler,  filter :  filter,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -507,7 +508,7 @@ public static Mozu.Api.Contracts.Reference.UnitOfMeasureCollection GetUnitsOfMea
 				 filter :  filter,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/SecureAppDataFactory.cs b/Mozu.Api.Test/Factories/Platform/SecureAppDataFactory.cs
old mode 100644
new mode 100755
similarity index 90%
rename from Mozu.Api.Test/Factories/SecureAppDataFactory.cs
rename to Mozu.Api.Test/Factories/Platform/SecureAppDataFactory.cs
index 0ae7bc3a..ee79b96f
--- a/Mozu.Api.Test/Factories/SecureAppDataFactory.cs
+++ b/Mozu.Api.Test/Factories/Platform/SecureAppDataFactory.cs
@@ -18,19 +18,20 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Platform
 {
 	/// <summary>
-	/// Manage Secure App Settings. Expose via arc.js so that arc apps can securely access secrets. Third-party extensions can also access their data. Secured via AppKey.AppId
+	/// 
 	/// </summary>
 	public partial class SecureAppDataFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// platform-secureappdata Get GetDBValue description DOCUMENT_HERE 
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = SecureAppDataFactory.GetDBValue(handler : handler,  appKeyId :  appKeyId,  dbEntryQuery :  dbEntryQuery,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static JObject GetDBValue(ServiceClientMessageHandler handler,
 				 appKeyId :  appKeyId,  dbEntryQuery :  dbEntryQuery,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static JObject GetDBValue(ServiceClientMessageHandler handler,
 		}
   
 		/// <summary> 
-		/// platform-secureappdata Post CreateDBValue description DOCUMENT_HERE 
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = SecureAppDataFactory.CreateDBValue(handler : handler,  value :  value,  appKeyId :  appKeyId,  dbEntryQuery :  dbEntryQuery,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static void CreateDBValue(ServiceClientMessageHandler handler,
 				 value :  value,  appKeyId :  appKeyId,  dbEntryQuery :  dbEntryQuery		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -105,7 +106,7 @@ public static void CreateDBValue(ServiceClientMessageHandler handler,
 		}
   
 		/// <summary> 
-		/// platform-secureappdata Put UpdateDBValue description DOCUMENT_HERE 
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = SecureAppDataFactory.UpdateDBValue(handler : handler,  value :  value,  appKeyId :  appKeyId,  dbEntryQuery :  dbEntryQuery,  expectedCode: expectedCode, successCode: successCode); 
@@ -126,7 +127,7 @@ public static void UpdateDBValue(ServiceClientMessageHandler handler,
 				 value :  value,  appKeyId :  appKeyId,  dbEntryQuery :  dbEntryQuery		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -142,7 +143,7 @@ public static void UpdateDBValue(ServiceClientMessageHandler handler,
 		}
   
 		/// <summary> 
-		/// platform-secureappdata Delete DeleteDBValue description DOCUMENT_HERE 
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = SecureAppDataFactory.DeleteDBValue(handler : handler,  appKeyId :  appKeyId,  dbEntryQuery :  dbEntryQuery,  expectedCode: expectedCode, successCode: successCode); 
@@ -163,7 +164,7 @@ public static void DeleteDBValue(ServiceClientMessageHandler handler,
 				 appKeyId :  appKeyId,  dbEntryQuery :  dbEntryQuery		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/SiteDataFactory.cs b/Mozu.Api.Test/Factories/Platform/SiteDataFactory.cs
old mode 100644
new mode 100755
similarity index 91%
rename from Mozu.Api.Test/Factories/SiteDataFactory.cs
rename to Mozu.Api.Test/Factories/Platform/SiteDataFactory.cs
index 086ef261..3306cc7f
--- a/Mozu.Api.Test/Factories/SiteDataFactory.cs
+++ b/Mozu.Api.Test/Factories/Platform/SiteDataFactory.cs
@@ -18,19 +18,20 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Platform
 {
 	/// <summary>
-	/// Use the site data resource to store site-level information required for a third-party application in the  database.
+	/// Use the site data resource to store site-level information required for a third-party application in the Mozu database.
 	/// </summary>
 	public partial class SiteDataFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves the value of a record in the  database.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = SiteDataFactory.GetDBValue(handler : handler,  dbEntryQuery :  dbEntryQuery,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static string GetDBValue(ServiceClientMessageHandler handler,
 				 dbEntryQuery :  dbEntryQuery,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static string GetDBValue(ServiceClientMessageHandler handler,
 		}
   
 		/// <summary> 
-		/// Creates a new record in the  database based on the information supplied in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = SiteDataFactory.CreateDBValue(handler : handler,  value :  value,  dbEntryQuery :  dbEntryQuery,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static void CreateDBValue(ServiceClientMessageHandler handler,
 				 value :  value,  dbEntryQuery :  dbEntryQuery		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -105,7 +106,7 @@ public static void CreateDBValue(ServiceClientMessageHandler handler,
 		}
   
 		/// <summary> 
-		/// Updates a record in the  database based on the information supplied in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = SiteDataFactory.UpdateDBValue(handler : handler,  value :  value,  dbEntryQuery :  dbEntryQuery,  expectedCode: expectedCode, successCode: successCode); 
@@ -126,7 +127,7 @@ public static void UpdateDBValue(ServiceClientMessageHandler handler,
 				 value :  value,  dbEntryQuery :  dbEntryQuery		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -142,7 +143,7 @@ public static void UpdateDBValue(ServiceClientMessageHandler handler,
 		}
   
 		/// <summary> 
-		/// Removes a previously defined record in the  database.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = SiteDataFactory.DeleteDBValue(handler : handler,  dbEntryQuery :  dbEntryQuery,  expectedCode: expectedCode, successCode: successCode); 
@@ -163,7 +164,7 @@ public static void DeleteDBValue(ServiceClientMessageHandler handler,
 				 dbEntryQuery :  dbEntryQuery		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/TenantDataFactory.cs b/Mozu.Api.Test/Factories/Platform/TenantDataFactory.cs
old mode 100644
new mode 100755
similarity index 91%
rename from Mozu.Api.Test/Factories/TenantDataFactory.cs
rename to Mozu.Api.Test/Factories/Platform/TenantDataFactory.cs
index a54ee962..a93a0d12
--- a/Mozu.Api.Test/Factories/TenantDataFactory.cs
+++ b/Mozu.Api.Test/Factories/Platform/TenantDataFactory.cs
@@ -18,19 +18,20 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Platform
 {
 	/// <summary>
-	/// Use the tenant data resource to store tenant-level information required for a third-party application in the  database.
+	/// Use the tenant data resource to store tenant-level information required for a third-party application in the Mozu database.
 	/// </summary>
 	public partial class TenantDataFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves the value of a record in the  database.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = TenantDataFactory.GetDBValue(handler : handler,  dbEntryQuery :  dbEntryQuery,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static string GetDBValue(ServiceClientMessageHandler handler,
 				 dbEntryQuery :  dbEntryQuery,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static string GetDBValue(ServiceClientMessageHandler handler,
 		}
   
 		/// <summary> 
-		/// Creates a new record in the  database based on the information supplied in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = TenantDataFactory.CreateDBValue(handler : handler,  value :  value,  dbEntryQuery :  dbEntryQuery,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static void CreateDBValue(ServiceClientMessageHandler handler,
 				 value :  value,  dbEntryQuery :  dbEntryQuery		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -105,7 +106,7 @@ public static void CreateDBValue(ServiceClientMessageHandler handler,
 		}
   
 		/// <summary> 
-		/// Updates a record in the  database based on the information supplied in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = TenantDataFactory.UpdateDBValue(handler : handler,  value :  value,  dbEntryQuery :  dbEntryQuery,  expectedCode: expectedCode, successCode: successCode); 
@@ -126,7 +127,7 @@ public static void UpdateDBValue(ServiceClientMessageHandler handler,
 				 value :  value,  dbEntryQuery :  dbEntryQuery		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -142,7 +143,7 @@ public static void UpdateDBValue(ServiceClientMessageHandler handler,
 		}
   
 		/// <summary> 
-		/// Removes a previously defined record in the  database.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = TenantDataFactory.DeleteDBValue(handler : handler,  dbEntryQuery :  dbEntryQuery,  expectedCode: expectedCode, successCode: successCode); 
@@ -163,7 +164,7 @@ public static void DeleteDBValue(ServiceClientMessageHandler handler,
 				 dbEntryQuery :  dbEntryQuery		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/TenantExtensionsFactory.cs b/Mozu.Api.Test/Factories/Platform/TenantExtensionsFactory.cs
old mode 100644
new mode 100755
similarity index 89%
rename from Mozu.Api.Test/Factories/TenantExtensionsFactory.cs
rename to Mozu.Api.Test/Factories/Platform/TenantExtensionsFactory.cs
index fbd6a944..f6260e66
--- a/Mozu.Api.Test/Factories/TenantExtensionsFactory.cs
+++ b/Mozu.Api.Test/Factories/Platform/TenantExtensionsFactory.cs
@@ -18,19 +18,20 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Platform
 {
 	/// <summary>
-	/// Use the Extensions resource to manage Arc.js configuration settings. These are the same settings you can configure through  in the Action Management JSON Editor.
+	/// 
 	/// </summary>
 	public partial class TenantExtensionsFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves the Arc.js configuration settings for a site.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = TenantExtensionsFactory.GetExtensions(handler : handler,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.InstalledApplications.TenantExtensions GetExten
 				 responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static Mozu.Api.Contracts.InstalledApplications.TenantExtensions GetExten
 		}
   
 		/// <summary> 
-		/// Updates the Arc.js configuration settings for a site.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = TenantExtensionsFactory.UpdateExtensions(handler : handler,  extensions :  extensions,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static Mozu.Api.Contracts.InstalledApplications.TenantExtensions UpdateEx
 				 extensions :  extensions,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/TenantFactory.cs b/Mozu.Api.Test/Factories/Platform/TenantFactory.cs
old mode 100644
new mode 100755
similarity index 90%
rename from Mozu.Api.Test/Factories/TenantFactory.cs
rename to Mozu.Api.Test/Factories/Platform/TenantFactory.cs
index a9f7b791..d6ec5e5b
--- a/Mozu.Api.Test/Factories/TenantFactory.cs
+++ b/Mozu.Api.Test/Factories/Platform/TenantFactory.cs
@@ -18,19 +18,20 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Platform
 {
 	/// <summary>
-	/// Use the tenants resource to manage information about a  tenant.
+	/// Use the tenants resource to manage information about a Mozu tenant.
 	/// </summary>
 	public partial class TenantFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieve details about a specific tenant by providing the tenant ID.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = TenantFactory.GetTenant(handler : handler,  tenantId :  tenantId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static Mozu.Api.Contracts.Tenant.Tenant GetTenant(ServiceClientMessageHan
 				 tenantId :  tenantId,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/UserDataFactory.cs b/Mozu.Api.Test/Factories/Platform/UserDataFactory.cs
old mode 100644
new mode 100755
similarity index 91%
rename from Mozu.Api.Test/Factories/UserDataFactory.cs
rename to Mozu.Api.Test/Factories/Platform/UserDataFactory.cs
index 0f83c658..8613c8b6
--- a/Mozu.Api.Test/Factories/UserDataFactory.cs
+++ b/Mozu.Api.Test/Factories/Platform/UserDataFactory.cs
@@ -18,19 +18,20 @@
 using Mozu.Api.Test.Helpers;
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 #endregion
 
-namespace Mozu.Api.Test.Factories
+namespace Mozu.Api.Test.Factories.Platform
 {
 	/// <summary>
-	/// Use the user data subresource to store user-level data required for a third-party application in the  database.
+	/// Use the user data subresource to store user-level data required for a third-party application in the Mozu database.
 	/// </summary>
 	public partial class UserDataFactory : BaseDataFactory
 	{
 
 		/// <summary> 
-		/// Retrieves the value of a record in the  database.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = UserDataFactory.GetDBValue(handler : handler,  dbEntryQuery :  dbEntryQuery,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
@@ -51,7 +52,7 @@ public static string GetDBValue(ServiceClientMessageHandler handler,
 				 dbEntryQuery :  dbEntryQuery,  responseFields :  responseFields		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -68,7 +69,7 @@ public static string GetDBValue(ServiceClientMessageHandler handler,
 		}
   
 		/// <summary> 
-		/// Creates a new record in the  database based on the information supplied in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = UserDataFactory.CreateDBValue(handler : handler,  value :  value,  dbEntryQuery :  dbEntryQuery,  expectedCode: expectedCode, successCode: successCode); 
@@ -89,7 +90,7 @@ public static void CreateDBValue(ServiceClientMessageHandler handler,
 				 value :  value,  dbEntryQuery :  dbEntryQuery		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -105,7 +106,7 @@ public static void CreateDBValue(ServiceClientMessageHandler handler,
 		}
   
 		/// <summary> 
-		/// Updates a record in the  database based on the information supplied in the request.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = UserDataFactory.UpdateDBValue(handler : handler,  value :  value,  dbEntryQuery :  dbEntryQuery,  expectedCode: expectedCode, successCode: successCode); 
@@ -126,7 +127,7 @@ public static void UpdateDBValue(ServiceClientMessageHandler handler,
 				 value :  value,  dbEntryQuery :  dbEntryQuery		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
@@ -142,7 +143,7 @@ public static void UpdateDBValue(ServiceClientMessageHandler handler,
 		}
   
 		/// <summary> 
-		/// Removes a previously defined record in the  database.
+		/// 
 		/// <example> 
 		///  <code> 
 		/// var result = UserDataFactory.DeleteDBValue(handler : handler,  dbEntryQuery :  dbEntryQuery,  expectedCode: expectedCode, successCode: successCode); 
@@ -163,7 +164,7 @@ public static void DeleteDBValue(ServiceClientMessageHandler handler,
 				 dbEntryQuery :  dbEntryQuery		);
 			try
 			{
-				apiClient.WithContext(handler.ApiContext).Execute();
+				apiClient.WithContext(handler.ApiContext).ExecuteAsync(default(CancellationToken)).Wait();
 			}
 			catch (ApiException ex)
 			{
diff --git a/Mozu.Api.Test/Factories/PublicAdminAuthTicketFactory.cs b/Mozu.Api.Test/Factories/PublicAdminAuthTicketFactory.cs
deleted file mode 100644
index 9d595cb5..00000000
--- a/Mozu.Api.Test/Factories/PublicAdminAuthTicketFactory.cs
+++ /dev/null
@@ -1,150 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.     
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-#region Usings Setup
-
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Net;
-using Mozu.Api;
-using Mozu.Api.Security;
-using Mozu.Api.Test.Helpers;
-using System.Diagnostics;
-using Newtonsoft.Json.Linq;
-
-#endregion
-
-namespace Mozu.Api.Test.Factories
-{
-	/// <summary>
-	/// Use the Admin User authentication tickets resource to generate and refresh authentication tickets that enable Mozu administrator or developer account users to access development or production tenants.
-	/// </summary>
-	public partial class PublicAdminAuthTicketFactory : BaseDataFactory
-	{
-
-		/// <summary> 
-		/// Creates an authentication ticket for the supplied user to specify in API requests associated with the supplied tenant.
-		/// <example> 
-		///  <code> 
-		/// var result = PublicAdminAuthTicketFactory.CreateUserAuthTicket(handler : handler,  userAuthInfo :  userAuthInfo,  tenantId :  tenantId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<TenantAdminUserAuthTicket/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.AdminUser.TenantAdminUserAuthTicket CreateUserAuthTicket(ServiceClientMessageHandler handler, 
- 		 Mozu.Api.Contracts.Core.UserAuthInfo userAuthInfo, int? tenantId = null, string responseFields = null, 
-		 HttpStatusCode expectedCode = HttpStatusCode.Created, HttpStatusCode successCode = HttpStatusCode.Created)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Platform.Adminuser.TenantAdminUserAuthTicketClient.CreateUserAuthTicketClient(
-				 userAuthInfo :  userAuthInfo,  tenantId :  tenantId,  responseFields :  responseFields		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-		/// <summary> 
-		/// Generates a new user authentication ticket for the specified tenant by supplying the user's existing refresh token information.
-		/// <example> 
-		///  <code> 
-		/// var result = PublicAdminAuthTicketFactory.RefreshAuthTicket(handler : handler,  existingAuthTicket :  existingAuthTicket,  tenantId :  tenantId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<TenantAdminUserAuthTicket/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.AdminUser.TenantAdminUserAuthTicket RefreshAuthTicket(ServiceClientMessageHandler handler, 
- 		 Mozu.Api.Contracts.AdminUser.TenantAdminUserAuthTicket existingAuthTicket, int? tenantId = null, string responseFields = null, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Platform.Adminuser.TenantAdminUserAuthTicketClient.RefreshAuthTicketClient(
-				 existingAuthTicket :  existingAuthTicket,  tenantId :  tenantId,  responseFields :  responseFields		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-		/// <summary> 
-		/// Deletes the authentication ticket for the user by supplying the refresh token.
-		/// <example> 
-		///  <code> 
-		/// var result = PublicAdminAuthTicketFactory.DeleteUserAuthTicket(handler : handler,  refreshToken :  refreshToken,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<void/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static void DeleteUserAuthTicket(ServiceClientMessageHandler handler, 
- 		string refreshToken, 
-		 HttpStatusCode expectedCode = HttpStatusCode.NoContent, HttpStatusCode successCode = HttpStatusCode.NoContent)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Platform.Adminuser.TenantAdminUserAuthTicketClient.DeleteUserAuthTicketClient(
-				 refreshToken :  refreshToken		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-			}
-			var noResponse = ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-
-	}
-
-}
-
-
diff --git a/Mozu.Api.Test/Factories/PublicApplicationFactory.cs b/Mozu.Api.Test/Factories/PublicApplicationFactory.cs
deleted file mode 100644
index acd5b373..00000000
--- a/Mozu.Api.Test/Factories/PublicApplicationFactory.cs
+++ /dev/null
@@ -1,302 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.     
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-#region Usings Setup
-
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Net;
-using Mozu.Api;
-using Mozu.Api.Security;
-using Mozu.Api.Test.Helpers;
-using System.Diagnostics;
-using Newtonsoft.Json.Linq;
-
-#endregion
-
-namespace Mozu.Api.Test.Factories
-{
-	/// <summary>
-	/// platform/developer related resources. DOCUMENT_HERE 
-	/// </summary>
-	public partial class PublicApplicationFactory : BaseDataFactory
-	{
-
-		/// <summary> 
-		/// platform-developer Get GetAppPackageNames description DOCUMENT_HERE 
-		/// <example> 
-		///  <code> 
-		/// var result = PublicApplicationFactory.GetAppPackageNames(handler : handler,  applicationKey :  applicationKey,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<PackageNamesCollection/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.AppDev.PackageNamesCollection GetAppPackageNames(ServiceClientMessageHandler handler, 
- 		 string applicationKey, string responseFields = null, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Platform.ApplicationClient.GetAppPackageNamesClient(
-				 applicationKey :  applicationKey,  responseFields :  responseFields		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-		/// <summary> 
-		/// platform-developer Get GetAppVersions description DOCUMENT_HERE 
-		/// <example> 
-		///  <code> 
-		/// var result = PublicApplicationFactory.GetAppVersions(handler : handler,  nsAndAppId :  nsAndAppId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<ApplicationVersionsCollection/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.AppDev.ApplicationVersionsCollection GetAppVersions(ServiceClientMessageHandler handler, 
- 		 string nsAndAppId, string responseFields = null, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Platform.ApplicationClient.GetAppVersionsClient(
-				 nsAndAppId :  nsAndAppId,  responseFields :  responseFields		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-		/// <summary> 
-		/// platform-developer Get GetPackageFileMetadata description DOCUMENT_HERE 
-		/// <example> 
-		///  <code> 
-		/// var result = PublicApplicationFactory.GetPackageFileMetadata(handler : handler,  applicationKey :  applicationKey,  filepath :  filepath,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<FileMetadata/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.AppDev.FileMetadata GetPackageFileMetadata(ServiceClientMessageHandler handler, 
- 		 string applicationKey, string filepath, string responseFields = null, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Platform.ApplicationClient.GetPackageFileMetadataClient(
-				 applicationKey :  applicationKey,  filepath :  filepath,  responseFields :  responseFields		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-		/// <summary> 
-		/// platform-developer Get GetPackageMetadata description DOCUMENT_HERE 
-		/// <example> 
-		///  <code> 
-		/// var result = PublicApplicationFactory.GetPackageMetadata(handler : handler,  applicationKey :  applicationKey,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<FolderMetadata/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.AppDev.FolderMetadata GetPackageMetadata(ServiceClientMessageHandler handler, 
- 		 string applicationKey, string responseFields = null, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Platform.ApplicationClient.GetPackageMetadataClient(
-				 applicationKey :  applicationKey,  responseFields :  responseFields		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-		/// <summary> 
-		/// platform-developer Post UpsertPackageFile description DOCUMENT_HERE 
-		/// <example> 
-		///  <code> 
-		/// var result = PublicApplicationFactory.UpsertPackageFile(handler : handler,  stream :  stream,  applicationKey :  applicationKey,  filepath :  filepath,  lastModifiedTime :  lastModifiedTime,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<FileMetadata/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.AppDev.FileMetadata UpsertPackageFile(ServiceClientMessageHandler handler, 
- 		 System.IO.Stream stream, string applicationKey, string filepath, string lastModifiedTime = null, string responseFields = null, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Platform.ApplicationClient.UpsertPackageFileClient(
-				 stream :  stream,  applicationKey :  applicationKey,  filepath :  filepath,  lastModifiedTime :  lastModifiedTime,  responseFields :  responseFields		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-		/// <summary> 
-		/// platform-developer Post RenamePackageFile description DOCUMENT_HERE 
-		/// <example> 
-		///  <code> 
-		/// var result = PublicApplicationFactory.RenamePackageFile(handler : handler,  renameInfo :  renameInfo,  applicationKey :  applicationKey,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<FileMetadata/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.AppDev.FileMetadata RenamePackageFile(ServiceClientMessageHandler handler, 
- 		 Mozu.Api.Contracts.AppDev.RenameInfo renameInfo, string applicationKey, string responseFields = null, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Platform.ApplicationClient.RenamePackageFileClient(
-				 renameInfo :  renameInfo,  applicationKey :  applicationKey,  responseFields :  responseFields		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-		/// <summary> 
-		/// platform-developer Delete DeletePackageFile description DOCUMENT_HERE 
-		/// <example> 
-		///  <code> 
-		/// var result = PublicApplicationFactory.DeletePackageFile(handler : handler,  applicationKey :  applicationKey,  filepath :  filepath,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<void/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static void DeletePackageFile(ServiceClientMessageHandler handler, 
- 		string applicationKey, string filepath, 
-		 HttpStatusCode expectedCode = HttpStatusCode.NoContent, HttpStatusCode successCode = HttpStatusCode.NoContent)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Platform.ApplicationClient.DeletePackageFileClient(
-				 applicationKey :  applicationKey,  filepath :  filepath		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-			}
-			var noResponse = ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-
-	}
-
-}
-
-
diff --git a/Mozu.Api.Test/Factories/PublicDeveloperAdminAuthTicketFactory.cs b/Mozu.Api.Test/Factories/PublicDeveloperAdminAuthTicketFactory.cs
deleted file mode 100644
index d5a003d6..00000000
--- a/Mozu.Api.Test/Factories/PublicDeveloperAdminAuthTicketFactory.cs
+++ /dev/null
@@ -1,150 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.     
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-#region Usings Setup
-
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Net;
-using Mozu.Api;
-using Mozu.Api.Security;
-using Mozu.Api.Test.Helpers;
-using System.Diagnostics;
-using Newtonsoft.Json.Linq;
-
-#endregion
-
-namespace Mozu.Api.Test.Factories
-{
-	/// <summary>
-	/// Use the Authtickets resource to manage authentication tickets for your developer account.
-	/// </summary>
-	public partial class PublicDeveloperAdminAuthTicketFactory : BaseDataFactory
-	{
-
-		/// <summary> 
-		/// Generate an authentication ticket for a developer account.
-		/// <example> 
-		///  <code> 
-		/// var result = PublicDeveloperAdminAuthTicketFactory.CreateDeveloperUserAuthTicket(handler : handler,  userAuthInfo :  userAuthInfo,  developerAccountId :  developerAccountId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<DeveloperAdminUserAuthTicket/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.AdminUser.DeveloperAdminUserAuthTicket CreateDeveloperUserAuthTicket(ServiceClientMessageHandler handler, 
- 		 Mozu.Api.Contracts.Core.UserAuthInfo userAuthInfo, int? developerAccountId = null, string responseFields = null, 
-		 HttpStatusCode expectedCode = HttpStatusCode.Created, HttpStatusCode successCode = HttpStatusCode.Created)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Platform.Developer.DeveloperAdminUserAuthTicketClient.CreateDeveloperUserAuthTicketClient(
-				 userAuthInfo :  userAuthInfo,  developerAccountId :  developerAccountId,  responseFields :  responseFields		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-		/// <summary> 
-		/// Generates a new developer account authentication ticket for the specified tenant by supplying the defined refresh token information.
-		/// <example> 
-		///  <code> 
-		/// var result = PublicDeveloperAdminAuthTicketFactory.RefreshDeveloperAuthTicket(handler : handler,  existingAuthTicket :  existingAuthTicket,  developerAccountId :  developerAccountId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<DeveloperAdminUserAuthTicket/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.AdminUser.DeveloperAdminUserAuthTicket RefreshDeveloperAuthTicket(ServiceClientMessageHandler handler, 
- 		 Mozu.Api.Contracts.AdminUser.DeveloperAdminUserAuthTicket existingAuthTicket, int? developerAccountId = null, string responseFields = null, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Platform.Developer.DeveloperAdminUserAuthTicketClient.RefreshDeveloperAuthTicketClient(
-				 existingAuthTicket :  existingAuthTicket,  developerAccountId :  developerAccountId,  responseFields :  responseFields		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-		/// <summary> 
-		/// Deletes the authentication ticket for the developer account by supplying the refresh token.
-		/// <example> 
-		///  <code> 
-		/// var result = PublicDeveloperAdminAuthTicketFactory.DeleteUserAuthTicket(handler : handler,  refreshToken :  refreshToken,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<void/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static void DeleteUserAuthTicket(ServiceClientMessageHandler handler, 
- 		string refreshToken, 
-		 HttpStatusCode expectedCode = HttpStatusCode.NoContent, HttpStatusCode successCode = HttpStatusCode.NoContent)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Platform.Developer.DeveloperAdminUserAuthTicketClient.DeleteUserAuthTicketClient(
-				 refreshToken :  refreshToken		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-			}
-			var noResponse = ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-
-	}
-
-}
-
-
diff --git a/Mozu.Api.Test/Factories/ShippingSettingFactory.cs b/Mozu.Api.Test/Factories/ShippingSettingFactory.cs
deleted file mode 100644
index 2e4bb887..00000000
--- a/Mozu.Api.Test/Factories/ShippingSettingFactory.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.     
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-#region Usings Setup
-
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Net;
-using Mozu.Api;
-using Mozu.Api.Security;
-using Mozu.Api.Test.Helpers;
-using System.Diagnostics;
-using Newtonsoft.Json.Linq;
-
-#endregion
-
-namespace Mozu.Api.Test.Factories
-{
-	/// <summary>
-	/// Use the shipping subresource to manage settings for the site shipping information, such as origin address information, carrier shipping methods, shipping rate providers, and regions available for shipping.
-	/// </summary>
-	public partial class ShippingSettingFactory : BaseDataFactory
-	{
-
-		/// <summary> 
-		/// Retrieves a list of the shipping settings configured for a site.
-		/// <example> 
-		///  <code> 
-		/// var result = ShippingSettingFactory.GetSiteShippingSettings(handler : handler,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<SiteShippingSettings/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.SiteSettings.Shipping.SiteShippingSettings GetSiteShippingSettings(ServiceClientMessageHandler handler, 
- 		 string responseFields = null, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Commerce.Settings.SiteShippingSettingsClient.GetSiteShippingSettingsClient(
-				 responseFields :  responseFields		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-
-	}
-
-}
-
-
diff --git a/Mozu.Api.Test/Factories/ShippingSettingsFactory.cs b/Mozu.Api.Test/Factories/ShippingSettingsFactory.cs
deleted file mode 100644
index c06976e4..00000000
--- a/Mozu.Api.Test/Factories/ShippingSettingsFactory.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.     
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-#region Usings Setup
-
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Net;
-using Mozu.Api;
-using Mozu.Api.Security;
-using Mozu.Api.Test.Helpers;
-using System.Diagnostics;
-using Newtonsoft.Json.Linq;
-
-#endregion
-
-namespace Mozu.Api.Test.Factories
-{
-	/// <summary>
-	/// Use the shipping subresource to manage settings for the site shipping information, such as origin address information, carrier shipping methods, shipping rate providers, and regions available for shipping.
-	/// </summary>
-	public partial class ShippingSettingsFactory : BaseDataFactory
-	{
-
-		/// <summary> 
-		/// Retrieves a list of the shipping settings configured for a site.
-		/// <example> 
-		///  <code> 
-		/// var result = ShippingSettingsFactory.GetSiteShippingSettings(handler : handler,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<SiteShippingSettings/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.SiteSettings.Shipping.SiteShippingSettings GetSiteShippingSettings(ServiceClientMessageHandler handler, 
- 		 string responseFields = null, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Commerce.Settings.ShippingSettingsClient.GetSiteShippingSettingsClient(
-				 responseFields :  responseFields		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-
-	}
-
-}
-
-
diff --git a/Mozu.Api.Test/Factories/SiteSettingsApplicationFactory.cs b/Mozu.Api.Test/Factories/SiteSettingsApplicationFactory.cs
deleted file mode 100644
index 5c6ad637..00000000
--- a/Mozu.Api.Test/Factories/SiteSettingsApplicationFactory.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.     
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-#region Usings Setup
-
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Net;
-using Mozu.Api;
-using Mozu.Api.Security;
-using Mozu.Api.Test.Helpers;
-using System.Diagnostics;
-using Newtonsoft.Json.Linq;
-
-#endregion
-
-namespace Mozu.Api.Test.Factories
-{
-	/// <summary>
-	/// Use the Applications resource to update site-specific settings for installed applications.
-	/// </summary>
-	public partial class SiteSettingsApplicationFactory : BaseDataFactory
-	{
-
-		/// <summary> 
-		/// Retrieve the settings of a third-party application.
-		/// <example> 
-		///  <code> 
-		/// var result = SiteSettingsApplicationFactory.ThirdPartyGetApplication(handler : handler,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<Application/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.SiteSettings.Application.Application ThirdPartyGetApplication(ServiceClientMessageHandler handler, 
- 		 string responseFields = null, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Commerce.Settings.ApplicationClient.ThirdPartyGetApplicationClient(
-				 responseFields :  responseFields		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-		/// <summary> 
-		/// Initializes an application with the necessary configured settings.
-		/// <example> 
-		///  <code> 
-		/// var result = SiteSettingsApplicationFactory.ThirdPartyUpdateApplication(handler : handler,  application :  application,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<Application/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.SiteSettings.Application.Application ThirdPartyUpdateApplication(ServiceClientMessageHandler handler, 
- 		 Mozu.Api.Contracts.SiteSettings.Application.Application application, string responseFields = null, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Commerce.Settings.ApplicationClient.ThirdPartyUpdateApplicationClient(
-				 application :  application,  responseFields :  responseFields		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-
-	}
-
-}
-
-
diff --git a/Mozu.Api.Test/Factories/SiteSettingsApplicationsFactory.cs b/Mozu.Api.Test/Factories/SiteSettingsApplicationsFactory.cs
deleted file mode 100644
index 06e9f1d2..00000000
--- a/Mozu.Api.Test/Factories/SiteSettingsApplicationsFactory.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.     
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-#region Usings Setup
-
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Net;
-using Mozu.Api;
-using Mozu.Api.Security;
-using Mozu.Api.Test.Helpers;
-using System.Diagnostics;
-using Newtonsoft.Json.Linq;
-
-#endregion
-
-namespace Mozu.Api.Test.Factories
-{
-	/// <summary>
-	/// Use the Applications resource to update site-specific settings for installed applications.
-	/// </summary>
-	public partial class SiteSettingsApplicationsFactory : BaseDataFactory
-	{
-
-		/// <summary> 
-		/// Retrieve the settings of a third-party application.
-		/// <example> 
-		///  <code> 
-		/// var result = SiteSettingsApplicationsFactory.ThirdPartyGetApplication(handler : handler,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<Application/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.SiteSettings.Application.Application ThirdPartyGetApplication(ServiceClientMessageHandler handler, 
- 		 string responseFields = null, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Commerce.Settings.SiteSettingsApplicationsClient.ThirdPartyGetApplicationClient(
-				 responseFields :  responseFields		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-		/// <summary> 
-		/// Initializes an application with the necessary configured settings.
-		/// <example> 
-		///  <code> 
-		/// var result = SiteSettingsApplicationsFactory.ThirdPartyUpdateApplication(handler : handler,  application :  application,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<Application/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.SiteSettings.Application.Application ThirdPartyUpdateApplication(ServiceClientMessageHandler handler, 
- 		 Mozu.Api.Contracts.SiteSettings.Application.Application application, string responseFields = null, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Commerce.Settings.SiteSettingsApplicationsClient.ThirdPartyUpdateApplicationClient(
-				 application :  application,  responseFields :  responseFields		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-
-	}
-
-}
-
-
diff --git a/Mozu.Api.Test/Factories/StorefrontObjectFactory.cs b/Mozu.Api.Test/Factories/StorefrontObjectFactory.cs
deleted file mode 100644
index b059c6e9..00000000
--- a/Mozu.Api.Test/Factories/StorefrontObjectFactory.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.     
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-#region Usings Setup
-
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Net;
-using Mozu.Api;
-using Mozu.Api.Security;
-using Mozu.Api.Test.Helpers;
-using System.Diagnostics;
-
-#endregion
-
-namespace Mozu.Api.Test.Factories
-{
-	/// <summary>
-	/// 
-	/// </summary>
-	public partial class StorefrontObjectFactory : BaseDataFactory
-	{
-
-		/// <summary> 
-		/// 
-		/// <example> 
-		///  <code> 
-		/// var result = ObjectFactory.GetRates(handler : handler,  rateRequest :  rateRequest,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<RatesResponse/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.ShippingRuntime.RatesResponse GetRates(ServiceClientMessageHandler handler, 
- 		 Mozu.Api.Contracts.ShippingRuntime.RateRequest rateRequest, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Commerce.Catalog.Storefront.ObjectClient.GetRatesClient(
-				 rateRequest :  rateRequest		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-
-	}
-
-}
-
-
diff --git a/Mozu.Api.Test/Factories/StorefrontProductRuntimeFactory.cs b/Mozu.Api.Test/Factories/StorefrontProductRuntimeFactory.cs
deleted file mode 100644
index cb3af82a..00000000
--- a/Mozu.Api.Test/Factories/StorefrontProductRuntimeFactory.cs
+++ /dev/null
@@ -1,303 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.     
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-#region Usings Setup
-
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Net;
-using Mozu.Api;
-using Mozu.Api.Security;
-using Mozu.Api.Test.Helpers;
-using System.Diagnostics;
-using Newtonsoft.Json.Linq;
-
-#endregion
-
-namespace Mozu.Api.Test.Factories
-{
-	/// <summary>
-	/// Use the Storefront Products  resource to manage the shopper product selection process during a visit to the web storefront. You can update product options as shoppers pick and choose their product choices. A shopper cannot add a product to a cart until all of its required options have been selected.
-	/// </summary>
-	public partial class StorefrontProductRuntimeFactory : BaseDataFactory
-	{
-
-		/// <summary> 
-		/// Retrieves a list of products that appear on the web storefront according to any specified filter criteria and sort options.
-		/// <example> 
-		///  <code> 
-		/// var result = ProductRuntimeFactory.GetProducts(handler : handler,  filter :  filter,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<ProductCollection/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.ProductRuntime.ProductCollection GetProducts(ServiceClientMessageHandler handler, 
- 		 string filter = null, int? startIndex = null, int? pageSize = null, string sortBy = null, string responseFields = null,  DataViewMode dataViewMode= DataViewMode.Live, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Commerce.Catalog.Storefront.ProductClient.GetProductsClient(
-				 filter :  filter,  startIndex :  startIndex,  pageSize :  pageSize,  sortBy :  sortBy,  responseFields :  responseFields, dataViewMode: dataViewMode		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-		/// <summary> 
-		/// Retrieves the active inventory level information associated with the product or location specified in the request.
-		/// <example> 
-		///  <code> 
-		/// var result = ProductRuntimeFactory.GetProductInventory(handler : handler,  productCode :  productCode,  locationCodes :  locationCodes,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<LocationInventoryCollection/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.ProductRuntime.LocationInventoryCollection GetProductInventory(ServiceClientMessageHandler handler, 
- 		 string productCode, string locationCodes = null, string responseFields = null,  DataViewMode dataViewMode= DataViewMode.Live, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Commerce.Catalog.Storefront.ProductClient.GetProductInventoryClient(
-				 productCode :  productCode,  locationCodes :  locationCodes,  responseFields :  responseFields, dataViewMode: dataViewMode		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-		/// <summary> 
-		/// Retrieves information about a single product given its product code.
-		/// <example> 
-		///  <code> 
-		/// var result = ProductRuntimeFactory.GetProduct(handler : handler,  productCode :  productCode,  variationProductCode :  variationProductCode,  allowInactive :  allowInactive,  skipInventoryCheck :  skipInventoryCheck,  supressOutOfStock404 :  supressOutOfStock404,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<Product/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.ProductRuntime.Product GetProduct(ServiceClientMessageHandler handler, 
- 		 string productCode, string variationProductCode = null, bool? allowInactive = null, bool? skipInventoryCheck = null, bool? supressOutOfStock404 = null, string responseFields = null,  DataViewMode dataViewMode= DataViewMode.Live, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Commerce.Catalog.Storefront.ProductClient.GetProductClient(
-				 productCode :  productCode,  variationProductCode :  variationProductCode,  allowInactive :  allowInactive,  skipInventoryCheck :  skipInventoryCheck,  supressOutOfStock404 :  supressOutOfStock404,  responseFields :  responseFields, dataViewMode: dataViewMode		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-		/// <summary> 
-		/// Creates a new product configuration each time a shopper selects a product option value. After the shopper defines values for all required product options, the shopper can add the product configuration to a cart.
-		/// <example> 
-		///  <code> 
-		/// var result = ProductRuntimeFactory.ConfiguredProduct(handler : handler,  productOptionSelections :  productOptionSelections,  productCode :  productCode,  includeOptionDetails :  includeOptionDetails,  skipInventoryCheck :  skipInventoryCheck,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<ConfiguredProduct/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.ProductRuntime.ConfiguredProduct ConfiguredProduct(ServiceClientMessageHandler handler, 
- 		 Mozu.Api.Contracts.ProductRuntime.ProductOptionSelections productOptionSelections, string productCode, bool? includeOptionDetails = null, bool? skipInventoryCheck = null, string responseFields = null, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Commerce.Catalog.Storefront.ProductClient.ConfiguredProductClient(
-				 productOptionSelections :  productOptionSelections,  productCode :  productCode,  includeOptionDetails :  includeOptionDetails,  skipInventoryCheck :  skipInventoryCheck,  responseFields :  responseFields		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-		/// <summary> 
-		/// Validate the final state of shopper-selected options.
-		/// <example> 
-		///  <code> 
-		/// var result = ProductRuntimeFactory.ValidateProduct(handler : handler,  productOptionSelections :  productOptionSelections,  productCode :  productCode,  skipInventoryCheck :  skipInventoryCheck,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<ProductValidationSummary/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.ProductRuntime.ProductValidationSummary ValidateProduct(ServiceClientMessageHandler handler, 
- 		 Mozu.Api.Contracts.ProductRuntime.ProductOptionSelections productOptionSelections, string productCode, bool? skipInventoryCheck = null, string responseFields = null, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Commerce.Catalog.Storefront.ProductClient.ValidateProductClient(
-				 productOptionSelections :  productOptionSelections,  productCode :  productCode,  skipInventoryCheck :  skipInventoryCheck,  responseFields :  responseFields		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-		/// <summary> 
-		/// Evaluates whether a collection of discounts specified in the request can be redeemed for the supplied product code.
-		/// <example> 
-		///  <code> 
-		/// var result = ProductRuntimeFactory.ValidateDiscounts(handler : handler,  discountSelections :  discountSelections,  productCode :  productCode,  variationProductCode :  variationProductCode,  customerAccountId :  customerAccountId,  allowInactive :  allowInactive,  skipInventoryCheck :  skipInventoryCheck,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<DiscountValidationSummary/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.ProductRuntime.DiscountValidationSummary ValidateDiscounts(ServiceClientMessageHandler handler, 
- 		 Mozu.Api.Contracts.ProductRuntime.DiscountSelections discountSelections, string productCode, string variationProductCode = null, int? customerAccountId = null, bool? allowInactive = null, bool? skipInventoryCheck = null, string responseFields = null, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Commerce.Catalog.Storefront.ProductClient.ValidateDiscountsClient(
-				 discountSelections :  discountSelections,  productCode :  productCode,  variationProductCode :  variationProductCode,  customerAccountId :  customerAccountId,  allowInactive :  allowInactive,  skipInventoryCheck :  skipInventoryCheck,  responseFields :  responseFields		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-		/// <summary> 
-		/// Retrieves product inventories for the storefront displayed products.
-		/// <example> 
-		///  <code> 
-		/// var result = ProductRuntimeFactory.GetProductInventories(handler : handler,  query :  query,  responseFields :  responseFields,  dataViewMode: dataViewMode,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<LocationInventoryCollection/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.ProductRuntime.LocationInventoryCollection GetProductInventories(ServiceClientMessageHandler handler, 
- 		 Mozu.Api.Contracts.ProductRuntime.LocationInventoryQuery query, string responseFields = null,  DataViewMode dataViewMode= DataViewMode.Live, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Commerce.Catalog.Storefront.ProductClient.GetProductInventoriesClient(
-				 query :  query,  responseFields :  responseFields, dataViewMode: dataViewMode		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-
-	}
-
-}
-
-
diff --git a/Mozu.Api.Test/Factories/StorefrontProductSearchFactory.cs b/Mozu.Api.Test/Factories/StorefrontProductSearchFactory.cs
deleted file mode 100644
index d462fd76..00000000
--- a/Mozu.Api.Test/Factories/StorefrontProductSearchFactory.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.     
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-#region Usings Setup
-
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Net;
-using Mozu.Api;
-using Mozu.Api.Security;
-using Mozu.Api.Test.Helpers;
-using System.Diagnostics;
-using Newtonsoft.Json.Linq;
-
-#endregion
-
-namespace Mozu.Api.Test.Factories
-{
-	/// <summary>
-	/// Use the Product Search resource to provide dynamic search results to shoppers as they browse and search for products on the web storefront, and to suggest possible search terms as the shopper enters text.
-	/// </summary>
-	public partial class StorefrontProductSearchFactory : BaseDataFactory
-	{
-
-		/// <summary> 
-		/// Searches the categories displayed on the web storefront for products or product options that the shopper types in a search query.
-		/// <example> 
-		///  <code> 
-		/// var result = ProductSearchFactory.Search(handler : handler,  query :  query,  filter :  filter,  facetTemplate :  facetTemplate,  facetTemplateSubset :  facetTemplateSubset,  facet :  facet,  facetFieldRangeQuery :  facetFieldRangeQuery,  facetHierPrefix :  facetHierPrefix,  facetHierValue :  facetHierValue,  facetHierDepth :  facetHierDepth,  facetStartIndex :  facetStartIndex,  facetPageSize :  facetPageSize,  facetSettings :  facetSettings,  facetValueFilter :  facetValueFilter,  sortBy :  sortBy,  pageSize :  pageSize,  startIndex :  startIndex,  searchSettings :  searchSettings,  enableSearchTuningRules :  enableSearchTuningRules,  searchTuningRuleContext :  searchTuningRuleContext,  searchTuningRuleCode :  searchTuningRuleCode,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<ProductSearchResult/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.ProductRuntime.ProductSearchResult Search(ServiceClientMessageHandler handler, 
- 		 string query = null, string filter = null, string facetTemplate = null, string facetTemplateSubset = null, string facet = null, string facetFieldRangeQuery = null, string facetHierPrefix = null, string facetHierValue = null, string facetHierDepth = null, string facetStartIndex = null, string facetPageSize = null, string facetSettings = null, string facetValueFilter = null, string sortBy = null, int? pageSize = null, int? startIndex = null, string searchSettings = null, bool? enableSearchTuningRules = null, string searchTuningRuleContext = null, string searchTuningRuleCode = null, string responseFields = null, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Commerce.Catalog.Storefront.ProductSearchResultClient.SearchClient(
-				 query :  query,  filter :  filter,  facetTemplate :  facetTemplate,  facetTemplateSubset :  facetTemplateSubset,  facet :  facet,  facetFieldRangeQuery :  facetFieldRangeQuery,  facetHierPrefix :  facetHierPrefix,  facetHierValue :  facetHierValue,  facetHierDepth :  facetHierDepth,  facetStartIndex :  facetStartIndex,  facetPageSize :  facetPageSize,  facetSettings :  facetSettings,  facetValueFilter :  facetValueFilter,  sortBy :  sortBy,  pageSize :  pageSize,  startIndex :  startIndex,  searchSettings :  searchSettings,  enableSearchTuningRules :  enableSearchTuningRules,  searchTuningRuleContext :  searchTuningRuleContext,  searchTuningRuleCode :  searchTuningRuleCode,  responseFields :  responseFields		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-		/// <summary> 
-		/// Suggests possible search terms as the shopper enters search text.
-		/// <example> 
-		///  <code> 
-		/// var result = ProductSearchFactory.Suggest(handler : handler,  query :  query,  groups :  groups,  pageSize :  pageSize,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<SearchSuggestionResult/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.ProductRuntime.SearchSuggestionResult Suggest(ServiceClientMessageHandler handler, 
- 		 string query = null, string groups = null, int? pageSize = null, string responseFields = null, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Commerce.Catalog.Storefront.ProductSearchResultClient.SuggestClient(
-				 query :  query,  groups :  groups,  pageSize :  pageSize,  responseFields :  responseFields		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-
-	}
-
-}
-
-
diff --git a/Mozu.Api.Test/Factories/StorefrontShippingFactory.cs b/Mozu.Api.Test/Factories/StorefrontShippingFactory.cs
deleted file mode 100644
index 84dec6e8..00000000
--- a/Mozu.Api.Test/Factories/StorefrontShippingFactory.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.     
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-#region Usings Setup
-
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Net;
-using Mozu.Api;
-using Mozu.Api.Security;
-using Mozu.Api.Test.Helpers;
-using System.Diagnostics;
-using Newtonsoft.Json.Linq;
-
-#endregion
-
-namespace Mozu.Api.Test.Factories
-{
-	/// <summary>
-	/// Use the Storefront Shipping resource to retrieve shipping rate information from the website.
-	/// </summary>
-	public partial class StorefrontShippingFactory : BaseDataFactory
-	{
-
-		/// <summary> 
-		/// Retrieves the shipping rates applicable for the site.
-		/// <example> 
-		///  <code> 
-		/// var result = ShippingFactory.GetRates(handler : handler,  rateRequest :  rateRequest,  includeRawResponse :  includeRawResponse,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<RatesResponse/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.ShippingRuntime.RatesResponse GetRates(ServiceClientMessageHandler handler, 
- 		 Mozu.Api.Contracts.ShippingRuntime.RateRequest rateRequest, bool? includeRawResponse = null, string responseFields = null, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Commerce.Catalog.Storefront.ShippingClient.GetRatesClient(
-				 rateRequest :  rateRequest,  includeRawResponse :  includeRawResponse,  responseFields :  responseFields		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-
-	}
-
-}
-
-
diff --git a/Mozu.Api.Test/Factories/TenantsFactory.cs b/Mozu.Api.Test/Factories/TenantsFactory.cs
deleted file mode 100644
index e63ac24c..00000000
--- a/Mozu.Api.Test/Factories/TenantsFactory.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.     
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-#region Usings Setup
-
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Net;
-using Mozu.Api;
-using Mozu.Api.Security;
-using Mozu.Api.Test.Helpers;
-using System.Diagnostics;
-using Newtonsoft.Json.Linq;
-
-#endregion
-
-namespace Mozu.Api.Test.Factories
-{
-	/// <summary>
-	/// Use the tenants resource to manage information about a Mozu tenant.
-	/// </summary>
-	public partial class TenantsFactory : BaseDataFactory
-	{
-
-		/// <summary> 
-		/// Retrieve details about a specific tenant by providing the tenant ID.
-		/// <example> 
-		///  <code> 
-		/// var result = TenantsFactory.GetTenant(handler : handler,  tenantId :  tenantId,  responseFields :  responseFields,  expectedCode: expectedCode, successCode: successCode); 
-		/// var optionalCasting = ConvertClass<Tenant/>(result); 
-		/// return optionalCasting;
-		///  </code> 
-		/// </example> 
-		/// </summary>
-		public static Mozu.Api.Contracts.Tenant.Tenant GetTenant(ServiceClientMessageHandler handler, 
- 		 int tenantId, string responseFields = null, 
-		 HttpStatusCode expectedCode = HttpStatusCode.OK, HttpStatusCode successCode = HttpStatusCode.OK)
-		{
-			SetSdKparameters();
-			var currentClassName = System.Reflection.MethodInfo.GetCurrentMethod().DeclaringType.Name;
-			var currentMethodName = System.Reflection.MethodBase.GetCurrentMethod().Name;
-			Debug.WriteLine(currentMethodName  + '.' + currentMethodName );
-			var apiClient = Mozu.Api.Clients.Platform.TenantsClient.GetTenantClient(
-				 tenantId :  tenantId,  responseFields :  responseFields		);
-			try
-			{
-				apiClient.WithContext(handler.ApiContext).Execute();
-			}
-			catch (ApiException ex)
-			{
-				// Custom error handling for test cases can be placed here
-				Exception customException = TestFailException.GetCustomTestException(ex, currentClassName, currentMethodName, expectedCode);
-				if (customException != null)
-					throw customException;
-				return null;
-			}
-			return ResponseMessageFactory.CheckResponseCodes(apiClient.HttpResponse.StatusCode, expectedCode, successCode) 
-					 ? (apiClient.Result()) 
-					 : null;
-
-		}
-  
-
-	}
-
-}
-
-
diff --git a/Mozu.Api.Test/Helpers/CleanupData.cs b/Mozu.Api.Test/Helpers/CleanupData.cs
index dfcf5dd3..a75c97e5 100644
--- a/Mozu.Api.Test/Helpers/CleanupData.cs
+++ b/Mozu.Api.Test/Helpers/CleanupData.cs
@@ -6,8 +6,10 @@
 // ***********************************************************************
 using System;
 using System.Collections.Generic;
-using Mozu.Api.Test.Factories;
 using System.Net;
+using Mozu.Api.Test.Factories.Commerce.Catalog.Admin;
+using Mozu.Api.Test.Factories.Commerce.Catalog.Admin.Attributedefinition;
+using Mozu.Api.Test.Factories.Platform;
 
 namespace Mozu.Api.Test.Helpers
 {
diff --git a/Mozu.Api.Test/Helpers/Generator.cs b/Mozu.Api.Test/Helpers/Generator.cs
index 6f2f640e..29a93082 100644
--- a/Mozu.Api.Test/Helpers/Generator.cs
+++ b/Mozu.Api.Test/Helpers/Generator.cs
@@ -1,20 +1,23 @@
 using System;
-using System.Collections;
-using Mozu.Api.Contracts.Core;
 using Mozu.Api.Contracts.Customer;
-using Mozu.Api.Contracts.PricingRuntime;
 using Mozu.Api.Contracts.ProductAdmin;
 using System.Collections.Generic;
 using System.Linq;
 using System.Globalization;
 using System.Runtime.Serialization;
-using Mozu.Api.Test.Factories;
 using System.Net;
-using System.Dynamic;
+
 using Mozu.Api.Contracts.CommerceRuntime.Wishlists;
+using Mozu.Api.Test.Factories.Commerce.Catalog.Admin;
+using Mozu.Api.Test.Factories.Commerce.Catalog.Admin.Attributedefinition;
+using Mozu.Api.Test.Factories.Commerce.Catalog.Admin.Attributedefinition.Producttypes;
+using Mozu.Api.Test.Factories.Commerce.Catalog.Admin.Products;
+using Mozu.Api.Test.Factories.Commerce.Customer;
+using Mozu.Api.Test.Factories.Commerce.Customer.Accounts;
 using Attribute = Mozu.Api.Contracts.ProductAdmin.Attribute;
 using ProductProperty = Mozu.Api.Contracts.ProductAdmin.ProductProperty;
 using ProductPropertyValue = Mozu.Api.Contracts.ProductAdmin.ProductPropertyValue;
+using Discount = Mozu.Api.Contracts.ProductAdmin.Discount;
 
 namespace Mozu.Api.Test.Helpers
 {
@@ -2987,10 +2990,10 @@ public static string GenerateLastName()
         /// <param name="amt"></param>
         /// <param name="type"></param>
         /// <returns></returns>
-        public static Discount GenerateDiscount(DiscountLocalizedContent content, string scope, DiscountTarget target,
+        public static Contracts.ProductAdmin.Discount GenerateDiscount(DiscountLocalizedContent content, string scope, DiscountTarget target,
             DiscountCondition conditions, int? currentRedemptionCnt, decimal? amt, string type)
         {
-            return new Discount()
+            return new Contracts.ProductAdmin.Discount()
             {
                 Content = content,
                 Scope = scope,
diff --git a/Mozu.Api.Test/Mozu.Api.Test.csproj b/Mozu.Api.Test/Mozu.Api.Test.csproj
index 2020299c..22f6a08f 100644
--- a/Mozu.Api.Test/Mozu.Api.Test.csproj
+++ b/Mozu.Api.Test/Mozu.Api.Test.csproj
@@ -99,142 +99,6 @@
     <Compile Include="MsTestCases\AttributeVocabularyTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="MsTestCases\UserAuthTest.cs" />
-    <Compile Include="Factories\AddressValidationRequestFactory.cs" />
-    <Compile Include="Factories\AdjustmentFactory.cs" />
-    <Compile Include="Factories\AdminUserFactory.cs" />
-    <Compile Include="Factories\ApplicationFactory.cs" />
-    <Compile Include="Factories\ApplicationSettingsFactory.cs" />
-    <Compile Include="Factories\AppliedDiscountCartsFactory.cs" />
-    <Compile Include="Factories\AppliedDiscountOrdersFactory.cs" />
-    <Compile Include="Factories\AssignedDiscountFactory.cs" />
-    <Compile Include="Factories\AttributeFactory.cs" />
-    <Compile Include="Factories\AttributeLocalizedContentFactory.cs" />
-    <Compile Include="Factories\AttributeTypeRuleFactory.cs" />
-    <Compile Include="Factories\AttributeVocabularyValueFactory.cs" />
-    <Compile Include="Factories\AuthTicketFactory.cs" />
-    <Compile Include="Factories\BillingInfoFactory.cs" />
-    <Compile Include="Factories\CardFactory.cs" />
-    <Compile Include="Factories\CarrierConfigurationFactory.cs" />
-    <Compile Include="Factories\CartFactory.cs" />
-    <Compile Include="Factories\CartItemFactory.cs" />
-    <Compile Include="Factories\CartSettingsFactory.cs" />
-    <Compile Include="Factories\CategoryFactory.cs" />
-    <Compile Include="Factories\ChangeMessageFactory.cs" />
-    <Compile Include="Factories\ChannelFactory.cs" />
-    <Compile Include="Factories\ChannelGroupFactory.cs" />
-    <Compile Include="Factories\CheckoutSettingsFactory.cs" />
-    <Compile Include="Factories\CouponFactory.cs" />
-    <Compile Include="Factories\CouponSetFactory.cs" />
-    <Compile Include="Factories\CredentialStoreEntryFactory.cs" />
-    <Compile Include="Factories\CreditAuditEntryFactory.cs" />
-    <Compile Include="Factories\CreditFactory.cs" />
-    <Compile Include="Factories\CreditTransactionFactory.cs" />
-    <Compile Include="Factories\CustomerAccountFactory.cs" />
-    <Compile Include="Factories\CustomerAttributeFactory.cs" />
-    <Compile Include="Factories\CustomerAuditEntryFactory.cs" />
-    <Compile Include="Factories\CustomerAuthTicketFactory.cs" />
-    <Compile Include="Factories\CustomerCheckoutSettingsFactory.cs" />
-    <Compile Include="Factories\CustomerContactFactory.cs" />
-    <Compile Include="Factories\CustomerNoteFactory.cs" />
-    <Compile Include="Factories\CustomerPurchaseOrderAccountFactory.cs" />
-    <Compile Include="Factories\CustomerSegmentAccountsFactory.cs" />
-    <Compile Include="Factories\CustomerSegmentFactory.cs" />
-    <Compile Include="Factories\CustomerSetFactory.cs" />
-    <Compile Include="Factories\CustomRouteSettingsFactory.cs" />
-    <Compile Include="Factories\DeveloperAdminUserAuthTicketFactory.cs" />
-    <Compile Include="Factories\DigitalPackageFactory.cs" />
-    <Compile Include="Factories\DiscountFactory.cs" />
-    <Compile Include="Factories\DiscountTargetFactory.cs" />
-    <Compile Include="Factories\DocumentDraftSummaryFactory.cs" />
-    <Compile Include="Factories\DocumentFactory.cs" />
-    <Compile Include="Factories\DocumentListFactory.cs" />
-    <Compile Include="Factories\DocumentListTypeFactory.cs" />
-    <Compile Include="Factories\DocumentTreeFactory.cs" />
-    <Compile Include="Factories\DocumentTypeFactory.cs" />
-    <Compile Include="Factories\EntityContainerFactory.cs" />
-    <Compile Include="Factories\EntityFactory.cs" />
-    <Compile Include="Factories\EntityListFactory.cs" />
-    <Compile Include="Factories\EventDeliverySummaryFactory.cs" />
-    <Compile Include="Factories\EventNotificationFactory.cs" />
-    <Compile Include="Factories\ExtendedPropertyFactory.cs" />
-    <Compile Include="Factories\FacetAdminFactory.cs" />
-    <Compile Include="Factories\FacetFactory.cs" />
-    <Compile Include="Factories\FraudScreenFactory.cs" />
-    <Compile Include="Factories\FulfillmentActionFactory.cs" />
-    <Compile Include="Factories\FulfillmentInfoFactory.cs" />
-    <Compile Include="Factories\GeneralSettingsFactory.cs" />
-    <Compile Include="Factories\HandlingFeeRuleFactory.cs" />
-    <Compile Include="Factories\InStockNotificationSubscriptionFactory.cs" />
-    <Compile Include="Factories\ListViewFactory.cs" />
-    <Compile Include="Factories\LocationAdminFactory.cs" />
-    <Compile Include="Factories\LocationFactory.cs" />
-    <Compile Include="Factories\LocationInventoryFactory.cs" />
-    <Compile Include="Factories\LocationInventoryProductsFactory.cs" />
-    <Compile Include="Factories\LocationTypeFactory.cs" />
-    <Compile Include="Factories\LocationUsageFactory.cs" />
-    <Compile Include="Factories\MasterCatalogFactory.cs" />
-    <Compile Include="Factories\OrderAttributeFactory.cs" />
-    <Compile Include="Factories\OrderFactory.cs" />
-    <Compile Include="Factories\OrderItemFactory.cs" />
-    <Compile Include="Factories\OrderNoteFactory.cs" />
-    <Compile Include="Factories\OrderReturnableItemFactory.cs" />
-    <Compile Include="Factories\OrderValidationResultFactory.cs" />
-    <Compile Include="Factories\PackageFactory.cs" />
-    <Compile Include="Factories\PaymentFactory.cs" />
-    <Compile Include="Factories\PaymentSettingsFactory.cs" />
-    <Compile Include="Factories\PickupFactory.cs" />
-    <Compile Include="Factories\PriceListEntryFactory.cs" />
-    <Compile Include="Factories\PriceListFactory.cs" />
-    <Compile Include="Factories\ProductExtraFactory.cs" />
-    <Compile Include="Factories\ProductFactory.cs" />
-    <Compile Include="Factories\ProductOptionFactory.cs" />
-    <Compile Include="Factories\ProductPropertyFactory.cs" />
-    <Compile Include="Factories\ProductReservationFactory.cs" />
-    <Compile Include="Factories\ProductTypeExtraFactory.cs" />
-    <Compile Include="Factories\ProductTypeFactory.cs" />
-    <Compile Include="Factories\ProductTypeOptionFactory.cs" />
-    <Compile Include="Factories\ProductTypePropertyFactory.cs" />
-    <Compile Include="Factories\ProductTypeVariationFactory.cs" />
-    <Compile Include="Factories\ProductVariationFactory.cs" />
-    <Compile Include="Factories\PropertyTypeFactory.cs" />
-    <Compile Include="Factories\PublicCardFactory.cs" />
-    <Compile Include="Factories\PublishingScopeFactory.cs" />
-    <Compile Include="Factories\PublishSetSummaryFactory.cs" />
-    <Compile Include="Factories\ReferenceDataFactory.cs" />
-    <Compile Include="Factories\RefundFactory.cs" />
-    <Compile Include="Factories\ReturnFactory.cs" />
-    <Compile Include="Factories\ReturnsPackageFactory.cs" />
-    <Compile Include="Factories\ReturnsShipmentFactory.cs" />
-    <Compile Include="Factories\SearchFactory.cs" />
-    <Compile Include="Factories\SecureAppDataFactory.cs" />
-    <Compile Include="Factories\ShippingInclusionRuleFactory.cs" />
-    <Compile Include="Factories\ShippingProfileFactory.cs" />
-    <Compile Include="Factories\ShippingStatesFactory.cs" />
-    <Compile Include="Factories\SiteDataFactory.cs" />
-    <Compile Include="Factories\SiteShippingHandlingFeeFactory.cs" />
-    <Compile Include="Factories\SiteShippingSettingsFactory.cs" />
-    <Compile Include="Factories\SoftAllocationFactory.cs" />
-    <Compile Include="Factories\StorefrontCategoryFactory.cs" />
-    <Compile Include="Factories\StorefrontOrderTaxContextFactory.cs" />
-    <Compile Include="Factories\StorefrontPackageFactory.cs" />
-    <Compile Include="Factories\StorefrontPriceListFactory.cs" />
-    <Compile Include="Factories\StorefrontProductFactory.cs" />
-    <Compile Include="Factories\StorefrontProductSearchResultFactory.cs" />
-    <Compile Include="Factories\StorefrontShipmentFactory.cs" />
-    <Compile Include="Factories\StorefrontShippingFactory.cs" />
-    <Compile Include="Factories\SubscriptionFactory.cs" />
-    <Compile Include="Factories\TargetRuleFactory.cs" />
-    <Compile Include="Factories\TaxableTerritoryFactory.cs" />
-    <Compile Include="Factories\TenantAdminUserAuthTicketFactory.cs" />
-    <Compile Include="Factories\TenantDataFactory.cs" />
-    <Compile Include="Factories\TenantExtensionsFactory.cs" />
-    <Compile Include="Factories\TenantFactory.cs" />
-    <Compile Include="Factories\TransactionFactory.cs" />
-    <Compile Include="Factories\UserDataFactory.cs" />
-    <Compile Include="Factories\ViewFactory.cs" />
-    <Compile Include="Factories\VisitFactory.cs" />
-    <Compile Include="Factories\WishlistFactory.cs" />
-    <Compile Include="Factories\WishlistItemFactory.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Mozu.Api\Mozu.Api.csproj">
diff --git a/Mozu.Api.Test/MsTestCases/AttributeVocabularyTests.cs b/Mozu.Api.Test/MsTestCases/AttributeVocabularyTests.cs
index 9fb33f90..7e3f0cd8 100644
--- a/Mozu.Api.Test/MsTestCases/AttributeVocabularyTests.cs
+++ b/Mozu.Api.Test/MsTestCases/AttributeVocabularyTests.cs
@@ -1,7 +1,8 @@
 using System;
 using System.Linq;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Mozu.Api.Test.Factories;
+using Mozu.Api.Test.Factories.Commerce.Catalog.Admin.Attributedefinition.Attributes;
+using Mozu.Api.Test.Factories.Platform;
 using Mozu.Api.Test.Helpers;
 
 namespace Mozu.Api.Test.MsTestCases
diff --git a/Mozu.Api.Test/MsTestCases/CategoryTests.cs b/Mozu.Api.Test/MsTestCases/CategoryTests.cs
index c9bb72ea..80ced4ee 100644
--- a/Mozu.Api.Test/MsTestCases/CategoryTests.cs
+++ b/Mozu.Api.Test/MsTestCases/CategoryTests.cs
@@ -4,7 +4,9 @@
 using System.Net;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Mozu.Api.Test.Helpers;
-using Mozu.Api.Test.Factories;
+using Mozu.Api.Test.Factories.Commerce.Catalog.Admin;
+using Mozu.Api.Test.Factories.Commerce.Catalog.Admin.Attributedefinition;
+using Mozu.Api.Test.Factories.Platform;
 
 namespace Mozu.Api.Test.MsTestCases
 {
diff --git a/Mozu.Api.Test/MsTestCases/CustomerTests.cs b/Mozu.Api.Test/MsTestCases/CustomerTests.cs
index c3d17ede..2d99d364 100644
--- a/Mozu.Api.Test/MsTestCases/CustomerTests.cs
+++ b/Mozu.Api.Test/MsTestCases/CustomerTests.cs
@@ -4,9 +4,11 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Mozu.Api.Contracts.Customer;
 using Mozu.Api.Test.Helpers;
-using Mozu.Api.Test.Factories;
 using System.Net;
 using System.Diagnostics;
+using Mozu.Api.Test.Factories.Commerce.Customer;
+using Mozu.Api.Test.Factories.Commerce.Customer.Accounts;
+using Mozu.Api.Test.Factories.Platform;
 
 
 namespace Mozu.Api.Test.MsTestCases
diff --git a/Mozu.Api.Test/MsTestCases/DocumentTest.cs b/Mozu.Api.Test/MsTestCases/DocumentTest.cs
index b97486c6..da8b8fda 100644
--- a/Mozu.Api.Test/MsTestCases/DocumentTest.cs
+++ b/Mozu.Api.Test/MsTestCases/DocumentTest.cs
@@ -1,10 +1,9 @@
 using System;
 using System.IO;
 using System.Linq;
-using System.Text;
-using System.Collections.Generic;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Mozu.Api.Test.Factories;
+using Mozu.Api.Test.Factories.Content.Documentlists;
+using Mozu.Api.Test.Factories.Platform;
 using Mozu.Api.Test.Helpers;
 
 namespace Mozu.Api.Test.MsTestCases
diff --git a/Mozu.Api.Test/MsTestCases/OrderTests.cs b/Mozu.Api.Test/MsTestCases/OrderTests.cs
index 178a80ca..ec9c9676 100644
--- a/Mozu.Api.Test/MsTestCases/OrderTests.cs
+++ b/Mozu.Api.Test/MsTestCases/OrderTests.cs
@@ -7,15 +7,21 @@
 using Mozu.Api.Contracts.CommerceRuntime.Orders;
 using Mozu.Api.Contracts.CommerceRuntime.Payments;
 using Mozu.Api.Contracts.CommerceRuntime.Returns;
-using Mozu.Api.Resources.Commerce.Customer;
-using Mozu.Api.Resources.Platform;
 using Mozu.Api.Test.Helpers;
 using Mozu.Api.Contracts.CommerceRuntime.Carts;
-using Mozu.Api.Test.Factories;
 using Product = Mozu.Api.Contracts.CommerceRuntime.Products.Product;
 using System.Threading;
 using System.Diagnostics;
 using System.Collections;
+using Mozu.Api.Test.Factories.Commerce;
+using Mozu.Api.Test.Factories.Commerce.Admin;
+using Mozu.Api.Test.Factories.Commerce.Carts;
+using Mozu.Api.Test.Factories.Commerce.Catalog.Admin;
+using Mozu.Api.Test.Factories.Commerce.Catalog.Storefront;
+using Mozu.Api.Test.Factories.Commerce.Customer;
+using Mozu.Api.Test.Factories.Commerce.Customer.Accounts;
+using Mozu.Api.Test.Factories.Commerce.Orders;
+using Mozu.Api.Test.Factories.Platform;
 
 
 namespace Mozu.Api.Test.MsTestCases
@@ -218,7 +224,7 @@ public void OrderTests_CreateOrderPayByCreditCard()
             var ShopperAuth =
                 Mozu.Api.Security.CustomerAuthenticator.Authenticate(customerUserAuthInfo: shopperUserAuthInfo,
                                                                      tenantId: TestBaseTenant.Id,
-                                                                     siteId: TestBaseTenant.Sites.FirstOrDefault().Id);
+                                                                     siteId: TestBaseTenant.Sites.FirstOrDefault().Id).Result;
 
             ShopperMsgHandler.ApiContext.UserAuthTicket = ShopperAuth.AuthTicket;
             var createdCart = CartFactory.GetOrCreateCart(ShopperMsgHandler);
@@ -465,7 +471,7 @@ public string CreateOrdersForTest(bool submitOrder= false, bool fullfillOrder =
                 ShopperAuth =
                     Mozu.Api.Security.CustomerAuthenticator.Authenticate(customerUserAuthInfo: shopperUserAuthInfo,
                         tenantId: TestBaseTenant.Id,
-                        siteId: TestBaseTenant.Sites.FirstOrDefault().Id);
+                        siteId: TestBaseTenant.Sites.FirstOrDefault().Id).Result;
             }
             catch (Exception ex)
             {
diff --git a/Mozu.Api.Test/MsTestCases/PaymentTest.cs b/Mozu.Api.Test/MsTestCases/PaymentTest.cs
index 9a7f867d..8cb2c571 100644
--- a/Mozu.Api.Test/MsTestCases/PaymentTest.cs
+++ b/Mozu.Api.Test/MsTestCases/PaymentTest.cs
@@ -1,12 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Net;
-using System.Net.Http;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Mozu.Api.Contracts.PaymentService;
 using Mozu.Api.Resources.Commerce.Payments;
-using Mozu.Api.Test.Factories;
+using Mozu.Api.Test.Factories.Commerce.Orders;
+using Mozu.Api.Test.Factories.Platform;
 using Mozu.Api.Test.Helpers;
 
 namespace Mozu.Api.Test.MsTestCases
diff --git a/Mozu.Api.Test/MsTestCases/ProductAttributeTests.cs b/Mozu.Api.Test/MsTestCases/ProductAttributeTests.cs
index 70d52a34..d0124bf4 100644
--- a/Mozu.Api.Test/MsTestCases/ProductAttributeTests.cs
+++ b/Mozu.Api.Test/MsTestCases/ProductAttributeTests.cs
@@ -3,21 +3,12 @@
 using System.Linq;
 using System.Net;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Mozu.Api.Contracts.CommerceRuntime.Fulfillment;
-using Mozu.Api.Contracts.CommerceRuntime.Orders;
-using Mozu.Api.Contracts.CommerceRuntime.Payments;
-using Mozu.Api.Contracts.CommerceRuntime.Returns;
-using Mozu.Api.Contracts.Customer;
 using Mozu.Api.Contracts.ProductAdmin;
-using Mozu.Api.Security;
 using Mozu.Api.Test.Helpers;
-using Mozu.Api.Contracts.CommerceRuntime.Carts;
-using Mozu.Api.Test.Factories;
-using Mozu.Api.Contracts.Core;
-using Product = Mozu.Api.Contracts.CommerceRuntime.Products.Product;
-using System.Threading;
-using System.Diagnostics;
-using System.Collections;
+using Mozu.Api.Test.Factories.Commerce.Catalog.Admin;
+using Mozu.Api.Test.Factories.Commerce.Catalog.Admin.Attributedefinition;
+using Mozu.Api.Test.Factories.Commerce.Catalog.Admin.Attributedefinition.Attributes;
+using Mozu.Api.Test.Factories.Platform;
 
 
 namespace Mozu.Api.Test.MsTestCases
diff --git a/Mozu.Api.Test/MsTestCases/ProductPublishingTests.cs b/Mozu.Api.Test/MsTestCases/ProductPublishingTests.cs
index 49946217..8e76f94b 100644
--- a/Mozu.Api.Test/MsTestCases/ProductPublishingTests.cs
+++ b/Mozu.Api.Test/MsTestCases/ProductPublishingTests.cs
@@ -4,8 +4,12 @@
 using System.Net;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Mozu.Api.Test.Helpers;
-using Mozu.Api.Test.Factories;
 using System.Threading;
+using Mozu.Api.Test.Factories.Commerce.Catalog.Admin;
+using Mozu.Api.Test.Factories.Commerce.Catalog.Admin.Attributedefinition;
+using Mozu.Api.Test.Factories.Commerce.Catalog.Admin.Attributedefinition.Producttypes;
+using Mozu.Api.Test.Factories.Commerce.Catalog.Admin.Products;
+using Mozu.Api.Test.Factories.Platform;
 
 namespace Mozu.Api.Test.MsTestCases
 {
diff --git a/Mozu.Api.Test/MsTestCases/ProductTests.cs b/Mozu.Api.Test/MsTestCases/ProductTests.cs
index fa5ce1e6..8b657901 100644
--- a/Mozu.Api.Test/MsTestCases/ProductTests.cs
+++ b/Mozu.Api.Test/MsTestCases/ProductTests.cs
@@ -2,15 +2,16 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
-using System.Security.Cryptography;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Mozu.Api.Contracts.ProductAdmin;
 using Mozu.Api.Resources.Commerce.Catalog.Admin;
 using Mozu.Api.Test.Helpers;
-using Mozu.Api.Test.Factories;
-using System.Configuration;
 using Attribute = Mozu.Api.Contracts.ProductAdmin.Attribute;
 using System.Threading;
+using Mozu.Api.Test.Factories.Commerce.Catalog.Admin;
+using Mozu.Api.Test.Factories.Commerce.Catalog.Admin.Attributedefinition;
+using Mozu.Api.Test.Factories.Commerce.Catalog.Admin.Products;
+using Mozu.Api.Test.Factories.Platform;
 
 
 namespace Mozu.Api.Test.MsTestCases
diff --git a/Mozu.Api.Test/MsTestCases/TenantDataTest.cs b/Mozu.Api.Test/MsTestCases/TenantDataTest.cs
index e376d7c4..4952055c 100644
--- a/Mozu.Api.Test/MsTestCases/TenantDataTest.cs
+++ b/Mozu.Api.Test/MsTestCases/TenantDataTest.cs
@@ -2,18 +2,19 @@
 using System.Linq;
 using System.Net;
 using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Text;
 using System.Collections.Generic;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Mozu.Api.Resources.Platform;
-using Mozu.Api.Test.Factories;
+using Mozu.Api.Test.Factories.Platform;
+using Mozu.Api.Test.Factories.Platform.Entitylists;
 using Mozu.Api.Test.Helpers;
-using NUnit.Framework;
+
 using TestContext = Microsoft.VisualStudio.TestTools.UnitTesting.TestContext;
 
 namespace Mozu.Api.Test.MsTestCases
 {
+    using System.Threading;
+
     /// <summary>
     /// Summary description for TenantDataTest
     /// </summary>
@@ -107,6 +108,17 @@ public void GetDataTest()
 
         }
 
+        [TestMethod]
+        public void GetTenantAsyncTest()
+        {
+            var tenantResource = new TenantResource();
+            CancellationTokenSource cts = new CancellationTokenSource();
+            cts.CancelAfter(TimeSpan.FromSeconds(3));
+
+            var tenant = tenantResource.GetTenantAsync(8088, ct: cts.Token).Result;
+        }
+
+
         [TestMethod]
         public void GetEntityList()
         {
diff --git a/Mozu.Api.Test/MsTestCases/UserAuthTest.cs b/Mozu.Api.Test/MsTestCases/UserAuthTest.cs
index f432f760..dd82b0fb 100644
--- a/Mozu.Api.Test/MsTestCases/UserAuthTest.cs
+++ b/Mozu.Api.Test/MsTestCases/UserAuthTest.cs
@@ -9,6 +9,7 @@
 using Mozu.Api.Security;
 using System;
 using Mozu.Api.Test.Factories;
+using Mozu.Api.Test.Factories.Platform;
 using Mozu.Api.Test.Helpers;
 
 namespace Mozu.Api.Test.MsTestCases
diff --git a/Mozu.Api/Clients/Commerce/Admin/LocationClient.cs b/Mozu.Api/Clients/Commerce/Admin/LocationClient.cs
old mode 100644
new mode 100755
index 276802b3..eab52c5c
--- a/Mozu.Api/Clients/Commerce/Admin/LocationClient.cs
+++ b/Mozu.Api/Clients/Commerce/Admin/LocationClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Admin
 {
@@ -22,13 +23,13 @@ namespace Mozu.Api.Clients.Commerce.Admin
 	public partial class LocationClient 	{
 		
 		/// <summary>
-		/// Retrieves a list of all locations associated with a tenant, according to any filter and sort criteria specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Location.LocationCollection"/>}
 		/// </returns>
@@ -50,10 +51,10 @@ public partial class LocationClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the details of the location specified in the request by location code.
+		/// 
 		/// </summary>
-		/// <param name="locationCode">The unique, user-defined code that identifies a location. </param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="locationCode">The merchant-defined code of the location to retrieve.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Location.Location"/>}
 		/// </returns>
@@ -75,10 +76,10 @@ public partial class LocationClient 	{
 		}
 
 		/// <summary>
-		/// Creates a new physical location for the tenant specified in the request header.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="location">Properties of a physical location a tenant uses to manage inventory and fulfills orders, provide store finder functionality, or both.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="location">Properties of the location to create.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Location.Location"/>}
 		/// </returns>
@@ -100,11 +101,11 @@ public partial class LocationClient 	{
 		}
 
 		/// <summary>
-		/// Updates one or more details of a the location specified in the request by location code.
+		/// 
 		/// </summary>
-		/// <param name="locationCode">The unique, user-defined code that identifies a location. </param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="location">Properties of a physical location a tenant uses to manage inventory and fulfills orders, provide store finder functionality, or both.</param>
+		/// <param name="locationCode">The merchant-defined code associated with the location to update.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="location">Properties of the location to update.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Location.Location"/>}
 		/// </returns>
@@ -126,9 +127,9 @@ public partial class LocationClient 	{
 		}
 
 		/// <summary>
-		/// Deletes the location specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="locationCode">The unique, user-defined code that identifies a location. </param>
+		/// <param name="locationCode">The merchant-defined code of the location to delete.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Admin/LocationTypeClient.cs b/Mozu.Api/Clients/Commerce/Admin/LocationTypeClient.cs
old mode 100644
new mode 100755
index 9ebe59a8..52c7ef8c
--- a/Mozu.Api/Clients/Commerce/Admin/LocationTypeClient.cs
+++ b/Mozu.Api/Clients/Commerce/Admin/LocationTypeClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Admin
 {
@@ -22,7 +23,7 @@ namespace Mozu.Api.Clients.Commerce.Admin
 	public partial class LocationTypeClient 	{
 		
 		/// <summary>
-		/// Retrieve a list of all location types defined for the tenant.
+		/// 
 		/// </summary>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.Location.LocationType"/>}}
@@ -45,10 +46,10 @@ public partial class LocationTypeClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the details of the location type specified in the request.
+		/// 
 		/// </summary>
 		/// <param name="locationTypeCode">The user-defined code that identifies the location type.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Location.LocationType"/>}
 		/// </returns>
@@ -70,10 +71,10 @@ public partial class LocationTypeClient 	{
 		}
 
 		/// <summary>
-		/// Creates a new location type based on the information specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="locationType">Properties of a type of physical location, such as warehouse or kiosk. Location types enable tenants to group similar locations for filtering and location usage type definition.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="locationType">Properties of the location type to create.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Location.LocationType"/>}
 		/// </returns>
@@ -95,11 +96,11 @@ public partial class LocationTypeClient 	{
 		}
 
 		/// <summary>
-		/// Updates the name of a defined location type.
+		/// 
 		/// </summary>
 		/// <param name="locationTypeCode">The user-defined code that identifies the location type.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="locationType">Properties of a type of physical location, such as warehouse or kiosk. Location types enable tenants to group similar locations for filtering and location usage type definition.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="locationType">Properties of the location type to update.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Location.LocationType"/>}
 		/// </returns>
@@ -121,9 +122,9 @@ public partial class LocationTypeClient 	{
 		}
 
 		/// <summary>
-		/// Deletes the location type specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="locationTypeCode">The user-defined code that identifies the location type.</param>
+		/// <param name="locationTypeCode">User-defined code used to identify the location type.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Admin/Locations/Attributedefinition/AttributeClient.cs b/Mozu.Api/Clients/Commerce/Admin/Locations/Attributedefinition/AttributeClient.cs
new file mode 100755
index 00000000..f8a34479
--- /dev/null
+++ b/Mozu.Api/Clients/Commerce/Admin/Locations/Attributedefinition/AttributeClient.cs
@@ -0,0 +1,158 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using Mozu.Api.Security;
+using System.Threading.Tasks;
+using Newtonsoft.Json.Linq;
+using System.Threading;
+
+namespace Mozu.Api.Clients.Commerce.Admin.Locations.Attributedefinition
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	public partial class AttributeClient 	{
+		
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
+		/// <returns>
+		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Core.Extensible.AttributeCollection"/>}
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var mozuClient=GetAttributes( startIndex,  pageSize,  sortBy,  filter,  responseFields);
+		///   var attributeCollectionClient = mozuClient.WithBaseAddress(url).Execute().Result();
+		/// </code>
+		/// </example>
+		public static MozuClient<Mozu.Api.Contracts.Core.Extensible.AttributeCollection> GetAttributesClient(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
+		{
+			var url = Mozu.Api.Urls.Commerce.Admin.Locations.Attributedefinition.AttributeUrl.GetAttributesUrl(startIndex, pageSize, sortBy, filter, responseFields);
+			const string verb = "GET";
+			var mozuClient = new MozuClient<Mozu.Api.Contracts.Core.Extensible.AttributeCollection>()
+									.WithVerb(verb).WithResourceUrl(url)
+;
+			return mozuClient;
+
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="attributeFQN"></param>
+		/// <returns>
+		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.Core.Extensible.AttributeVocabularyValue"/>}}
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var mozuClient=GetAttributeVocabularyValues( attributeFQN);
+		///   var attributeVocabularyValueClient = mozuClient.WithBaseAddress(url).Execute().Result();
+		/// </code>
+		/// </example>
+		public static MozuClient<List<Mozu.Api.Contracts.Core.Extensible.AttributeVocabularyValue>> GetAttributeVocabularyValuesClient(string attributeFQN)
+		{
+			var url = Mozu.Api.Urls.Commerce.Admin.Locations.Attributedefinition.AttributeUrl.GetAttributeVocabularyValuesUrl(attributeFQN);
+			const string verb = "GET";
+			var mozuClient = new MozuClient<List<Mozu.Api.Contracts.Core.Extensible.AttributeVocabularyValue>>()
+									.WithVerb(verb).WithResourceUrl(url)
+;
+			return mozuClient;
+
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="attributeFQN"></param>
+		/// <param name="responseFields"></param>
+		/// <returns>
+		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Core.Extensible.Attribute"/>}
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var mozuClient=GetAttribute( attributeFQN,  responseFields);
+		///   var attributeClient = mozuClient.WithBaseAddress(url).Execute().Result();
+		/// </code>
+		/// </example>
+		public static MozuClient<Mozu.Api.Contracts.Core.Extensible.Attribute> GetAttributeClient(string attributeFQN, string responseFields =  null)
+		{
+			var url = Mozu.Api.Urls.Commerce.Admin.Locations.Attributedefinition.AttributeUrl.GetAttributeUrl(attributeFQN, responseFields);
+			const string verb = "GET";
+			var mozuClient = new MozuClient<Mozu.Api.Contracts.Core.Extensible.Attribute>()
+									.WithVerb(verb).WithResourceUrl(url)
+;
+			return mozuClient;
+
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="responseFields"></param>
+		/// <param name="attribute"></param>
+		/// <returns>
+		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Core.Extensible.Attribute"/>}
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var mozuClient=CreateAttribute( attribute,  responseFields);
+		///   var attributeClient = mozuClient.WithBaseAddress(url).Execute().Result();
+		/// </code>
+		/// </example>
+		public static MozuClient<Mozu.Api.Contracts.Core.Extensible.Attribute> CreateAttributeClient(Mozu.Api.Contracts.Core.Extensible.Attribute attribute, string responseFields =  null)
+		{
+			var url = Mozu.Api.Urls.Commerce.Admin.Locations.Attributedefinition.AttributeUrl.CreateAttributeUrl(responseFields);
+			const string verb = "POST";
+			var mozuClient = new MozuClient<Mozu.Api.Contracts.Core.Extensible.Attribute>()
+									.WithVerb(verb).WithResourceUrl(url)
+									.WithBody<Mozu.Api.Contracts.Core.Extensible.Attribute>(attribute);
+			return mozuClient;
+
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="attributeFQN"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="attribute"></param>
+		/// <returns>
+		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Core.Extensible.Attribute"/>}
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var mozuClient=UpdateAttribute( attribute,  attributeFQN,  responseFields);
+		///   var attributeClient = mozuClient.WithBaseAddress(url).Execute().Result();
+		/// </code>
+		/// </example>
+		public static MozuClient<Mozu.Api.Contracts.Core.Extensible.Attribute> UpdateAttributeClient(Mozu.Api.Contracts.Core.Extensible.Attribute attribute, string attributeFQN, string responseFields =  null)
+		{
+			var url = Mozu.Api.Urls.Commerce.Admin.Locations.Attributedefinition.AttributeUrl.UpdateAttributeUrl(attributeFQN, responseFields);
+			const string verb = "PUT";
+			var mozuClient = new MozuClient<Mozu.Api.Contracts.Core.Extensible.Attribute>()
+									.WithVerb(verb).WithResourceUrl(url)
+									.WithBody<Mozu.Api.Contracts.Core.Extensible.Attribute>(attribute);
+			return mozuClient;
+
+		}
+
+
+	}
+
+}
+
+
diff --git a/Mozu.Api/Clients/Commerce/CartClient.cs b/Mozu.Api/Clients/Commerce/CartClient.cs
old mode 100644
new mode 100755
index d404ba12..27b75003
--- a/Mozu.Api/Clients/Commerce/CartClient.cs
+++ b/Mozu.Api/Clients/Commerce/CartClient.cs
@@ -13,19 +13,20 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce
 {
 	/// <summary>
-	/// Use this resource to manage storefront shopping carts as shoppers add and remove items for purchase. Each time a shopper's cart is modified, the Carts resource updates the estimated total with any applicable discounts.
+	/// Use the Carts resource to manage storefront shopping carts as items are added and removed. Each time a shopper's cart is modified, the Carts resource updates the estimated total with any applicable discounts.
 	/// </summary>
 	public partial class CartClient 	{
 		
 		/// <summary>
-		/// Retrieves the cart specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="cartId">Identifier of the cart to delete.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="cartId">Identifier of the cart to retrieve.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Carts.Cart"/>}
 		/// </returns>
@@ -47,9 +48,9 @@ public partial class CartClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves a cart's contents for the current shopper. If the shopper does not have an active cart on the site, the service creates one.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Carts.Cart"/>}
 		/// </returns>
@@ -71,9 +72,9 @@ public partial class CartClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves summary information associated with the cart of the current shopper, including the number of items, the current total, and whether the cart has expired. All anonymous idle carts that do not proceed to checkout expire after 14 days.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Carts.CartSummary"/>}
 		/// </returns>
@@ -95,10 +96,10 @@ public partial class CartClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves summary information associated with the cart of user specified in the request, including the number of items in the cart, the current total, and whether the cart has expired. All anonymous idle carts that do not proceed to checkout expire after 14 days.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="userId">Unique identifier of the user whose tenant scopes you want to retrieve.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="userId">Unique identifier of the user whose cart details you want to retrieve.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Carts.CartSummary"/>}
 		/// </returns>
@@ -120,10 +121,10 @@ public partial class CartClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the cart of the user specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="userId">Unique identifier of the user whose tenant scopes you want to retrieve.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="userId">Unique identifier of the user whose cart you want to retrieve.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Carts.Cart"/>}
 		/// </returns>
@@ -145,10 +146,10 @@ public partial class CartClient 	{
 		}
 
 		/// <summary>
-		/// Update the current shopper's cart.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="cart">Properties of a shopping cart.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="cart">All of the properties of the cart to update. The product code is required.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Carts.Cart"/>}
 		/// </returns>
@@ -170,7 +171,7 @@ public partial class CartClient 	{
 		}
 
 		/// <summary>
-		/// Deletes the cart specified in the request.
+		/// 
 		/// </summary>
 		/// <param name="cartId">Identifier of the cart to delete.</param>
 		/// <returns>
@@ -194,7 +195,7 @@ public static MozuClient DeleteCartClient(string cartId)
 		}
 
 		/// <summary>
-		/// Deletes the cart of the currently active shopper.
+		/// 
 		/// </summary>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
diff --git a/Mozu.Api/Clients/Commerce/Carts/AppliedDiscountClient.cs b/Mozu.Api/Clients/Commerce/Carts/AppliedDiscountClient.cs
old mode 100644
new mode 100755
index de944312..7cc30ac3
--- a/Mozu.Api/Clients/Commerce/Carts/AppliedDiscountClient.cs
+++ b/Mozu.Api/Clients/Commerce/Carts/AppliedDiscountClient.cs
@@ -13,20 +13,21 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Carts
 {
 	/// <summary>
-	/// Use the Cart Coupons subresource to apply a coupon to a defined cart or remove a coupon from a cart. When the shopper proceeds to checkout, the coupons applied to the cart apply to the order.
+	/// Use the Cart Coupons resource to apply a coupon to a defined cart or remove a coupon from a cart. When the shopper proceeds to checkout, the coupons applied to the cart apply to the order.
 	/// </summary>
 	public partial class AppliedDiscountClient 	{
 		
 		/// <summary>
-		/// Applies a defined coupon to the cart specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="cartId">Identifier of the cart to delete.</param>
-		/// <param name="couponCode">Code associated with the coupon to remove from the cart.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="cartId">Unique identifier of the cart to which to apply the coupon.</param>
+		/// <param name="couponCode">Code associated with the coupon to apply to the cart.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Carts.Cart"/>}
 		/// </returns>
@@ -48,9 +49,9 @@ public partial class AppliedDiscountClient 	{
 		}
 
 		/// <summary>
-		/// Removes all coupons from the cart specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="cartId">Identifier of the cart to delete.</param>
+		/// <param name="cartId">Unique identifier of the cart.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Carts.Cart"/>}
 		/// </returns>
@@ -72,9 +73,9 @@ public partial class AppliedDiscountClient 	{
 		}
 
 		/// <summary>
-		/// Removes an applied coupon from the cart specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="cartId">Identifier of the cart to delete.</param>
+		/// <param name="cartId">Unique identifier of the cart.</param>
 		/// <param name="couponCode">Code associated with the coupon to remove from the cart.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Carts.Cart"/>}
diff --git a/Mozu.Api/Clients/Commerce/Carts/CartItemClient.cs b/Mozu.Api/Clients/Commerce/Carts/CartItemClient.cs
old mode 100644
new mode 100755
index 6ab79430..be50157b
--- a/Mozu.Api/Clients/Commerce/Carts/CartItemClient.cs
+++ b/Mozu.Api/Clients/Commerce/Carts/CartItemClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Carts
 {
@@ -22,10 +23,10 @@ namespace Mozu.Api.Clients.Commerce.Carts
 	public partial class CartItemClient 	{
 		
 		/// <summary>
-		/// Retrieves a particular cart item by providing the cart item ID.
+		/// 
 		/// </summary>
-		/// <param name="cartItemId">Identifier of the cart item to delete.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="cartItemId">Identifier of the cart item to retrieve.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Carts.CartItem"/>}
 		/// </returns>
@@ -47,9 +48,9 @@ public partial class CartItemClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves a list of cart items including the total number of items in the cart.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Carts.CartItemCollection"/>}
 		/// </returns>
@@ -71,10 +72,10 @@ public partial class CartItemClient 	{
 		}
 
 		/// <summary>
-		/// Adds a product to the current shopper's cart.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="cartItem">Properties of an item added to an active shopping cart.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="cartItem">All properties of the new cart item. The product code is required.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Carts.CartItem"/>}
 		/// </returns>
@@ -96,11 +97,11 @@ public partial class CartItemClient 	{
 		}
 
 		/// <summary>
-		/// Update the quantity of an individual cart item in the cart of the current shopper.
+		/// 
 		/// </summary>
-		/// <param name="cartItemId">Identifier of the cart item to delete.</param>
+		/// <param name="cartItemId">Identifier of the cart item to update quantity.</param>
 		/// <param name="quantity">The number of cart items in the shopper's active cart.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Carts.CartItem"/>}
 		/// </returns>
@@ -122,11 +123,11 @@ public partial class CartItemClient 	{
 		}
 
 		/// <summary>
-		/// Update the product or product quantity of an item in the current shopper's cart.
+		/// 
 		/// </summary>
-		/// <param name="cartItemId">Identifier of the cart item to delete.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="cartItem">Properties of an item added to an active shopping cart.</param>
+		/// <param name="cartItemId">Identifier of the cart item to update.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="cartItem">The properties of the cart item to update.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Carts.CartItem"/>}
 		/// </returns>
@@ -148,7 +149,7 @@ public partial class CartItemClient 	{
 		}
 
 		/// <summary>
-		/// Removes all items in the current shopper's active cart.
+		/// 
 		/// </summary>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Carts.Cart"/>}
@@ -171,7 +172,7 @@ public partial class CartItemClient 	{
 		}
 
 		/// <summary>
-		/// Deletes a specific cart item by providing the cart item ID.
+		/// 
 		/// </summary>
 		/// <param name="cartItemId">Identifier of the cart item to delete.</param>
 		/// <returns>
diff --git a/Mozu.Api/Clients/Commerce/Carts/ChangeMessageClient.cs b/Mozu.Api/Clients/Commerce/Carts/ChangeMessageClient.cs
old mode 100644
new mode 100755
index 8447880e..98cc4175
--- a/Mozu.Api/Clients/Commerce/Carts/ChangeMessageClient.cs
+++ b/Mozu.Api/Clients/Commerce/Carts/ChangeMessageClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Carts
 {
@@ -22,9 +23,9 @@ namespace Mozu.Api.Clients.Commerce.Carts
 	public partial class ChangeMessageClient 	{
 		
 		/// <summary>
-		/// Retrieves the messages associated with the current shopper's cart.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Carts.CartChangeMessageCollection"/>}
 		/// </returns>
@@ -46,7 +47,7 @@ public partial class ChangeMessageClient 	{
 		}
 
 		/// <summary>
-		/// Deletes all messages associated with the cart of the current shopper.
+		/// 
 		/// </summary>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
@@ -69,7 +70,7 @@ public static MozuClient RemoveAllMessagesClient()
 		}
 
 		/// <summary>
-		/// Removes a single message associated with the cart of the current shopper.
+		/// 
 		/// </summary>
 		/// <param name="messageId">Identifier of the message to remove from the cart.</param>
 		/// <returns>
diff --git a/Mozu.Api/Clients/Commerce/Carts/ExtendedPropertyClient.cs b/Mozu.Api/Clients/Commerce/Carts/ExtendedPropertyClient.cs
old mode 100644
new mode 100755
index daf08aa5..11bcfdba
--- a/Mozu.Api/Clients/Commerce/Carts/ExtendedPropertyClient.cs
+++ b/Mozu.Api/Clients/Commerce/Carts/ExtendedPropertyClient.cs
@@ -13,16 +13,17 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Carts
 {
 	/// <summary>
-	/// Use the Cart Extended Properties subresource to store an arbitrary number of cart extended properties such as tracking strings, marketing sources, affiliates, sales personnel/data, and so on, on a per cart basis. Each cart may have none, one, or more than one entry in the extended properties collection, and all values in the extended properties collection are represented as strings. When you create an order from a cart, all extended properties are retained from the cart and copied to the order. Refer to the subresource for more information about order extended properties.
+	/// 
 	/// </summary>
 	public partial class ExtendedPropertyClient 	{
 		
 		/// <summary>
-		/// Retrieves a list of cart extended properties specified in the request.
+		/// 
 		/// </summary>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty"/>}}
@@ -45,9 +46,9 @@ public partial class ExtendedPropertyClient 	{
 		}
 
 		/// <summary>
-		/// Adds one or more specified extended properties to the carts extended properties collection.
+		/// 
 		/// </summary>
-		/// <param name="extendedProperties">The details of the new extended property.</param>
+		/// <param name="extendedProperties"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty"/>}}
 		/// </returns>
@@ -69,12 +70,12 @@ public partial class ExtendedPropertyClient 	{
 		}
 
 		/// <summary>
-		/// Updates one or more details of the extended property specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="key">Key used for metadata defined for objects, including extensible attributes, custom attributes associated with a shipping provider, and search synonyms definitions. This content may be user-defined depending on the object and usage.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="upsert">Any set of key value pairs to be stored in the extended properties of a cart.</param>
-		/// <param name="extendedProperty">The details of the updated extended property.</param>
+		/// <param name="key"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="upsert"></param>
+		/// <param name="extendedProperty"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty"/>}
 		/// </returns>
@@ -96,10 +97,10 @@ public partial class ExtendedPropertyClient 	{
 		}
 
 		/// <summary>
-		/// Updates one or more details of the extended properties specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="upsert">Any set of key value pairs to be stored in the extended properties of a cart.</param>
-		/// <param name="extendedProperties">The details of the updated extended properties.</param>
+		/// <param name="upsert"></param>
+		/// <param name="extendedProperties"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty"/>}}
 		/// </returns>
@@ -121,7 +122,7 @@ public partial class ExtendedPropertyClient 	{
 		}
 
 		/// <summary>
-		/// Deletes the extended properties cart extended properties collection.
+		/// 
 		/// </summary>
 		/// <param name="keys"></param>
 		/// <returns>
@@ -145,7 +146,7 @@ public static MozuClient DeleteExtendedPropertiesClient(List<string> keys)
 		}
 
 		/// <summary>
-		/// Deletes a specific extended property from the cart extended property collection.
+		/// 
 		/// </summary>
 		/// <param name="key"></param>
 		/// <returns>
diff --git a/Mozu.Api/Clients/Commerce/Catalog/Admin/Attributedefinition/AttributeClient.cs b/Mozu.Api/Clients/Commerce/Catalog/Admin/Attributedefinition/AttributeClient.cs
old mode 100644
new mode 100755
index 92120def..75d19c98
--- a/Mozu.Api/Clients/Commerce/Catalog/Admin/Attributedefinition/AttributeClient.cs
+++ b/Mozu.Api/Clients/Commerce/Catalog/Admin/Attributedefinition/AttributeClient.cs
@@ -13,22 +13,21 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition
 {
 	/// <summary>
-	/// Attributes are used to add custom definitions and characteristics to the following objects:
-
-
+	/// Use the Attribute Definition resource to manage the properties, options, and extras that uniquely describe products of a specific type. Attributes can be associated with a product type, assigned values by a client or shopper, and added as faceted search filters for a product category. Options are product attributes that describe unique configurations made by the shopper, such as size or color, and generate a new product variation (or unique SKU). Properties are product attributes that describe aspects of the product that do not represent an option configurable by the shopper, such as screen resolution or brand. Extras are product attributes that describe add-on configurations made by the shopper that do not represent a product variation, such as a monogram.
 	/// </summary>
 	public partial class AttributeClient 	{
 		
 		/// <summary>
-		/// Retrieves a paged list of attributes according to any specified filter criteria and sort options.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
 		/// <param name="sortBy"></param>
 		/// <param name="startIndex"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
@@ -53,10 +52,10 @@ public partial class AttributeClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the details of the specified product attribute.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.Attribute"/>}
@@ -79,11 +78,11 @@ public partial class AttributeClient 	{
 		}
 
 		/// <summary>
-		/// Creates a new attribute to describe one aspect of a product such as color or size, based on its defined product type. The attribute name, attribute type, input type, and data type are required.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="attribute">Properties of an attribute used to describe customers or orders.</param>
+		/// <param name="attribute">Properties of the new product attribute to create.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.Attribute"/>}
 		/// </returns>
@@ -105,12 +104,12 @@ public partial class AttributeClient 	{
 		}
 
 		/// <summary>
-		/// Updates an existing attribute with attribute properties to set.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="attribute">Properties of an attribute used to describe customers or orders.</param>
+		/// <param name="attribute">Any properties of the attribute that to update.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.Attribute"/>}
 		/// </returns>
@@ -132,9 +131,9 @@ public partial class AttributeClient 	{
 		}
 
 		/// <summary>
-		/// Deletes a defined product attribute. You cannot delete an attribute assigned a value for a product.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
+		/// <param name="attributeFQN"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
diff --git a/Mozu.Api/Clients/Commerce/Catalog/Admin/Attributedefinition/Attributes/AttributeLocalizedContentClient.cs b/Mozu.Api/Clients/Commerce/Catalog/Admin/Attributedefinition/Attributes/AttributeLocalizedContentClient.cs
old mode 100644
new mode 100755
index 5d0a731a..d3ff8ab4
--- a/Mozu.Api/Clients/Commerce/Catalog/Admin/Attributedefinition/Attributes/AttributeLocalizedContentClient.cs
+++ b/Mozu.Api/Clients/Commerce/Catalog/Admin/Attributedefinition/Attributes/AttributeLocalizedContentClient.cs
@@ -13,18 +13,19 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Attributes
 {
 	/// <summary>
-	/// Properties of localized content for attributes, based on a `localeCode` at a site/tenant level. This content supports translated text for product, product options, and additional objects. 
+	/// 
 	/// </summary>
 	public partial class AttributeLocalizedContentClient 	{
 		
 		/// <summary>
-		/// Retrieves a collection of localized content for attributes based on a `localeCode`.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
+		/// <param name="attributeFQN"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent"/>}}
@@ -47,11 +48,11 @@ public partial class AttributeLocalizedContentClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the localized content for an attribute based on a `localeCode`.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="localeCode">Language used for the entity. Currently, only "en-US" is supported.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="localeCode"></param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent"/>}
@@ -74,12 +75,12 @@ public partial class AttributeLocalizedContentClient 	{
 		}
 
 		/// <summary>
-		/// Adds new localized content for an attribute based on a `localeCode`.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="localizedContent">The localized name and description of the attribute, displayed in the locale defined for the master catalog.</param>
+		/// <param name="localizedContent"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent"/>}
 		/// </returns>
@@ -101,11 +102,11 @@ public partial class AttributeLocalizedContentClient 	{
 		}
 
 		/// <summary>
-		/// Updates the localized content for a collection of existing attributes based on a `localeCode`.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
+		/// <param name="attributeFQN"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="localizedContent">The localized name and description of the attribute, displayed in the locale defined for the master catalog.</param>
+		/// <param name="localizedContent"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent"/>}}
 		/// </returns>
@@ -127,13 +128,13 @@ public partial class AttributeLocalizedContentClient 	{
 		}
 
 		/// <summary>
-		/// Updates the localized content for an existing attribute based on a `localeCode`.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="localeCode">Language used for the entity. Currently, only "en-US" is supported.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="localeCode"></param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="localizedContent">The localized name and description of the attribute, displayed in the locale defined for the master catalog.</param>
+		/// <param name="localizedContent"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent"/>}
 		/// </returns>
@@ -155,10 +156,10 @@ public partial class AttributeLocalizedContentClient 	{
 		}
 
 		/// <summary>
-		/// Removes all localized content. Localized content is translated text information and data based on a `localeCode`. 
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="localeCode">Language used for the entity. Currently, only "en-US" is supported.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="localeCode"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
diff --git a/Mozu.Api/Clients/Commerce/Catalog/Admin/Attributedefinition/Attributes/AttributeTypeRuleClient.cs b/Mozu.Api/Clients/Commerce/Catalog/Admin/Attributedefinition/Attributes/AttributeTypeRuleClient.cs
old mode 100644
new mode 100755
index 4a2ccaf8..89b566a4
--- a/Mozu.Api/Clients/Commerce/Catalog/Admin/Attributedefinition/Attributes/AttributeTypeRuleClient.cs
+++ b/Mozu.Api/Clients/Commerce/Catalog/Admin/Attributedefinition/Attributes/AttributeTypeRuleClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Attributes
 {
@@ -22,11 +23,11 @@ namespace Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Attributes
 	public partial class AttributeTypeRuleClient 	{
 		
 		/// <summary>
-		/// Retrieves a list of attribute type rules according to optional filter criteria and sort options. Attribute type rules help drive the behavior of attributes on a storefront page.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
 		/// <param name="sortBy"></param>
 		/// <param name="startIndex"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
diff --git a/Mozu.Api/Clients/Commerce/Catalog/Admin/Attributedefinition/Attributes/AttributeVocabularyValueClient.cs b/Mozu.Api/Clients/Commerce/Catalog/Admin/Attributedefinition/Attributes/AttributeVocabularyValueClient.cs
old mode 100644
new mode 100755
index 48c7bb29..d403d3c8
--- a/Mozu.Api/Clients/Commerce/Catalog/Admin/Attributedefinition/Attributes/AttributeVocabularyValueClient.cs
+++ b/Mozu.Api/Clients/Commerce/Catalog/Admin/Attributedefinition/Attributes/AttributeVocabularyValueClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Attributes
 {
@@ -22,9 +23,9 @@ namespace Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Attributes
 	public partial class AttributeVocabularyValueClient 	{
 		
 		/// <summary>
-		/// Retrieves a list of vocabulary values defined for the attribute specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
+		/// <param name="attributeFQN"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue"/>}}
@@ -47,10 +48,10 @@ public partial class AttributeVocabularyValueClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves a collection of localized content for vocabulary value attributes based on a `localeCode`. 
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="value">The value string to create.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="value"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValueLocalizedContent"/>}}
@@ -73,12 +74,12 @@ public partial class AttributeVocabularyValueClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the localized content for a vocabulary value attribute based on a `localeCode`. 
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="localeCode">Language used for the entity. Currently, only "en-US" is supported.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="value">The value string to create.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="localeCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="value"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValueLocalizedContent"/>}
@@ -101,11 +102,11 @@ public partial class AttributeVocabularyValueClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the details of a vocabulary value defined for an attribute by providing the attribute's fully qualified name and the value to retrieve.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="value">The value string to create.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="value">The actual unique value of the attribute vocabulary to retrieve. A single attribute must have a unique value and match the attribute's data type. If a string value returns null, the system will generate a value. The actual string content displayed shoud be stored as "Content" and actual content is required for string values.</param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue"/>}
@@ -128,13 +129,13 @@ public partial class AttributeVocabularyValueClient 	{
 		}
 
 		/// <summary>
-		/// Creates and saves localized vocabulary value content for an attribute, based on the `localeCode`.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="value">The value string to create.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="value"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="localizedContent">The localized text for the string value of a product attribute.</param>
+		/// <param name="localizedContent"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValueLocalizedContent"/>}
 		/// </returns>
@@ -156,12 +157,12 @@ public partial class AttributeVocabularyValueClient 	{
 		}
 
 		/// <summary>
-		/// Creates a vocabulary value for a defined product attribute.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="attributeVocabularyValue">Properties of a vocabulary value defined for an extensible attribute.</param>
+		/// <param name="attributeVocabularyValue">The predefined vocabulary value to add to the attribute content.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue"/>}
 		/// </returns>
@@ -183,11 +184,11 @@ public partial class AttributeVocabularyValueClient 	{
 		}
 
 		/// <summary>
-		/// Update existing vocabulary values for an attribute.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
+		/// <param name="attributeFQN"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="vocabularyValues">Properties of a vocabulary value defined for an extensible attribute.</param>
+		/// <param name="vocabularyValues">The actual vocabulary values for the attribute being updated.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue"/>}}
 		/// </returns>
@@ -209,12 +210,12 @@ public partial class AttributeVocabularyValueClient 	{
 		}
 
 		/// <summary>
-		/// Updates a collection of localized vocabulary value content for existing attributes, based on the `localeCode`.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="value">The value string to create.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="value"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="localizedContent">The localized text for the string value of a product attribute.</param>
+		/// <param name="localizedContent"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValueLocalizedContent"/>}}
 		/// </returns>
@@ -236,14 +237,14 @@ public partial class AttributeVocabularyValueClient 	{
 		}
 
 		/// <summary>
-		/// Updates localized vocabulary value content for an existing attribute, based on the `localeCode`.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="localeCode">The two character country code that sets the locale, such as US for United States. Sites, tenants, and catalogs use locale codes for localizing content, such as translated product text per supported country.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="value">The value string to create.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="localeCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="value"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="localizedContent">The localized text for the string value of a product attribute.</param>
+		/// <param name="localizedContent"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValueLocalizedContent"/>}
 		/// </returns>
@@ -265,13 +266,13 @@ public partial class AttributeVocabularyValueClient 	{
 		}
 
 		/// <summary>
-		/// Updates existing attribute vocabulary values.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="value">The value string to create.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="value">The actual unique value of the attribute vocabulary value to update. A single attribute must have a unique value and match the attribute's data type. If a string value returns null, the system will generate a value. The actual string content displayed shoud be stored as "Content" and actual content is required for string values.</param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="attributeVocabularyValue">Properties of a vocabulary value defined for an extensible attribute.</param>
+		/// <param name="attributeVocabularyValue">The predefined vocabulary value to add to the attribute content to update.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue"/>}
 		/// </returns>
@@ -293,10 +294,10 @@ public partial class AttributeVocabularyValueClient 	{
 		}
 
 		/// <summary>
-		/// Deletes an attribute's vocabulary value.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="value">The value string to create.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="value">The actual unique value of the attribute vocabulary to delete. A single attribute must have a unique value and match the attribute's data type. If a string value returns null, the system will generate a value. The actual string content displayed shoud be stored as "Content" and actual content is required for string values.</param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
@@ -319,11 +320,11 @@ public static MozuClient DeleteAttributeVocabularyValueClient(string attributeFQ
 		}
 
 		/// <summary>
-		/// Removes localized content for a vocabulary value attribute. 
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="localeCode">Language used for the entity. Currently, only "en-US" is supported.</param>
-		/// <param name="value">The value string to create.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="localeCode"></param>
+		/// <param name="value"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
diff --git a/Mozu.Api/Clients/Commerce/Catalog/Admin/Attributedefinition/ProductTypeClient.cs b/Mozu.Api/Clients/Commerce/Catalog/Admin/Attributedefinition/ProductTypeClient.cs
old mode 100644
new mode 100755
index bbf86128..4eb81ded
--- a/Mozu.Api/Clients/Commerce/Catalog/Admin/Attributedefinition/ProductTypeClient.cs
+++ b/Mozu.Api/Clients/Commerce/Catalog/Admin/Attributedefinition/ProductTypeClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition
 {
@@ -22,11 +23,11 @@ namespace Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition
 	public partial class ProductTypeClient 	{
 		
 		/// <summary>
-		/// Retrieves a list of product types according to any specified filter criteria and sort options.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. You can filter product type search results by any of its properties. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=Name+cont+shoes"</param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
 		/// <param name="sortBy"></param>
 		/// <param name="startIndex"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
@@ -52,10 +53,10 @@ public partial class ProductTypeClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the details of the product type specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="productTypeId">Identifier of the product type.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="productTypeId">Identifier of the product type to retrieve.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductType"/>}
@@ -79,11 +80,11 @@ public partial class ProductTypeClient 	{
 		}
 
 		/// <summary>
-		/// Creates a new product type based on the information supplied in the request.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="productType">A product type is like a product template.</param>
+		/// <param name="productType">Properties of the product type to create.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductType"/>}
 		/// </returns>
@@ -106,12 +107,12 @@ public partial class ProductTypeClient 	{
 		}
 
 		/// <summary>
-		/// Updates one or more properties of a product type.
+		/// 
 		/// </summary>
-		/// <param name="productTypeId">Identifier of the product type.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="productTypeId">Identifier of the product type to update.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="productType">A product type is like a product template.</param>
+		/// <param name="productType">The details of the product type to update.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductType"/>}
 		/// </returns>
@@ -134,9 +135,9 @@ public partial class ProductTypeClient 	{
 		}
 
 		/// <summary>
-		/// Deletes the product type by providing the product type ID.
+		/// 
 		/// </summary>
-		/// <param name="productTypeId">Identifier of the product type.</param>
+		/// <param name="productTypeId">Identifier of the product type to delete.</param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
diff --git a/Mozu.Api/Clients/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypeExtraClient.cs b/Mozu.Api/Clients/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypeExtraClient.cs
old mode 100644
new mode 100755
index 81761811..f07dd265
--- a/Mozu.Api/Clients/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypeExtraClient.cs
+++ b/Mozu.Api/Clients/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypeExtraClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Producttypes
 {
@@ -22,7 +23,7 @@ namespace Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Producttyp
 	public partial class ProductTypeExtraClient 	{
 		
 		/// <summary>
-		/// Retrieves a list of extra attributes defined for the specified product type.
+		/// 
 		/// </summary>
 		/// <param name="productTypeId">Identifier of the product type.</param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
@@ -48,11 +49,11 @@ public partial class ProductTypeExtraClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the details of an extra attribute definition for the specified product type.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="productTypeId">Identifier of the product type.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="productTypeId">Identifier of the product type whose extra is being retrieved.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.AttributeInProductType"/>}
@@ -76,12 +77,12 @@ public partial class ProductTypeExtraClient 	{
 		}
 
 		/// <summary>
-		/// Assigns a defined extra attribute to the product type based on the information supplied in the request.
+		/// 
 		/// </summary>
 		/// <param name="productTypeId">Identifier of the product type.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="attributeInProductType">Properties of an attribute definition associated with a specific product type. When an attribute is applied to a product type, each product of that type maintains the same set of attributes.</param>
+		/// <param name="attributeInProductType">The properties of the extra attribute definition for this product type assignment.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.AttributeInProductType"/>}
 		/// </returns>
@@ -104,13 +105,13 @@ public partial class ProductTypeExtraClient 	{
 		}
 
 		/// <summary>
-		/// Update the definition of an extra attribute for the specified product type.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
+		/// <param name="attributeFQN"></param>
 		/// <param name="productTypeId">Identifier of the product type.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="attributeInProductType">Properties of an attribute definition associated with a specific product type. When an attribute is applied to a product type, each product of that type maintains the same set of attributes.</param>
+		/// <param name="attributeInProductType">The properties of the extra attribute definition to update for the product type.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.AttributeInProductType"/>}
 		/// </returns>
@@ -133,9 +134,9 @@ public partial class ProductTypeExtraClient 	{
 		}
 
 		/// <summary>
-		/// Removes an extra attribute definition from the specified product type.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
+		/// <param name="attributeFQN"></param>
 		/// <param name="productTypeId">Identifier of the product type.</param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
diff --git a/Mozu.Api/Clients/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypeOptionClient.cs b/Mozu.Api/Clients/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypeOptionClient.cs
old mode 100644
new mode 100755
index 8ca13a1e..21cf36b9
--- a/Mozu.Api/Clients/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypeOptionClient.cs
+++ b/Mozu.Api/Clients/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypeOptionClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Producttypes
 {
@@ -22,9 +23,9 @@ namespace Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Producttyp
 	public partial class ProductTypeOptionClient 	{
 		
 		/// <summary>
-		/// Retrieves a list of option product attributes defined for the specified product type.
+		/// 
 		/// </summary>
-		/// <param name="productTypeId">Identifier of the product type.</param>
+		/// <param name="productTypeId">Identifier of the product type to retrieve.</param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.ProductAdmin.AttributeInProductType"/>}}
@@ -48,11 +49,11 @@ public partial class ProductTypeOptionClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the details of an option attribute defined for the specified product type.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="productTypeId">Identifier of the product type.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="productTypeId">The identifier of the product type.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.AttributeInProductType"/>}
@@ -76,12 +77,12 @@ public partial class ProductTypeOptionClient 	{
 		}
 
 		/// <summary>
-		/// Assigns an option attribute to the product type based on the information supplied in the request.
+		/// 
 		/// </summary>
 		/// <param name="productTypeId">Identifier of the product type.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="attributeInProductType">Properties of an attribute definition associated with a specific product type. When an attribute is applied to a product type, each product of that type maintains the same set of attributes.</param>
+		/// <param name="attributeInProductType">Properties of the option attribute to define for the specified product type.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.AttributeInProductType"/>}
 		/// </returns>
@@ -104,13 +105,13 @@ public partial class ProductTypeOptionClient 	{
 		}
 
 		/// <summary>
-		/// Updates an option attribute definition for the specified product type.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
+		/// <param name="attributeFQN"></param>
 		/// <param name="productTypeId">Identifier of the product type.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="attributeInProductType">Properties of an attribute definition associated with a specific product type. When an attribute is applied to a product type, each product of that type maintains the same set of attributes.</param>
+		/// <param name="attributeInProductType">Properties of the option product attribute to define for the specified product type.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.AttributeInProductType"/>}
 		/// </returns>
@@ -133,9 +134,9 @@ public partial class ProductTypeOptionClient 	{
 		}
 
 		/// <summary>
-		/// Removes an option attribute definition for the specified product type.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
+		/// <param name="attributeFQN"></param>
 		/// <param name="productTypeId">Identifier of the product type.</param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
diff --git a/Mozu.Api/Clients/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypePropertyClient.cs b/Mozu.Api/Clients/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypePropertyClient.cs
old mode 100644
new mode 100755
index aee3b0fd..3b905436
--- a/Mozu.Api/Clients/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypePropertyClient.cs
+++ b/Mozu.Api/Clients/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypePropertyClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Producttypes
 {
@@ -22,7 +23,7 @@ namespace Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Producttyp
 	public partial class ProductTypePropertyClient 	{
 		
 		/// <summary>
-		/// Retrieves a list of product property attributes defined for a product type.
+		/// 
 		/// </summary>
 		/// <param name="productTypeId">Identifier of the product type.</param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
@@ -48,11 +49,11 @@ public partial class ProductTypePropertyClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves a product property attribute definition for the specified product type.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
+		/// <param name="attributeFQN"></param>
 		/// <param name="productTypeId">Identifier of the product type.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.AttributeInProductType"/>}
@@ -76,12 +77,12 @@ public partial class ProductTypePropertyClient 	{
 		}
 
 		/// <summary>
-		/// Assigns a property attribute to the specified product type, according to the information defined in the request.
+		/// 
 		/// </summary>
 		/// <param name="productTypeId">Identifier of the product type.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="attributeInProductType">Properties of an attribute definition associated with a specific product type. When an attribute is applied to a product type, each product of that type maintains the same set of attributes.</param>
+		/// <param name="attributeInProductType">Properties of the property attribute to define for the specified product type.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.AttributeInProductType"/>}
 		/// </returns>
@@ -104,13 +105,13 @@ public partial class ProductTypePropertyClient 	{
 		}
 
 		/// <summary>
-		/// Updates the definition of a property attribute for the specified product type.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
+		/// <param name="attributeFQN"></param>
 		/// <param name="productTypeId">Identifier of the product type.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="attributeInProductType">Properties of an attribute definition associated with a specific product type. When an attribute is applied to a product type, each product of that type maintains the same set of attributes.</param>
+		/// <param name="attributeInProductType">Properties of the property attribute to define for the product type.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.AttributeInProductType"/>}
 		/// </returns>
@@ -133,9 +134,9 @@ public partial class ProductTypePropertyClient 	{
 		}
 
 		/// <summary>
-		/// Removes a property attribute previously defined for the specified product type.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
+		/// <param name="attributeFQN"></param>
 		/// <param name="productTypeId">Identifier of the product type.</param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
diff --git a/Mozu.Api/Clients/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypeVariationClient.cs b/Mozu.Api/Clients/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypeVariationClient.cs
old mode 100644
new mode 100755
index 9440e9a7..0c4ef455
--- a/Mozu.Api/Clients/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypeVariationClient.cs
+++ b/Mozu.Api/Clients/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypeVariationClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Producttypes
 {
@@ -22,17 +23,17 @@ namespace Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Producttyp
 	public partial class ProductTypeVariationClient 	{
 		
 		/// <summary>
-		/// Generates the variations possible for a product associated with the product type based on the option values supplied in the request.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
 		/// <param name="productCode"></param>
-		/// <param name="productTypeId">Identifier of the product type.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+		/// <param name="productTypeId">Unique identifier of the product type.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="productOptionsIn">Properties of the product option to create such as attribute detail, fully qualified name, and list of product option values.</param>
+		/// <param name="productOptionsIn">The product option attributes configured for this product type.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductVariationPagedCollection"/>}
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Catalog/Admin/CategoryClient.cs b/Mozu.Api/Clients/Commerce/Catalog/Admin/CategoryClient.cs
old mode 100644
new mode 100755
index 62765da2..e4e4e708
--- a/Mozu.Api/Clients/Commerce/Catalog/Admin/CategoryClient.cs
+++ b/Mozu.Api/Clients/Commerce/Catalog/Admin/CategoryClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Catalog.Admin
 {
@@ -22,11 +23,11 @@ namespace Mozu.Api.Clients.Commerce.Catalog.Admin
 	public partial class CategoryClient 	{
 		
 		/// <summary>
-		/// Retrieves a list of categories according to any specified filter criteria and sort options.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. You can filter product category search results by any of its properties, including its position in the category hierarchy. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
 		/// <param name="sortBy"></param>
 		/// <param name="startIndex"></param>
 		/// <returns>
@@ -51,10 +52,10 @@ public partial class CategoryClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the list of subcategories within a category.
+		/// 
 		/// </summary>
-		/// <param name="categoryId">Unique identifier of the category to modify.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="categoryId">Unique identifier of the category for which to retrieve subcategories.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.CategoryCollection"/>}
 		/// </returns>
@@ -76,10 +77,10 @@ public partial class CategoryClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the details of a single category.
+		/// 
 		/// </summary>
-		/// <param name="categoryId">Unique identifier of the category to modify.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="categoryId">Unique identifier of the category to retrieve.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.Category"/>}
 		/// </returns>
@@ -102,12 +103,12 @@ public partial class CategoryClient 	{
 		}
 
 		/// <summary>
-		/// Adds a new category to the site's category hierarchy.Specify a  to determine where to place the category in the hierarchy. If no  is specified, the new category is a top-level category.
+		/// 
 		/// </summary>
 		/// <param name="incrementSequence">If true, when adding a new product category, set the sequence number of the new category to an increment of one integer greater than the maximum available sequence number across all product categories. If false, set the sequence number to zero.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="useProvidedId">Optional. If ,  uses the  you specify in the request as the category's id. If ,  generates an  for the category regardless if you specify an id in the request.If you specify an id already in use and set this parameter to ,  returns an error.</param>
-		/// <param name="category">A descriptive container that groups products. A category is merchant defined with associated products and discounts as configured. GThe storefront displays products in a hierarchy of categories. As such, categories can include a nesting of sub-categories to organize products and product options per set guidelines such as color, brand, material, and size.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="useProvidedId"></param>
+		/// <param name="category">Properties of the new category to create. You must specify a name and parent category if you want to create it as a subcategory.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.Category"/>}
 		/// </returns>
@@ -129,10 +130,10 @@ public partial class CategoryClient 	{
 		}
 
 		/// <summary>
-		/// Validate the precomputed dynamic category expression for correctness.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="dynamicExpressionIn">The details of the dynamic expression that you want to validate.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="dynamicExpressionIn"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.DynamicExpression"/>}
 		/// </returns>
@@ -154,10 +155,10 @@ public partial class CategoryClient 	{
 		}
 
 		/// <summary>
-		/// Validates the readltime dynamic category expression for correctness.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="dynamicExpressionIn">The details of the dynamic expression that you want to validate.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="dynamicExpressionIn"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.DynamicExpression"/>}
 		/// </returns>
@@ -179,12 +180,12 @@ public partial class CategoryClient 	{
 		}
 
 		/// <summary>
-		/// Update the properties of a defined category or move it to another location in the category hierarchy. Because this operation replaces the defined resource,include all the information to maintain for the category in the request.
+		/// 
 		/// </summary>
-		/// <param name="cascadeVisibility">If true, when changing the display option for the category, change it for all subcategories also. The default value is false.</param>
+		/// <param name="cascadeVisibility">If true, when changing the display option for the category, change it for all subcategories also. Default: False.</param>
 		/// <param name="categoryId">Unique identifier of the category to modify.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="category">A descriptive container that groups products. A category is merchant defined with associated products and discounts as configured. GThe storefront displays products in a hierarchy of categories. As such, categories can include a nesting of sub-categories to organize products and product options per set guidelines such as color, brand, material, and size.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="category">Properties of the category to modify.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.Category"/>}
 		/// </returns>
@@ -206,12 +207,12 @@ public partial class CategoryClient 	{
 		}
 
 		/// <summary>
-		/// Deletes the specified category. Use the categoryId parameter to specify the category.
+		/// 
 		/// </summary>
-		/// <param name="cascadeDelete">Specifies whether to also delete all subcategories associated with the specified category.If you set this value is false, only the specified category is deleted.The default value is false.</param>
-		/// <param name="categoryId">Unique identifier of the category to modify.</param>
-		/// <param name="forceDelete">Specifies whether the category, and any associated subcategories, are deleted even if there are products that reference them. The default value is false.</param>
-		/// <param name="reassignToParent">Specifies whether any subcategories of the specified category are reassigned to the parent of the specified category.This field only applies if the cascadeDelete parameter is false.The default value is false.</param>
+		/// <param name="cascadeDelete">If true, also delete all subcategories associated with the specified category.</param>
+		/// <param name="categoryId">Unique identifier of the category to delete.</param>
+		/// <param name="forceDelete"></param>
+		/// <param name="reassignToParent"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Catalog/Admin/CouponSetClient.cs b/Mozu.Api/Clients/Commerce/Catalog/Admin/CouponSetClient.cs
old mode 100644
new mode 100755
index 3196342b..00b8a37d
--- a/Mozu.Api/Clients/Commerce/Catalog/Admin/CouponSetClient.cs
+++ b/Mozu.Api/Clients/Commerce/Catalog/Admin/CouponSetClient.cs
@@ -13,23 +13,24 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Catalog.Admin
 {
 	/// <summary>
-	/// Use the Coupon Sets resource to view and create coupon sets. You can use coupon sets to group multiple coupon codes together and associate them with one or more discounts. Use the  subresource to manage the coupon codes within manual coupon sets. Use the  subresource to mange the discounts assigned to coupon sets.
+	/// 
 	/// </summary>
 	public partial class CouponSetClient 	{
 		
 		/// <summary>
-		/// Retrieves a list of coupon sets in the catalog according to any specified filter criteria and sort options.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-		/// <param name="includeCounts">Specifies whether to include the number of redeemed coupons, existing coupon codes, and assigned discounts in the response body.</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
+		/// <param name="filter"></param>
+		/// <param name="includeCounts"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.CouponSetCollection"/>}
 		/// </returns>
@@ -51,11 +52,11 @@ public partial class CouponSetClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the details of a single coupon set. Use the couponSetCode parameter to specify the coupon set. Use the includeCounts parameter to specify whether to include the number of redeemed coupons, existing coupon codes, and assigned discounts.
+		/// 
 		/// </summary>
-		/// <param name="couponSetCode">The unique identifier of the coupon set.</param>
-		/// <param name="includeCounts">Specifies whether to include the number of redeemed coupons, existing coupon codes, and assigned discounts in the response body.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="couponSetCode"></param>
+		/// <param name="includeCounts"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.CouponSet"/>}
 		/// </returns>
@@ -77,9 +78,9 @@ public partial class CouponSetClient 	{
 		}
 
 		/// <summary>
-		/// Returns a unique, random four character code to use for the couponSetCode.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{string}
 		/// </returns>
@@ -101,10 +102,10 @@ public static MozuClient<string> GetUniqueCouponSetCodeClient(string responseFie
 		}
 
 		/// <summary>
-		/// Adds a single coupon set to the catalog.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="couponSet">The details of the new coupon set.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="couponSet"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.CouponSet"/>}
 		/// </returns>
@@ -126,9 +127,9 @@ public static MozuClient<string> GetUniqueCouponSetCodeClient(string responseFie
 		}
 
 		/// <summary>
-		/// Validates the couponSetCode and tests it for uniqueness.
+		/// 
 		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
+		/// <param name="code"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
@@ -150,11 +151,11 @@ public static MozuClient ValidateUniqueCouponSetCodeClient(string code)
 		}
 
 		/// <summary>
-		/// Updates one or more properties of a coupon set in the catalog.
+		/// 
 		/// </summary>
-		/// <param name="couponSetCode">The unique identifier of the coupon set.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="couponSet">The details of the updated coupon set.</param>
+		/// <param name="couponSetCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="couponSet"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.CouponSet"/>}
 		/// </returns>
@@ -176,9 +177,9 @@ public static MozuClient ValidateUniqueCouponSetCodeClient(string code)
 		}
 
 		/// <summary>
-		/// Deletes a specified coupon set from the catalog. Use the couponSetCode parameter to specify the coupon set to delete.
+		/// 
 		/// </summary>
-		/// <param name="couponSetCode">The unique identifier of the coupon set.</param>
+		/// <param name="couponSetCode"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Catalog/Admin/Couponsets/AssignedDiscountClient.cs b/Mozu.Api/Clients/Commerce/Catalog/Admin/Couponsets/AssignedDiscountClient.cs
old mode 100644
new mode 100755
index 2d2a9276..912158f6
--- a/Mozu.Api/Clients/Commerce/Catalog/Admin/Couponsets/AssignedDiscountClient.cs
+++ b/Mozu.Api/Clients/Commerce/Catalog/Admin/Couponsets/AssignedDiscountClient.cs
@@ -13,18 +13,19 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Catalog.Admin.Couponsets
 {
 	/// <summary>
-	/// Use the AssignedDiscounts resource to manage the discounts assigned to coupon sets.
+	/// 
 	/// </summary>
 	public partial class AssignedDiscountClient 	{
 		
 		/// <summary>
-		/// Retrieves the discountIds of any assigned discounts for the specified coupon set.
+		/// 
 		/// </summary>
-		/// <param name="couponSetCode">The unique identifier of the coupon set.</param>
+		/// <param name="couponSetCode"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.ProductAdmin.AssignedDiscount"/>}}
 		/// </returns>
@@ -46,10 +47,10 @@ public partial class AssignedDiscountClient 	{
 		}
 
 		/// <summary>
-		/// Assigns or associates an existing discount to a specified coupon set. Use the couponSetCode parameter to specify the coupon set.
+		/// 
 		/// </summary>
-		/// <param name="couponSetCode">The unique identifier of the coupon set.</param>
-		/// <param name="assignedDiscount">The details of the discount assigned to the coupon set.</param>
+		/// <param name="couponSetCode"></param>
+		/// <param name="assignedDiscount"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
@@ -71,10 +72,10 @@ public static MozuClient AssignDiscountClient(Mozu.Api.Contracts.ProductAdmin.As
 		}
 
 		/// <summary>
-		/// Unassigns or disassociates the specified discount with the specified coupon set.
+		/// 
 		/// </summary>
-		/// <param name="couponSetCode">The unique identifier of the coupon set.</param>
-		/// <param name="discountId">discountId parameter description DOCUMENT_HERE </param>
+		/// <param name="couponSetCode"></param>
+		/// <param name="discountId"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Catalog/Admin/Couponsets/CouponClient.cs b/Mozu.Api/Clients/Commerce/Catalog/Admin/Couponsets/CouponClient.cs
old mode 100644
new mode 100755
index 06297988..0c0cd8b6
--- a/Mozu.Api/Clients/Commerce/Catalog/Admin/Couponsets/CouponClient.cs
+++ b/Mozu.Api/Clients/Commerce/Catalog/Admin/Couponsets/CouponClient.cs
@@ -13,21 +13,22 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Catalog.Admin.Couponsets
 {
 	/// <summary>
-	/// Use the Coupons subresource to manage coupons within manual coupon sets.
+	/// 
 	/// </summary>
 	public partial class CouponClient 	{
 		
 		/// <summary>
-		/// Retrieves the details of the specified coupon. Use the couponSetCode and the couponCode parameter to specify the coupon within a coupon set. Use the includeCounts paramter to specify whether to return the redemptionCount property in the response body object.
+		/// 
 		/// </summary>
-		/// <param name="couponCode">Code associated with the coupon to remove from the cart.</param>
-		/// <param name="couponSetCode">The unique identifier of the coupon set that the coupon belongs to.</param>
-		/// <param name="includeCounts">Specifies whether to return the redemptionCount property in the response body object.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="couponCode"></param>
+		/// <param name="couponSetCode"></param>
+		/// <param name="includeCounts"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.Coupon"/>}
 		/// </returns>
@@ -49,15 +50,15 @@ public partial class CouponClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves a list of coupons in a specified coupon set according to any specified filter criteria and sort options.
+		/// 
 		/// </summary>
-		/// <param name="couponSetCode">The unique identifier of the coupon set that the coupons belongs to.</param>
-		/// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-		/// <param name="includeCounts">Specifies whether to include the redemptionCount property in the response body object.</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
+		/// <param name="couponSetCode"></param>
+		/// <param name="filter"></param>
+		/// <param name="includeCounts"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.CouponCollection"/>}
 		/// </returns>
@@ -79,10 +80,10 @@ public partial class CouponClient 	{
 		}
 
 		/// <summary>
-		/// Adds coupons  to a specified manual coupon set. Use the couponSetCode parameter to specify the manual coupon set.
+		/// 
 		/// </summary>
-		/// <param name="couponSetCode">The unique identifier of the coupon set.</param>
-		/// <param name="coupons">The details necessary to assign the discount to a coupon set, including .</param>
+		/// <param name="couponSetCode"></param>
+		/// <param name="coupons"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
@@ -104,10 +105,10 @@ public static MozuClient AddCouponsClient(List<Mozu.Api.Contracts.ProductAdmin.C
 		}
 
 		/// <summary>
-		/// Deletes the specified coupons and removes them from the coupon set. You can only delete a coupon if it has not been redeemed. Use the canBeDeleted property to determine whether a coupon can be deleted.
+		/// 
 		/// </summary>
-		/// <param name="couponSetCode">The unique identifier of the coupon set that the coupon belongs to.</param>
-		/// <param name="couponCodes">The unique identifiers of the coupons to delete.</param>
+		/// <param name="couponSetCode"></param>
+		/// <param name="couponCodes"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
@@ -129,10 +130,10 @@ public static MozuClient DeleteCouponsClient(List<string> couponCodes, string co
 		}
 
 		/// <summary>
-		/// Deletes the specified coupon and remove it from the coupon set. You can only delete a coupon if it has not been redeemed. Use the canBeDeleted property to determine whether a coupon can be deleted.
+		/// 
 		/// </summary>
-		/// <param name="couponCode">Code associated with the coupon to remove from the cart.</param>
-		/// <param name="couponSetCode">The unique identifier of the coupon set that the coupon belongs to.</param>
+		/// <param name="couponCode"></param>
+		/// <param name="couponSetCode"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Catalog/Admin/DiscountClient.cs b/Mozu.Api/Clients/Commerce/Catalog/Admin/DiscountClient.cs
old mode 100644
new mode 100755
index 60ae5b82..8eea6b58
--- a/Mozu.Api/Clients/Commerce/Catalog/Admin/DiscountClient.cs
+++ b/Mozu.Api/Clients/Commerce/Catalog/Admin/DiscountClient.cs
@@ -13,20 +13,21 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Catalog.Admin
 {
 	/// <summary>
-	/// Use the Discounts resource to define and manage discounts to apply to products, product categories, or orders. The discounts can be a specified amount off the price, percentage off the price, or for free shipping. You can create a coupon code that shoppers can use to redeem the discount.
+	/// Define and manage discounts to apply to products, product categories, or orders. The discounts can be a specified amount off the price, percentage off the price, or for free shipping. Create a coupon code that shoppers can use to redeem the discount.
 	/// </summary>
 	public partial class DiscountClient 	{
 		
 		/// <summary>
-		/// Retrieves a list of discounts according to any specified filter criteria and sort options.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
 		/// <param name="sortBy"></param>
 		/// <param name="startIndex"></param>
 		/// <returns>
@@ -51,10 +52,10 @@ public partial class DiscountClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the localized content specified for the specified discount.
+		/// 
 		/// </summary>
-		/// <param name="discountId">discountId parameter description DOCUMENT_HERE </param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="discountId">Unique identifier of the discount. System-supplied and read-only.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.DiscountLocalizedContent"/>}
 		/// </returns>
@@ -77,10 +78,10 @@ public partial class DiscountClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the details of a single discount.
+		/// 
 		/// </summary>
-		/// <param name="discountId">discountId parameter description DOCUMENT_HERE </param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="discountId">Unique identifier of the discount. System-supplied and read-only.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.Discount"/>}
 		/// </returns>
@@ -103,9 +104,9 @@ public partial class DiscountClient 	{
 		}
 
 		/// <summary>
-		/// Generates a random code for a coupon.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{string}
 		/// </returns>
@@ -127,10 +128,10 @@ public static MozuClient<string> GenerateRandomCouponClient(string responseField
 		}
 
 		/// <summary>
-		/// Creates a new discount or coupon to apply to a product, category, order, or shipping.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="discount">Name of the discount added and applied to a shopping cart and order for a shopper's purchase. </param>
+		/// <param name="responseFields"></param>
+		/// <param name="discount">Properties of the discount to create. You must specify the discount name, amount type, start date, and target.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.Discount"/>}
 		/// </returns>
@@ -152,11 +153,11 @@ public static MozuClient<string> GenerateRandomCouponClient(string responseField
 		}
 
 		/// <summary>
-		/// Updates the localizable content for the specified discount or renames the discount without modifying its other properties.
+		/// 
 		/// </summary>
-		/// <param name="discountId">discountId parameter description DOCUMENT_HERE </param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="content">The container for the language-specific name of the discount. A container exists for each supported language (LocaleCode). This parameter enables you to display the discount name in multiple languages yet manage it as a single discount internally.</param>
+		/// <param name="discountId">Unique identifier of the discount. System-supplied and read-only.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="content">The discount content to update, including the discount name.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.DiscountLocalizedContent"/>}
 		/// </returns>
@@ -178,11 +179,11 @@ public static MozuClient<string> GenerateRandomCouponClient(string responseField
 		}
 
 		/// <summary>
-		/// Updates one or more properties of the specified discount.
+		/// 
 		/// </summary>
-		/// <param name="discountId">discountId parameter description DOCUMENT_HERE </param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="discount">Name of the discount added and applied to a shopping cart and order for a shopper's purchase. </param>
+		/// <param name="discountId">Unique identifier of the discount to update.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="discount">Properties of the discount to update.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.Discount"/>}
 		/// </returns>
@@ -204,9 +205,9 @@ public static MozuClient<string> GenerateRandomCouponClient(string responseField
 		}
 
 		/// <summary>
-		/// Deletes a discount specified by its discount ID.
+		/// 
 		/// </summary>
-		/// <param name="discountId">discountId parameter description DOCUMENT_HERE </param>
+		/// <param name="discountId">Unique identifier of the discount. System-supplied and read-only.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Catalog/Admin/DiscountSettingsClient.cs b/Mozu.Api/Clients/Commerce/Catalog/Admin/DiscountSettingsClient.cs
new file mode 100755
index 00000000..eb092331
--- /dev/null
+++ b/Mozu.Api/Clients/Commerce/Catalog/Admin/DiscountSettingsClient.cs
@@ -0,0 +1,84 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using Mozu.Api.Security;
+using System.Threading.Tasks;
+using Newtonsoft.Json.Linq;
+using System.Threading;
+
+namespace Mozu.Api.Clients.Commerce.Catalog.Admin
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	public partial class DiscountSettingsClient 	{
+		
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="catalogId"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
+		/// <returns>
+		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.DiscountSettings"/>}
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var mozuClient=GetDiscountSettings(dataViewMode,  catalogId,  responseFields);
+		///   var discountSettingsClient = mozuClient.WithBaseAddress(url).Execute().Result();
+		/// </code>
+		/// </example>
+		public static MozuClient<Mozu.Api.Contracts.ProductAdmin.DiscountSettings> GetDiscountSettingsClient(DataViewMode dataViewMode, int catalogId, string responseFields =  null)
+		{
+			var url = Mozu.Api.Urls.Commerce.Catalog.Admin.DiscountSettingsUrl.GetDiscountSettingsUrl(catalogId, responseFields);
+			const string verb = "GET";
+			var mozuClient = new MozuClient<Mozu.Api.Contracts.ProductAdmin.DiscountSettings>()
+									.WithVerb(verb).WithResourceUrl(url)
+									.WithHeader(Headers.X_VOL_DATAVIEW_MODE ,dataViewMode.ToString())
+;
+			return mozuClient;
+
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="catalogId"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
+		/// <param name="discountSettings"></param>
+		/// <returns>
+		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.DiscountSettings"/>}
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var mozuClient=UpdateDiscountSettings( discountSettings,  catalogId,  responseFields);
+		///   var discountSettingsClient = mozuClient.WithBaseAddress(url).Execute().Result();
+		/// </code>
+		/// </example>
+		public static MozuClient<Mozu.Api.Contracts.ProductAdmin.DiscountSettings> UpdateDiscountSettingsClient(Mozu.Api.Contracts.ProductAdmin.DiscountSettings discountSettings, int catalogId, string responseFields =  null)
+		{
+			var url = Mozu.Api.Urls.Commerce.Catalog.Admin.DiscountSettingsUrl.UpdateDiscountSettingsUrl(catalogId, responseFields);
+			const string verb = "PUT";
+			var mozuClient = new MozuClient<Mozu.Api.Contracts.ProductAdmin.DiscountSettings>()
+									.WithVerb(verb).WithResourceUrl(url)
+									.WithBody<Mozu.Api.Contracts.ProductAdmin.DiscountSettings>(discountSettings);
+			return mozuClient;
+
+		}
+
+
+	}
+
+}
+
+
diff --git a/Mozu.Api/Clients/Commerce/Catalog/Admin/Discounts/DiscountTargetClient.cs b/Mozu.Api/Clients/Commerce/Catalog/Admin/Discounts/DiscountTargetClient.cs
old mode 100644
new mode 100755
index 1a097aa6..db8a0d28
--- a/Mozu.Api/Clients/Commerce/Catalog/Admin/Discounts/DiscountTargetClient.cs
+++ b/Mozu.Api/Clients/Commerce/Catalog/Admin/Discounts/DiscountTargetClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Catalog.Admin.Discounts
 {
@@ -22,10 +23,10 @@ namespace Mozu.Api.Clients.Commerce.Catalog.Admin.Discounts
 	public partial class DiscountTargetClient 	{
 		
 		/// <summary>
-		/// Retrieves the discount target, that is which products, categories, or shipping methods are eligible for the discount.
+		/// 
 		/// </summary>
-		/// <param name="discountId">discountId parameter description DOCUMENT_HERE </param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="discountId">Unique identifier of the discount. System-supplied and read only.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.DiscountTarget"/>}
 		/// </returns>
@@ -48,11 +49,11 @@ public partial class DiscountTargetClient 	{
 		}
 
 		/// <summary>
-		/// Modifies properties of the discount target, for example, the dollar amount, or precentage off the price.
+		/// 
 		/// </summary>
-		/// <param name="discountId">discountId parameter description DOCUMENT_HERE </param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="discountTarget">Properties of the target to which the discount applies, such as the type of discount and which products, categories, or shipping methods are eligible for the discount and the properties of this discount target.</param>
+		/// <param name="discountId">Unique identifier of the discount. System-supplied and read-only.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="discountTarget">Properties of the discount target to modify. Required properties: Target.Type. Any unspecified properties are set to null and boolean variables to false.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.DiscountTarget"/>}
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Catalog/Admin/FacetClient.cs b/Mozu.Api/Clients/Commerce/Catalog/Admin/FacetClient.cs
old mode 100644
new mode 100755
index 12f69fa2..0c5c0213
--- a/Mozu.Api/Clients/Commerce/Catalog/Admin/FacetClient.cs
+++ b/Mozu.Api/Clients/Commerce/Catalog/Admin/FacetClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Catalog.Admin
 {
@@ -22,10 +23,10 @@ namespace Mozu.Api.Clients.Commerce.Catalog.Admin
 	public partial class FacetClient 	{
 		
 		/// <summary>
-		/// Retrieves a facet specified by its unique identifier and displays its properties.
+		/// 
 		/// </summary>
 		/// <param name="facetId">Unique identifier of the facet to retrieve.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="validate">Validates that the product category associated with a facet is active. System-supplied and read only.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.Facet"/>}
@@ -48,11 +49,11 @@ public partial class FacetClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves a list of the facets defined for the specified category.
+		/// 
 		/// </summary>
-		/// <param name="categoryId">Unique identifier of the category to modify.</param>
+		/// <param name="categoryId">Unique identifier of the category associated with the facets to retrieve.</param>
 		/// <param name="includeAvailable">If true, returns a list of the attributes and categories associated with a product type that have not been defined as a facet for the category.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="validate">Validates that the product category associated with a facet is active. System-supplied and read only.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.FacetSet"/>}
@@ -75,10 +76,10 @@ public partial class FacetClient 	{
 		}
 
 		/// <summary>
-		/// Creates a new category, price, or attribute facet. Define the category or attribute source to use for the facet values.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="facet">Properties of the facet used to retrieve documents.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="facet">Properties of the new facet to create. You must specify the source, type, and category.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.Facet"/>}
 		/// </returns>
@@ -100,11 +101,11 @@ public partial class FacetClient 	{
 		}
 
 		/// <summary>
-		/// Modifies one or more properties of a defined facet.
+		/// 
 		/// </summary>
-		/// <param name="facetId">Unique identifier of the facet to retrieve.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="facet">Properties of the facet used to retrieve documents.</param>
+		/// <param name="facetId">Unique identifier of the facet to modify.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="facet">Properties of the defined facet to modify.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.Facet"/>}
 		/// </returns>
@@ -126,9 +127,9 @@ public partial class FacetClient 	{
 		}
 
 		/// <summary>
-		/// Deletes the facet specified by its unique identifier.
+		/// 
 		/// </summary>
-		/// <param name="facetId">Unique identifier of the facet to retrieve.</param>
+		/// <param name="facetId">Unique identifier of the facet to delete.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Catalog/Admin/LocationInventoryClient.cs b/Mozu.Api/Clients/Commerce/Catalog/Admin/LocationInventoryClient.cs
old mode 100644
new mode 100755
index e7d2f5c3..fb7fd2e1
--- a/Mozu.Api/Clients/Commerce/Catalog/Admin/LocationInventoryClient.cs
+++ b/Mozu.Api/Clients/Commerce/Catalog/Admin/LocationInventoryClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Catalog.Admin
 {
@@ -22,11 +23,11 @@ namespace Mozu.Api.Clients.Commerce.Catalog.Admin
 	public partial class LocationInventoryClient 	{
 		
 		/// <summary>
-		/// Retrieves the details of a product's active inventory at the location specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="locationCode">The unique, user-defined code that identifies a location. </param>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="locationCode">User-defined code that uniquely identifies the location.</param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.LocationInventory"/>}
@@ -50,15 +51,15 @@ public partial class LocationInventoryClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves a list of all product inventory definitions for the location code specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="filterFunctions">Functions that optimize commonly used filters for efficiency.For the  operation, you have access to the  filter function. For example, use  to filter only for product inventory that is currently active.</param>
-		/// <param name="locationCode">The unique, user-defined code that identifies a location. </param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+		/// <param name="filter"></param>
+		/// <param name="filterFunctions"></param>
+		/// <param name="locationCode"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.LocationInventoryCollection"/>}
@@ -82,12 +83,12 @@ public partial class LocationInventoryClient 	{
 		}
 
 		/// <summary>
-		/// Creates an array of product inventory definitions for the location specified in the request. When adding a new inventory definition, you must specify the productCode and stockOnHand value in each array you define. All other properties are system-supplied and read only.
+		/// 
 		/// </summary>
-		/// <param name="locationCode">The unique, user-defined code that identifies a location. </param>
-		/// <param name="performUpserts">Query string parameter lets the service perform an update for a new or existing record. When run, the update occurs without throwing a conflict exception that the record exists. If true, the updates completes regardless of the record currently existing. By default, if no value is specified, the service assumes this value is false.</param>
+		/// <param name="locationCode">User-defined code that uniquely identifies the location.</param>
+		/// <param name="performUpserts"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="locationInventoryList">Properties of an inventory definition that defines the level of inventory for a specific product at a given location.</param>
+		/// <param name="locationInventoryList">Array list of product inventory definitions for all associated locations. For each location inventory in the list, define the productCode and stockOnHand values.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.ProductAdmin.LocationInventory"/>}}
 		/// </returns>
@@ -110,11 +111,11 @@ public partial class LocationInventoryClient 	{
 		}
 
 		/// <summary>
-		/// Updates the active stock on hand inventory of products for the location code specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="locationCode">The unique, user-defined code that identifies a location. </param>
+		/// <param name="locationCode">User-defined code that uniquely identifies the location.</param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="locationInventoryAdjustments">Properties of an adjustment to the active product inventory of a specific location.</param>
+		/// <param name="locationInventoryAdjustments">Properties of the inventory adjustments to perform for the specified location.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.ProductAdmin.LocationInventory"/>}}
 		/// </returns>
@@ -137,10 +138,10 @@ public partial class LocationInventoryClient 	{
 		}
 
 		/// <summary>
-		/// Deletes the product code inventory definition for the location specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="locationCode">The unique, user-defined code that identifies a location. </param>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
+		/// <param name="locationCode">User-defined code that uniquely identifies the location.</param>
+		/// <param name="productCode"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
diff --git a/Mozu.Api/Clients/Commerce/Catalog/Admin/MasterCatalogClient.cs b/Mozu.Api/Clients/Commerce/Catalog/Admin/MasterCatalogClient.cs
old mode 100644
new mode 100755
index d14797f1..75baee09
--- a/Mozu.Api/Clients/Commerce/Catalog/Admin/MasterCatalogClient.cs
+++ b/Mozu.Api/Clients/Commerce/Catalog/Admin/MasterCatalogClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Catalog.Admin
 {
@@ -22,9 +23,9 @@ namespace Mozu.Api.Clients.Commerce.Catalog.Admin
 	public partial class MasterCatalogClient 	{
 		
 		/// <summary>
-		/// Retrieve the details of all master catalog associated with a tenant.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.MasterCatalogCollection"/>}
 		/// </returns>
@@ -46,10 +47,10 @@ public partial class MasterCatalogClient 	{
 		}
 
 		/// <summary>
-		/// Retrieve the details of the master catalog specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="masterCatalogId">The unique identifier of the master catalog associated with the entity.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="masterCatalogId"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.MasterCatalog"/>}
 		/// </returns>
@@ -71,11 +72,11 @@ public partial class MasterCatalogClient 	{
 		}
 
 		/// <summary>
-		/// Updates the product publishing mode for the master catalog specified in the request.
+		/// 
 		/// </summary>
 		/// <param name="masterCatalogId"></param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="masterCatalog">Properties of a master product catalog defined for a tenant. All catalogs and sites associated with a master catalog share product definitions.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="masterCatalog">Properties of the master catalog to update, which consists of the product publishing mode. Possible values are "Pending" which saves product updates in draft mode until they are published, and "Live" which publishes all product changes immediately.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.MasterCatalog"/>}
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Catalog/Admin/PriceListClient.cs b/Mozu.Api/Clients/Commerce/Catalog/Admin/PriceListClient.cs
old mode 100644
new mode 100755
index fe239ff5..648d40f7
--- a/Mozu.Api/Clients/Commerce/Catalog/Admin/PriceListClient.cs
+++ b/Mozu.Api/Clients/Commerce/Catalog/Admin/PriceListClient.cs
@@ -13,22 +13,23 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Catalog.Admin
 {
 	/// <summary>
-	/// Use the Price Lists resource to view and create price lists. You can use price lists to override the catalog pricing of products for specific customer segments and/or sites. You can override products' list price, sale price, advanced pricing information such as MSRP, cost, MAP, and the catalog price of any extras associated with the product in a price list. You can also restrict discounts from applying to the overridden product pricing in a price list. Refer to [Price Lists](../../../guides/catalog/price-lists.htm) in the Guides section for more information about price lists.
+	/// 
 	/// </summary>
 	public partial class PriceListClient 	{
 		
 		/// <summary>
-		/// Retrieves a list of price lists according to any specified facets, filter criteria, and sort options.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.PriceListCollection"/>}
 		/// </returns>
@@ -50,10 +51,10 @@ public partial class PriceListClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the details of the specified price list.
+		/// 
 		/// </summary>
-		/// <param name="priceListCode">The unique, user-defined code of the price list.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="priceListCode"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.PriceList"/>}
 		/// </returns>
@@ -75,10 +76,10 @@ public partial class PriceListClient 	{
 		}
 
 		/// <summary>
-		/// Adds a new price list to the tenant.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="priceList">The details of the new price list.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="priceList"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.PriceList"/>}
 		/// </returns>
@@ -100,10 +101,10 @@ public partial class PriceListClient 	{
 		}
 
 		/// <summary>
-		/// Adds up to 5000 new price list entries in bulk.
+		/// 
 		/// </summary>
-		/// <param name="invalidateCache">Disable this property if you expect to encounter unacceptable performance hits related to clearing the cache for each product in the price list entries. Otherwise, leave this property enabled.</param>
-		/// <param name="publishEvents">Disable this property to prevent publishing the event related to adding price list entries to the system. Disabling this property helps you prevent performance delays if you expect the event to trigger the re-indexing of a large number of products, or if you want to postpone the operations of other applications and services listening for the event.</param>
+		/// <param name="invalidateCache"></param>
+		/// <param name="publishEvents"></param>
 		/// <param name="priceListEntriesIn"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
@@ -126,10 +127,10 @@ public static MozuClient BulkAddPriceListEntriesClient(List<Mozu.Api.Contracts.P
 		}
 
 		/// <summary>
-		/// Deletes up to 5000 price list entries in bulk.
+		/// 
 		/// </summary>
-		/// <param name="invalidateCache">Disable this property if you expect to encounter unacceptable performance hits related to clearing the cache for each product in the price list entries. Otherwise, leave this property enabled.</param>
-		/// <param name="publishEvents">Disable this property to prevent publishing the event related to deleting price list entries from the system. Disabling this property helps you prevent performance delays if you expect the event to trigger the re-indexing of a large number of products, or if you want to postpone the operations of other applications and services listening for the event.</param>
+		/// <param name="invalidateCache"></param>
+		/// <param name="publishEvents"></param>
 		/// <param name="priceListEntriesIn"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
@@ -152,10 +153,10 @@ public static MozuClient BulkDeletePriceListEntriesClient(List<Mozu.Api.Contract
 		}
 
 		/// <summary>
-		/// Updates up to 5000 price list entries in bulk.
+		/// 
 		/// </summary>
-		/// <param name="invalidateCache">Disable this property if you expect to encounter unacceptable performance hits related to clearing the cache for each product in the price list entries. Otherwise, leave this property enabled.</param>
-		/// <param name="publishEvents">Disable this property to prevent publishing the event related to updating price list entries in the system. Disabling this property helps you prevent performance delays if you expect the event to trigger the re-indexing of a large number of products, or if you want to postpone the operations of other applications and services listening for the event.</param>
+		/// <param name="invalidateCache"></param>
+		/// <param name="publishEvents"></param>
 		/// <param name="priceListEntriesIn"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
@@ -178,11 +179,11 @@ public static MozuClient BulkUpdatePriceListEntriesClient(List<Mozu.Api.Contract
 		}
 
 		/// <summary>
-		/// Updates the details of the specified price list.
+		/// 
 		/// </summary>
-		/// <param name="priceListCode">The unique, user-defined code of the price list.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="priceList">The details of the updated price list.</param>
+		/// <param name="priceListCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="priceList"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.PriceList"/>}
 		/// </returns>
@@ -204,10 +205,10 @@ public static MozuClient BulkUpdatePriceListEntriesClient(List<Mozu.Api.Contract
 		}
 
 		/// <summary>
-		/// Deletes the specified price list from the tenant.
+		/// 
 		/// </summary>
-		/// <param name="cascadeDeleteEntries">Specifies whether to deletes all price list entries associated with the price list.</param>
-		/// <param name="priceListCode">The unique, user-defined code of the price list.</param>
+		/// <param name="cascadeDeleteEntries"></param>
+		/// <param name="priceListCode"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Catalog/Admin/Pricelists/PriceListEntryClient.cs b/Mozu.Api/Clients/Commerce/Catalog/Admin/Pricelists/PriceListEntryClient.cs
old mode 100644
new mode 100755
index 0d9d7931..7bd37a50
--- a/Mozu.Api/Clients/Commerce/Catalog/Admin/Pricelists/PriceListEntryClient.cs
+++ b/Mozu.Api/Clients/Commerce/Catalog/Admin/Pricelists/PriceListEntryClient.cs
@@ -13,22 +13,23 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Catalog.Admin.Pricelists
 {
 	/// <summary>
-	/// Use the Entries sub-resource to interact with price list entries. Price list entries enable you to override product pricing as well as control what products shoppers can view and purchase when the price list is exclusive. Refer to the [Price Lists](../../../guides/catalog/price-lists.htm) guides topic for more information.
+	/// 
 	/// </summary>
 	public partial class PriceListEntryClient 	{
 		
 		/// <summary>
-		/// Retrieves the details of a price list entry.
+		/// 
 		/// </summary>
-		/// <param name="currencyCode">The three character ISO currency code, such as USD for US Dollars.</param>
-		/// <param name="priceListCode">The unique code of the price list associated with the price list entry.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="startDate">The start date of the price list entry.</param>
+		/// <param name="currencyCode"></param>
+		/// <param name="priceListCode"></param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="startDate"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.PriceListEntry"/>}
 		/// </returns>
@@ -50,14 +51,14 @@ public partial class PriceListEntryClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves a list of price list entries associated with the specified price list according to any specified facets, filter criteria, and sort options.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="priceListCode">The unique code of the price list associated with the price list entry.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="priceListCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.PriceListEntryCollection"/>}
 		/// </returns>
@@ -79,11 +80,11 @@ public partial class PriceListEntryClient 	{
 		}
 
 		/// <summary>
-		/// Adds a new price list entry to the specified price list.
+		/// 
 		/// </summary>
-		/// <param name="priceListCode">The specified price list to which you want to add the price list entry.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="priceListEntryIn">The details of the new price list entry.</param>
+		/// <param name="priceListCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="priceListEntryIn"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.PriceListEntry"/>}
 		/// </returns>
@@ -105,14 +106,14 @@ public partial class PriceListEntryClient 	{
 		}
 
 		/// <summary>
-		/// Updates the details of a price list entry.
+		/// 
 		/// </summary>
-		/// <param name="currencyCode">The three character ISO currency code, such as USD for US Dollars.</param>
-		/// <param name="priceListCode">The unique code of the price list associated with the price list entry.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="startDate">The start date of the price list entry.</param>
-		/// <param name="priceListEntryIn">The updated details of the price list entry.</param>
+		/// <param name="currencyCode"></param>
+		/// <param name="priceListCode"></param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="startDate"></param>
+		/// <param name="priceListEntryIn"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.PriceListEntry"/>}
 		/// </returns>
@@ -134,12 +135,12 @@ public partial class PriceListEntryClient 	{
 		}
 
 		/// <summary>
-		/// Deletes a price list entry.
+		/// 
 		/// </summary>
-		/// <param name="currencyCode">The three character ISO currency code, such as USD for US Dollars.</param>
-		/// <param name="priceListCode">The code of the specified price list associated with the price list entry.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="startDate">The start date of the price list entry.</param>
+		/// <param name="currencyCode"></param>
+		/// <param name="priceListCode"></param>
+		/// <param name="productCode"></param>
+		/// <param name="startDate"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Catalog/Admin/ProductClient.cs b/Mozu.Api/Clients/Commerce/Catalog/Admin/ProductClient.cs
old mode 100644
new mode 100755
index 811d4f43..79f6a0ac
--- a/Mozu.Api/Clients/Commerce/Catalog/Admin/ProductClient.cs
+++ b/Mozu.Api/Clients/Commerce/Catalog/Admin/ProductClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Catalog.Admin
 {
@@ -22,14 +23,14 @@ namespace Mozu.Api.Clients.Commerce.Catalog.Admin
 	public partial class ProductClient 	{
 		
 		/// <summary>
-		/// Retrieves a list of products according to any specified facets, filter criteria, and sort options.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
+		/// <param name="filter"></param>
 		/// <param name="noCount">If true, the operation does not return the TotalCount number of results.</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="q">A list of order search terms (not phrases) to use in the query when searching across order number and the name or email of the billing contact. When entering, separate multiple search terms with a space character.</param>
+		/// <param name="pageSize"></param>
+		/// <param name="q">A list of product search terms to use in the query when searching across product code and product name. Separate multiple search terms with a space character.</param>
 		/// <param name="qLimit">The maximum number of search results to return in the response. You can limit any range between 1-100.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="sortBy"></param>
 		/// <param name="startIndex"></param>
 		/// <returns>
@@ -54,9 +55,9 @@ public partial class ProductClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves a product that is associated with one or more specific catalogs.
+		/// 
 		/// </summary>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
+		/// <param name="productCode"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductInCatalogInfo"/>}}
 		/// </returns>
@@ -79,11 +80,11 @@ public partial class ProductClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the details of a product associated with a specific catalog.
+		/// 
 		/// </summary>
-		/// <param name="catalogId">The unique identifier of the catalog of products used by a site.</param>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="catalogId"></param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductInCatalogInfo"/>}
 		/// </returns>
@@ -106,10 +107,10 @@ public partial class ProductClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the details of a product definition.
+		/// 
 		/// </summary>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.Product"/>}
 		/// </returns>
@@ -132,10 +133,10 @@ public partial class ProductClient 	{
 		}
 
 		/// <summary>
-		/// Creates a new product definition in the specified master catalog.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="product">The properties of a product, referenced and used by carts, orders, wish lists, and returns.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="product">Properties of the new product. You must supply values for the product code, product name, and price.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.Product"/>}
 		/// </returns>
@@ -158,11 +159,11 @@ public partial class ProductClient 	{
 		}
 
 		/// <summary>
-		/// Associates a new product defined in the master catalog with a specific catalog.
+		/// 
 		/// </summary>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="productInCatalogInfoIn">Properties of a product associated with a specific catalog.</param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="productInCatalogInfoIn">Properties of the product to define for the specific catalog association.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductInCatalogInfo"/>}
 		/// </returns>
@@ -185,9 +186,9 @@ public partial class ProductClient 	{
 		}
 
 		/// <summary>
-		/// Performs an update to a product code by renaming or replacing the current product code with a new one.
+		/// 
 		/// </summary>
-		/// <param name="productCodeRenames">Properties for a product code current and changed content.</param>
+		/// <param name="productCodeRenames"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
@@ -209,10 +210,10 @@ public static MozuClient RenameProductCodesClient(List<Mozu.Api.Contracts.Produc
 		}
 
 		/// <summary>
-		/// Updates the properties of a product specific to each catalog associated with the product.
+		/// 
 		/// </summary>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="productInCatalogsIn">Properties of a product associated with a specific catalog.</param>
+		/// <param name="productCode"></param>
+		/// <param name="productInCatalogsIn">Properties of the product to update for each associated catalog.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductInCatalogInfo"/>}}
 		/// </returns>
@@ -235,12 +236,12 @@ public static MozuClient RenameProductCodesClient(List<Mozu.Api.Contracts.Produc
 		}
 
 		/// <summary>
-		/// Updates one or more properties of a product associated with a specific catalog.
+		/// 
 		/// </summary>
-		/// <param name="catalogId">The unique identifier of the catalog of products used by a site.</param>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="productInCatalogInfoIn">Properties of a product associated with a specific catalog.</param>
+		/// <param name="catalogId"></param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="productInCatalogInfoIn">Properties of the product associated with the catalog specified in the request.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductInCatalogInfo"/>}
 		/// </returns>
@@ -263,11 +264,11 @@ public static MozuClient RenameProductCodesClient(List<Mozu.Api.Contracts.Produc
 		}
 
 		/// <summary>
-		/// Updates one or more properties of a product definition in a master catalog.
+		/// 
 		/// </summary>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="product">The properties of a product, referenced and used by carts, orders, wish lists, and returns.</param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="product">Properties of the product definition to update in the master catalog.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.Product"/>}
 		/// </returns>
@@ -290,9 +291,9 @@ public static MozuClient RenameProductCodesClient(List<Mozu.Api.Contracts.Produc
 		}
 
 		/// <summary>
-		/// Deletes the specified product from a master catalog.
+		/// 
 		/// </summary>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
+		/// <param name="productCode"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
@@ -315,10 +316,10 @@ public static MozuClient DeleteProductClient(DataViewMode dataViewMode, string p
 		}
 
 		/// <summary>
-		/// Removes the product association defined for a specific catalog.
+		/// 
 		/// </summary>
-		/// <param name="catalogId">The unique identifier of the catalog of products used by a site.</param>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
+		/// <param name="catalogId"></param>
+		/// <param name="productCode"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Catalog/Admin/ProductReservationClient.cs b/Mozu.Api/Clients/Commerce/Catalog/Admin/ProductReservationClient.cs
old mode 100644
new mode 100755
index 3b2374fe..e6cbedf1
--- a/Mozu.Api/Clients/Commerce/Catalog/Admin/ProductReservationClient.cs
+++ b/Mozu.Api/Clients/Commerce/Catalog/Admin/ProductReservationClient.cs
@@ -13,21 +13,22 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Catalog.Admin
 {
 	/// <summary>
-	/// Use the Product Reservations resource to temporarily hold a product from inventory while a shopper is filling out payment information. You can create a product reservation when a shopper proceeds to check out and then release the reservation when the order process is complete.
+	/// Temporarily hold a product from inventory while a shopper is filling out payment information. Create a product reservation when a shopper proceeds to check out and then release the reservation when the order process is complete.
 	/// </summary>
 	public partial class ProductReservationClient 	{
 		
 		/// <summary>
-		/// Retrieves a list of product reservations according to any specified filter criteria and sort options.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy"></param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize">Used to page results from a query. Indicates the maximum number of entities to return from a query. Default value: 20. Max value: 200.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy">The element to sort the results by and the order in which the results appear. Either ascending order (a-z) which accepts 'asc' or 'asc' or descending order (z-a) which accepts 'desc' or 'desc'. The sortBy parameter follows an available property.</param>
 		/// <param name="startIndex"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
@@ -52,10 +53,10 @@ public partial class ProductReservationClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the details of a product reservation.
+		/// 
 		/// </summary>
 		/// <param name="productReservationId">Unique identifier of the product reservation.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductReservation"/>}
@@ -79,11 +80,11 @@ public partial class ProductReservationClient 	{
 		}
 
 		/// <summary>
-		/// Creates a new product reservation for a product. This action places a hold on the product inventory for the quantity specified during the ordering process.
+		/// 
 		/// </summary>
 		/// <param name="skipInventoryCheck">If true, skip the process to validate inventory when creating this product reservation.</param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="productReservations">A hold placed on product inventory for a particular product so that the quantity specified is set aside and available for purchase during the ordering process.</param>
+		/// <param name="productReservations">Details of the product reservations to add.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductReservation"/>}}
 		/// </returns>
@@ -106,10 +107,10 @@ public partial class ProductReservationClient 	{
 		}
 
 		/// <summary>
-		/// Commits a product reservation to decrement the product's inventory by the quantity specified then release the reservation once the order process completed successfully.
+		/// 
 		/// </summary>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="productReservations">A hold placed on product inventory for a particular product so that the quantity specified is set aside and available for purchase during the ordering process.</param>
+		/// <param name="productReservations">List of unique identifiers of the reservations to commit.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
@@ -132,11 +133,11 @@ public static MozuClient CommitReservationsClient(DataViewMode dataViewMode, Lis
 		}
 
 		/// <summary>
-		/// Updates an existing product reservation for a product.
+		/// 
 		/// </summary>
-		/// <param name="skipInventoryCheck">If true, skip the process to validate inventory when creating this product reservation.</param>
+		/// <param name="skipInventoryCheck">If true, skip the inventory validation process when updating this product reservation.</param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="productReservations">A hold placed on product inventory for a particular product so that the quantity specified is set aside and available for purchase during the ordering process.</param>
+		/// <param name="productReservations">Properties of the product reservations to update.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductReservation"/>}}
 		/// </returns>
@@ -159,9 +160,9 @@ public static MozuClient CommitReservationsClient(DataViewMode dataViewMode, Lis
 		}
 
 		/// <summary>
-		/// Deletes a product reservation. For example, delete a reservation when an order is not processed to return the product quantity back to inventory.
+		/// 
 		/// </summary>
-		/// <param name="productReservationId">Unique identifier of the product reservation.</param>
+		/// <param name="productReservationId">Unique identifier of the reservation.</param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
diff --git a/Mozu.Api/Clients/Commerce/Catalog/Admin/Products/LocationInventoryClient.cs b/Mozu.Api/Clients/Commerce/Catalog/Admin/Products/LocationInventoryClient.cs
old mode 100644
new mode 100755
index eb7c8b7b..9f475d38
--- a/Mozu.Api/Clients/Commerce/Catalog/Admin/Products/LocationInventoryClient.cs
+++ b/Mozu.Api/Clients/Commerce/Catalog/Admin/Products/LocationInventoryClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Catalog.Admin.Products
 {
@@ -22,14 +23,14 @@ namespace Mozu.Api.Clients.Commerce.Catalog.Admin.Products
 	public partial class LocationInventoryClient 	{
 		
 		/// <summary>
-		/// Retrieves all locations for which a product has inventory defined and displays the inventory definition properties of each location.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.LocationInventoryCollection"/>}
 		/// </returns>
@@ -52,11 +53,11 @@ public partial class LocationInventoryClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the details of the inventory of the product in the location specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="locationCode">The unique, user-defined code that identifies a location. </param>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="locationCode">User-defined code that identifies the location.</param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.LocationInventory"/>}
 		/// </returns>
@@ -79,11 +80,11 @@ public partial class LocationInventoryClient 	{
 		}
 
 		/// <summary>
-		/// Creates a new location inventory definition for the product code specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="performUpserts">Query string parameter lets the service perform an update for a new or existing record. When run, the update occurs without throwing a conflict exception that the record exists. If true, the updates completes regardless of the record currently existing. By default, if no value is specified, the service assumes this value is false.</param>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="locationInventoryList">Properties of an inventory definition that defines the level of inventory for a specific product at a given location.</param>
+		/// <param name="performUpserts">The performUpserts query string parameter lets the service perform an update if the record already exists instead of throwing an already exists conflict exception. PerformUpserts=true means it updates if the record already exists. By default, no value specified means that the service assumes PerformUpserts=false.</param>
+		/// <param name="productCode"></param>
+		/// <param name="locationInventoryList">Array list of the location inventory definitions associated with the product code specified in the request. For each location, you must define the locationCode value and the stockOnHand value. All other properties in the array are system-supplied and read only.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.ProductAdmin.LocationInventory"/>}}
 		/// </returns>
@@ -106,10 +107,10 @@ public partial class LocationInventoryClient 	{
 		}
 
 		/// <summary>
-		/// Updates the current level of stock at each location associated with the product code specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="locationInventoryAdjustments">Properties of an adjustment to the active product inventory of a specific location.</param>
+		/// <param name="productCode">The product code of the product for which to update active stock on hand inventory at a specified location.</param>
+		/// <param name="locationInventoryAdjustments">Properties of the inventory adjustments to perform for the specified location.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.ProductAdmin.LocationInventory"/>}}
 		/// </returns>
@@ -132,10 +133,10 @@ public partial class LocationInventoryClient 	{
 		}
 
 		/// <summary>
-		/// Deletes the location inventory definition for the product code specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="locationCode">The unique, user-defined code that identifies a location. </param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
+		/// <param name="locationCode">The code that identifies the location for which to delete product inventory.</param>
+		/// <param name="productCode">The product code for which to delete a location's inventory.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Catalog/Admin/Products/ProductExtraClient.cs b/Mozu.Api/Clients/Commerce/Catalog/Admin/Products/ProductExtraClient.cs
old mode 100644
new mode 100755
index d968b9a2..5b2bb974
--- a/Mozu.Api/Clients/Commerce/Catalog/Admin/Products/ProductExtraClient.cs
+++ b/Mozu.Api/Clients/Commerce/Catalog/Admin/Products/ProductExtraClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Catalog.Admin.Products
 {
@@ -22,9 +23,9 @@ namespace Mozu.Api.Clients.Commerce.Catalog.Admin.Products
 	public partial class ProductExtraClient 	{
 		
 		/// <summary>
-		/// Retrieves a list of extras configured for the product according to any defined filter and sort criteria.
+		/// 
 		/// </summary>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
+		/// <param name="productCode"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductExtra"/>}}
 		/// </returns>
@@ -47,11 +48,11 @@ public partial class ProductExtraClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves a collection of all localized delta price values for a product extra. Localized delta prices are deltas between two differing monetary conversion amounts between countries, such as US Dollar vs Euro.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="value">The value string to create.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="productCode"></param>
+		/// <param name="value"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductExtraValueDeltaPrice"/>}}
 		/// </returns>
@@ -74,13 +75,13 @@ public partial class ProductExtraClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the localized delta price value for a product extra. Localized delta prices are deltas between two differing monetary conversion amounts between countries, such as US Dollar vs Euro.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="currencyCode">The three character ISO currency code, such as USD for US Dollars.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="value">The value string to create.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="currencyCode"></param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="value"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductExtraValueDeltaPrice"/>}
 		/// </returns>
@@ -103,11 +104,11 @@ public partial class ProductExtraClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the details of an extra attribute configuration for the product specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductExtra"/>}
 		/// </returns>
@@ -130,13 +131,13 @@ public partial class ProductExtraClient 	{
 		}
 
 		/// <summary>
-		/// Adds a localized delta price value for a product extra. Localized delta prices are deltas between two differing monetary conversion amounts between countries, such as US Dollar vs Euro.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="value">The value string to create.</param>
-		/// <param name="localizedDeltaPrice">The properties of the price difference between the product extra and the base product.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="value"></param>
+		/// <param name="localizedDeltaPrice"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductExtraValueDeltaPrice"/>}
 		/// </returns>
@@ -159,11 +160,11 @@ public partial class ProductExtraClient 	{
 		}
 
 		/// <summary>
-		/// Configure an extra attribute for the product specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="productExtra">Properties of an extra attribute to defined for a product that is associated with a product type that uses the extra. Setting up extras for a product enables shopper-entered information, such as initials for a monogram.</param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="productExtra">Properties of the product extra to configure for the specified product.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductExtra"/>}
 		/// </returns>
@@ -186,12 +187,12 @@ public partial class ProductExtraClient 	{
 		}
 
 		/// <summary>
-		/// Updates all localized delta price values for a product extra. Localized delta prices are deltas between two differing monetary conversion amounts between countries, such as US Dollar vs Euro.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="value">The value string to create.</param>
-		/// <param name="localizedDeltaPrice">The properties of the price difference between the product extra and the base product.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="productCode"></param>
+		/// <param name="value"></param>
+		/// <param name="localizedDeltaPrice"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductExtraValueDeltaPrice"/>}}
 		/// </returns>
@@ -214,14 +215,14 @@ public partial class ProductExtraClient 	{
 		}
 
 		/// <summary>
-		/// Updates the localized delta price value for a product extra. Localized delta prices are deltas between two differing monetary conversion amounts between countries, such as US Dollar vs Euro.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="currencyCode">The three character ISO currency code, such as USD for US Dollars.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="value">The value string to create.</param>
-		/// <param name="localizedDeltaPrice">The properties of the price difference between the product extra and the base product.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="currencyCode"></param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="value"></param>
+		/// <param name="localizedDeltaPrice"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductExtraValueDeltaPrice"/>}
 		/// </returns>
@@ -244,12 +245,12 @@ public partial class ProductExtraClient 	{
 		}
 
 		/// <summary>
-		/// Updates the configuration of an extra attribute for the product specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="productExtra">Properties of an extra attribute to defined for a product that is associated with a product type that uses the extra. Setting up extras for a product enables shopper-entered information, such as initials for a monogram.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="productExtra">Properties of the extra attribute to update for the specified product.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductExtra"/>}
 		/// </returns>
@@ -272,10 +273,10 @@ public partial class ProductExtraClient 	{
 		}
 
 		/// <summary>
-		/// Delete a product extra configuration for the product specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="productCode"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
@@ -298,12 +299,12 @@ public static MozuClient DeleteExtraClient(DataViewMode dataViewMode, string pro
 		}
 
 		/// <summary>
-		/// Deletes the localized delta price value for a product extra. Localized delta prices are deltas between two differing monetary conversion amounts between countries, such as US Dollar vs Euro.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="currencyCode">The three character ISO currency code, such as USD for US Dollars.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="value">Use this field to include those fields which are not included by default.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="currencyCode"></param>
+		/// <param name="productCode"></param>
+		/// <param name="value"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Catalog/Admin/Products/ProductOptionClient.cs b/Mozu.Api/Clients/Commerce/Catalog/Admin/Products/ProductOptionClient.cs
old mode 100644
new mode 100755
index b2008a55..b9d30c5f
--- a/Mozu.Api/Clients/Commerce/Catalog/Admin/Products/ProductOptionClient.cs
+++ b/Mozu.Api/Clients/Commerce/Catalog/Admin/Products/ProductOptionClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Catalog.Admin.Products
 {
@@ -22,9 +23,9 @@ namespace Mozu.Api.Clients.Commerce.Catalog.Admin.Products
 	public partial class ProductOptionClient 	{
 		
 		/// <summary>
-		/// Retrieves a list of all option attributes configured for the product specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
+		/// <param name="productCode"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductOption"/>}}
 		/// </returns>
@@ -47,11 +48,11 @@ public partial class ProductOptionClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the details of an option attribute configuration for the specified product.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductOption"/>}
 		/// </returns>
@@ -74,11 +75,11 @@ public partial class ProductOptionClient 	{
 		}
 
 		/// <summary>
-		/// Configures an option attribute for the product specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="productOption">Properties of the product option to create such as attribute detail, fully qualified name, and list of product option values.</param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="productOption">Properties of the option attribute to define for the product.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductOption"/>}
 		/// </returns>
@@ -101,12 +102,12 @@ public partial class ProductOptionClient 	{
 		}
 
 		/// <summary>
-		/// Updates one or more properties of an option attribute configured for a product.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="productOption">Properties of the product option to create such as attribute detail, fully qualified name, and list of product option values.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="productOption">Properties of the product option attribute configuration to update.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductOption"/>}
 		/// </returns>
@@ -129,10 +130,10 @@ public partial class ProductOptionClient 	{
 		}
 
 		/// <summary>
-		/// Deletes the configuration of an option attribute for the product specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="productCode"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Catalog/Admin/Products/ProductPropertyClient.cs b/Mozu.Api/Clients/Commerce/Catalog/Admin/Products/ProductPropertyClient.cs
old mode 100644
new mode 100755
index 65cca7af..2c1a0cab
--- a/Mozu.Api/Clients/Commerce/Catalog/Admin/Products/ProductPropertyClient.cs
+++ b/Mozu.Api/Clients/Commerce/Catalog/Admin/Products/ProductPropertyClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Catalog.Admin.Products
 {
@@ -22,9 +23,9 @@ namespace Mozu.Api.Clients.Commerce.Catalog.Admin.Products
 	public partial class ProductPropertyClient 	{
 		
 		/// <summary>
-		/// Retrieves a list of the property attributes configured for the product specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
+		/// <param name="productCode"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductProperty"/>}}
 		/// </returns>
@@ -47,11 +48,11 @@ public partial class ProductPropertyClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves a collection of property values for localized content. This content is set by the locale code. 
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="value">The value string to create.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="productCode"></param>
+		/// <param name="value"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductPropertyValueLocalizedContent"/>}}
 		/// </returns>
@@ -74,13 +75,13 @@ public partial class ProductPropertyClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the property value for localized content. This content is set by the locale code. 
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="localeCode">Language used for the entity. Currently, only "en-US" is supported.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="value">The value string to create.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="localeCode"></param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="value"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductPropertyValueLocalizedContent"/>}
 		/// </returns>
@@ -103,11 +104,11 @@ public partial class ProductPropertyClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the details of a property attribute configuration for the product specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductProperty"/>}
 		/// </returns>
@@ -130,13 +131,13 @@ public partial class ProductPropertyClient 	{
 		}
 
 		/// <summary>
-		/// Adds a property value for localized content. This content is set by the locale code. 
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="value">The value string to create.</param>
-		/// <param name="localizedContent">Use this field to include those fields which are not included by default.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="value"></param>
+		/// <param name="localizedContent"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductPropertyValueLocalizedContent"/>}
 		/// </returns>
@@ -159,11 +160,11 @@ public partial class ProductPropertyClient 	{
 		}
 
 		/// <summary>
-		/// Configures a property attribute for the product specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="productProperty">Details of a property defined for a product.</param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="productProperty">Properties of the property attribute to configure for a product.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductProperty"/>}
 		/// </returns>
@@ -186,12 +187,12 @@ public partial class ProductPropertyClient 	{
 		}
 
 		/// <summary>
-		/// Updates all property values for localized content. This content is set by the locale code. 
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="value">The value string to create.</param>
-		/// <param name="localizedContent">Content of the product property value in the language defined for the locale code.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="productCode"></param>
+		/// <param name="value"></param>
+		/// <param name="localizedContent"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductPropertyValueLocalizedContent"/>}}
 		/// </returns>
@@ -214,14 +215,14 @@ public partial class ProductPropertyClient 	{
 		}
 
 		/// <summary>
-		/// Updates the property value for localized content. This content is set by the locale code. 
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="localeCode">Language used for the entity. Currently, only "en-US" is supported.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="value">The value string to create.</param>
-		/// <param name="localizedContent">Content of the product property value in the language defined for the locale code.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="localeCode"></param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="value"></param>
+		/// <param name="localizedContent"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductPropertyValueLocalizedContent"/>}
 		/// </returns>
@@ -244,12 +245,12 @@ public partial class ProductPropertyClient 	{
 		}
 
 		/// <summary>
-		/// Update one or more details of a property attribute configuration for the product specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="productProperty">Details of a property defined for a product.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="productProperty">Details of the property attribute to update for the product configuration.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductProperty"/>}
 		/// </returns>
@@ -272,10 +273,10 @@ public partial class ProductPropertyClient 	{
 		}
 
 		/// <summary>
-		/// Deletes the configuration of a property attribute for the product specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="productCode"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
@@ -298,12 +299,12 @@ public static MozuClient DeletePropertyClient(DataViewMode dataViewMode, string
 		}
 
 		/// <summary>
-		/// Deletes the property value for localized content. This content is set by the locale code. 
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="localeCode">Language used for the entity. Currently, only "en-US" is supported.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="value">The value string to create.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="localeCode"></param>
+		/// <param name="productCode"></param>
+		/// <param name="value"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Catalog/Admin/Products/ProductVariationClient.cs b/Mozu.Api/Clients/Commerce/Catalog/Admin/Products/ProductVariationClient.cs
old mode 100644
new mode 100755
index c7712548..be7af33d
--- a/Mozu.Api/Clients/Commerce/Catalog/Admin/Products/ProductVariationClient.cs
+++ b/Mozu.Api/Clients/Commerce/Catalog/Admin/Products/ProductVariationClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Catalog.Admin.Products
 {
@@ -22,10 +23,10 @@ namespace Mozu.Api.Clients.Commerce.Catalog.Admin.Products
 	public partial class ProductVariationClient 	{
 		
 		/// <summary>
-		/// Retrieves a collection of the localized delta price values for a product variation. Localized delta prices are deltas between two differing monetary conversion amounts between countries, such as US Dollar vs Euro.
+		/// 
 		/// </summary>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="variationKey">System-generated key that represents the attribute values that uniquely identify a specific product variation.</param>
+		/// <param name="productCode"></param>
+		/// <param name="variationKey"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice"/>}}
 		/// </returns>
@@ -48,12 +49,12 @@ public partial class ProductVariationClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the localized delta price value for a product variation. Localized delta prices are deltas between two differing monetary conversion amounts between countries, such as US Dollar vs Euro.
+		/// 
 		/// </summary>
-		/// <param name="currencyCode">The three character ISO currency code, such as USD for US Dollars.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="variationKey">System-generated key that represents the attribute values that uniquely identify a specific product variation.</param>
+		/// <param name="currencyCode"></param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="variationKey"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice"/>}
 		/// </returns>
@@ -76,10 +77,10 @@ public partial class ProductVariationClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves a list of details of the localized price values for a product variation.
+		/// 
 		/// </summary>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="variationKey">System-generated key that represents the attribute values that uniquely identify a specific product variation.</param>
+		/// <param name="productCode"></param>
+		/// <param name="variationKey"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice"/>}}
 		/// </returns>
@@ -102,12 +103,12 @@ public partial class ProductVariationClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the details of the localized price value for a product variation and a specific localized currency.
+		/// 
 		/// </summary>
-		/// <param name="currencyCode">The three character ISO currency code, such as USD for US Dollars.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="variationKey">System-generated key that represents the attribute values that uniquely identify a specific product variation.</param>
+		/// <param name="currencyCode"></param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="variationKey"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice"/>}
 		/// </returns>
@@ -130,10 +131,10 @@ public partial class ProductVariationClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the details of a product variation based on the supplied product code and variation key.
+		/// 
 		/// </summary>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
 		/// <param name="variationKey">System-generated key that represents the attribute values that uniquely identify a specific product variation.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductVariation"/>}
@@ -157,14 +158,14 @@ public partial class ProductVariationClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves a list of the product variations configured for the specified product code.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductVariationPagedCollection"/>}
 		/// </returns>
@@ -187,12 +188,12 @@ public partial class ProductVariationClient 	{
 		}
 
 		/// <summary>
-		/// Adds the localized delta price value for a product variation. Localized delta prices are deltas between two differing monetary conversion amounts between countries, such as US Dollar vs Euro.
+		/// 
 		/// </summary>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="variationKey">System-generated key that represents the attribute values that uniquely identify a specific product variation.</param>
-		/// <param name="localizedDeltaPrice">The difference between the base price for the product and this variation of the product, which can be a positive or negative decimal value. For example, if the base price for a t-shirt product is $10, but the XL variation should cost $12, the DeltaPrice value should be "2". However, if the XS variation should only cost $8, the DeltaPrice value should be "-2".</param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="variationKey"></param>
+		/// <param name="localizedDeltaPrice"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice"/>}
 		/// </returns>
@@ -215,12 +216,12 @@ public partial class ProductVariationClient 	{
 		}
 
 		/// <summary>
-		/// Adds the localized price value for a product variation and a specific localized currency.
+		/// 
 		/// </summary>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="variationKey">System-generated key that represents the attribute values that uniquely identify a specific product variation.</param>
-		/// <param name="localizedPrice">The details of the product variation localized price.</param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="variationKey"></param>
+		/// <param name="localizedPrice"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice"/>}
 		/// </returns>
@@ -243,11 +244,11 @@ public partial class ProductVariationClient 	{
 		}
 
 		/// <summary>
-		/// Updates all localized delta price values for a product variation. Localized delta prices are deltas between two differing monetary conversion amounts between countries, such as US Dollar vs Euro.
+		/// 
 		/// </summary>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="variationKey">System-generated key that represents the attribute values that uniquely identify a specific product variation.</param>
-		/// <param name="localizedDeltaPrice">The difference between the base price for the product and this variation of the product, which can be a positive or negative decimal value. For example, if the base price for a t-shirt product is $10, but the XL variation should cost $12, the DeltaPrice value should be "2". However, if the XS variation should only cost $8, the DeltaPrice value should be "-2".</param>
+		/// <param name="productCode"></param>
+		/// <param name="variationKey"></param>
+		/// <param name="localizedDeltaPrice"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice"/>}}
 		/// </returns>
@@ -270,13 +271,13 @@ public partial class ProductVariationClient 	{
 		}
 
 		/// <summary>
-		/// Updates the localized delta price value for a product variation. Localized delta prices are deltas between two differing monetary conversion amounts between countries, such as US Dollar vs Euro.
+		/// 
 		/// </summary>
-		/// <param name="currencyCode">The three character ISO currency code, such as USD for US Dollars.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="variationKey">System-generated key that represents the attribute values that uniquely identify a specific product variation.</param>
-		/// <param name="localizedDeltaPrice">The difference between the base price for the product and this variation of the product, which can be a positive or negative decimal value. For example, if the base price for a t-shirt product is $10, but the XL variation should cost $12, the DeltaPrice value should be "2". However, if the XS variation should only cost $8, the DeltaPrice value should be "-2".</param>
+		/// <param name="currencyCode"></param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="variationKey"></param>
+		/// <param name="localizedDeltaPrice"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice"/>}
 		/// </returns>
@@ -299,11 +300,11 @@ public partial class ProductVariationClient 	{
 		}
 
 		/// <summary>
-		/// Updates a list of localized price values for a product variation.
+		/// 
 		/// </summary>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="variationKey">System-generated key that represents the attribute values that uniquely identify a specific product variation.</param>
-		/// <param name="localizedPrice">The details of the product variation localized price.</param>
+		/// <param name="productCode"></param>
+		/// <param name="variationKey"></param>
+		/// <param name="localizedPrice"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice"/>}}
 		/// </returns>
@@ -326,13 +327,13 @@ public partial class ProductVariationClient 	{
 		}
 
 		/// <summary>
-		/// Updates the localized price value for a product variation and a specific localized currency.
+		/// 
 		/// </summary>
-		/// <param name="currencyCode">The three character ISO currency code, such as USD for US Dollars.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="variationKey">System-generated key that represents the attribute values that uniquely identify a specific product variation.</param>
-		/// <param name="localizedPrice">The details of the product variation localized price.</param>
+		/// <param name="currencyCode"></param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="variationKey"></param>
+		/// <param name="localizedPrice"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice"/>}
 		/// </returns>
@@ -355,12 +356,12 @@ public partial class ProductVariationClient 	{
 		}
 
 		/// <summary>
-		/// Modifies the details of a variation, based on the supplied variation key, for the specified product code.
+		/// 
 		/// </summary>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
 		/// <param name="variationKey">System-generated key that represents the attribute values that uniquely identify a specific product variation.</param>
-		/// <param name="productVariation">Properties of a specific product variation.</param>
+		/// <param name="productVariation">Wrapper for the properties of the specified product variation.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductVariation"/>}
 		/// </returns>
@@ -383,11 +384,11 @@ public partial class ProductVariationClient 	{
 		}
 
 		/// <summary>
-		/// Modifies the collection of variations for the specified product code. Because this PUT replaces the existing resource, supply all information necessary to maintain for the product variation.
+		/// 
 		/// </summary>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="productVariations">Collection of variations configured for a product.</param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="productVariations">Wrapper for the collection of variations configured for the specified product code.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductVariationCollection"/>}
 		/// </returns>
@@ -410,9 +411,9 @@ public partial class ProductVariationClient 	{
 		}
 
 		/// <summary>
-		/// Deletes a variation, based on the supplied variation key, for the specified product code.
+		/// 
 		/// </summary>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
+		/// <param name="productCode"></param>
 		/// <param name="variationKey">System-generated key that represents the attribute values that uniquely identify a specific product variation.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
@@ -436,11 +437,11 @@ public static MozuClient DeleteProductVariationClient(DataViewMode dataViewMode,
 		}
 
 		/// <summary>
-		/// Deletes the localized delta price value for a product variation. Localized delta prices are deltas between two differing monetary conversion amounts between countries, such as US Dollar vs Euro.
+		/// 
 		/// </summary>
-		/// <param name="currencyCode">The three character ISO currency code, such as USD for US Dollars.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="variationKey">System-generated key that represents the attribute values that uniquely identify a specific product variation.</param>
+		/// <param name="currencyCode"></param>
+		/// <param name="productCode"></param>
+		/// <param name="variationKey"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
@@ -463,11 +464,11 @@ public static MozuClient DeleteProductVariationLocalizedDeltaPriceClient(DataVie
 		}
 
 		/// <summary>
-		/// Deletes the localized price value for a product variation and a specific localized currency.
+		/// 
 		/// </summary>
-		/// <param name="currencyCode">The three character ISO currency code, such as USD for US Dollars.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="variationKey">System-generated key that represents the attribute values that uniquely identify a specific product variation.</param>
+		/// <param name="currencyCode"></param>
+		/// <param name="productCode"></param>
+		/// <param name="variationKey"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Catalog/Admin/PublishingScopeClient.cs b/Mozu.Api/Clients/Commerce/Catalog/Admin/PublishingScopeClient.cs
old mode 100644
new mode 100755
index 43046aab..f43d7dde
--- a/Mozu.Api/Clients/Commerce/Catalog/Admin/PublishingScopeClient.cs
+++ b/Mozu.Api/Clients/Commerce/Catalog/Admin/PublishingScopeClient.cs
@@ -13,19 +13,20 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Catalog.Admin
 {
 	/// <summary>
-	/// Use the Product Publishing resource to publish or discard pending changes to products in a master catalog, or to add or remove pending changes to and from product publish sets.You can use product publish sets to group pending product changes together and publish them all at the same time.
+	/// Use the Product Publishing resource to publish or discard pending changes to product definitions in the master catalog.
 	/// </summary>
 	public partial class PublishingScopeClient 	{
 		
 		/// <summary>
-		/// Retrieves the details of the specified product publish set.
+		/// 
 		/// </summary>
-		/// <param name="publishSetCode">The unique identifier of the publish set.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="publishSetCode"></param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.PublishSet"/>}
@@ -48,9 +49,9 @@ public partial class PublishingScopeClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves a list of product publish sets and their properties, including the amount of pending product changes that are included in each one.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.PublishSetCollection"/>}
@@ -73,10 +74,10 @@ public partial class PublishingScopeClient 	{
 		}
 
 		/// <summary>
-		/// Deletes the draft version of product changes (pending product changes) for each product code specified in the request.
+		/// 
 		/// </summary>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="publishScope">Describes the scope of the product publishing update, which can include individual product codes or all pending changes.</param>
+		/// <param name="publishScope">Properties of the pending product changes to include in this operation.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
@@ -99,10 +100,10 @@ public static MozuClient DiscardDraftsClient(DataViewMode dataViewMode, Mozu.Api
 		}
 
 		/// <summary>
-		/// Publishes the draft version of product changes (pending product changes) for each product code specified in the request, and changes the product publish state to "live".
+		/// 
 		/// </summary>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="publishScope">Describes the scope of the product publishing update, which can include individual product codes or all pending changes.</param>
+		/// <param name="publishScope">Properties of the pending product changes to include in this operation.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
@@ -125,11 +126,11 @@ public static MozuClient PublishDraftsClient(DataViewMode dataViewMode, Mozu.Api
 		}
 
 		/// <summary>
-		/// Assigns pending product changes to a specified product publish set. Use the code field to specify the product publish set.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="publishSet">The details of the publish to which you want to assign products.</param>
+		/// <param name="publishSet"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.PublishSet"/>}
 		/// </returns>
@@ -151,10 +152,10 @@ public static MozuClient PublishDraftsClient(DataViewMode dataViewMode, Mozu.Api
 		}
 
 		/// <summary>
-		/// Deletes the specified product publish set. If you set the discardDrafts parameter to true, this operation also deletes the product drafts assigned to the publish set.
+		/// 
 		/// </summary>
-		/// <param name="discardDrafts">Specifies whether to discard all the drafts assigned to the publish set when the publish set is deleted.</param>
-		/// <param name="publishSetCode">The unique identifier of the publish set.</param>
+		/// <param name="discardDrafts"></param>
+		/// <param name="publishSetCode"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
diff --git a/Mozu.Api/Clients/Commerce/Catalog/Admin/SearchClient.cs b/Mozu.Api/Clients/Commerce/Catalog/Admin/SearchClient.cs
old mode 100644
new mode 100755
index f7f56780..7b11192d
--- a/Mozu.Api/Clients/Commerce/Catalog/Admin/SearchClient.cs
+++ b/Mozu.Api/Clients/Commerce/Catalog/Admin/SearchClient.cs
@@ -13,19 +13,20 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Catalog.Admin
 {
 	/// <summary>
-	/// Use the Search resource to manage all settings and options for providing product search on your site, as well as search tuning rules.
+	/// 
 	/// </summary>
 	public partial class SearchClient 	{
 		
 		/// <summary>
-		/// Retrieves the details of the specified search tuning rule.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="searchTuningRuleCode">The unique identifier of the search tuning rule.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="searchTuningRuleCode"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRule"/>}
 		/// </returns>
@@ -47,13 +48,13 @@ public partial class SearchClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves a list of search tuning rules and their properties.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRuleCollection"/>}
 		/// </returns>
@@ -75,9 +76,9 @@ public partial class SearchClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the details of the specified search tuning rule sort fields. Sort fields allow you to control the product relevance whenver shoppers sort products on a page. For more information about sort relevance, refer to [Search Tuning Rules and Sorting](../../../developer/api-guides/search-tuning-rules.htm#search_tuning_rules_and_sorting).
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRuleSortFields"/>}
 		/// </returns>
@@ -99,9 +100,9 @@ public partial class SearchClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the search settings for the specified site.Refer to [Search Settings API Overview](../../../../developer/api-guides/search-settings.htm) for more information about 's search settings.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.SearchSettings"/>}
 		/// </returns>
@@ -123,10 +124,10 @@ public partial class SearchClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves a collection of synonyms definitions for product searches.Refer to [Search Synonyms](../../../../developer/api-guides/search-settings.htm#search_synonyms) for more information about search synonyms.
+		/// 
 		/// </summary>
-		/// <param name="localeCode">The two character country code that sets the locale, such as US for United States. Sites, tenants, and catalogs use locale codes for localizing content, such as translated product text per supported country.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="localeCode"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinitionCollection"/>}
 		/// </returns>
@@ -148,13 +149,13 @@ public partial class SearchClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves a list of synonym definitions according to any specified filter criteria and sort options.Refer to [Search Synonyms](../../../../developer/api-guides/search-settings.htm#search_synonyms) for more information about search synonyms.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinitionPagedCollection"/>}
 		/// </returns>
@@ -176,10 +177,10 @@ public partial class SearchClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the details of the specified synonym defintion.Refer to [Search Synonyms](../../../../developer/api-guides/search-settings.htm#search_synonyms) for more information about search synonyms.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="synonymId">The unique identifier of the synonym definition.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="synonymId"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinition"/>}
 		/// </returns>
@@ -201,10 +202,10 @@ public partial class SearchClient 	{
 		}
 
 		/// <summary>
-		/// Creates a search tuning rule for your site. You can use search tuning rules to fine tune the product search results that appear when a shopper searches for a specific keyword, or navigates to a category page.For more information on search tuning rules, refer to [Search Tuning Rules](../../../../developer/api-guides/search-tuning-rules.htm).
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="searchTuningRuleIn">The details of the new search tuning rule.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="searchTuningRuleIn"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRule"/>}
 		/// </returns>
@@ -226,10 +227,10 @@ public partial class SearchClient 	{
 		}
 
 		/// <summary>
-		/// Updates the details of the search tuning rule sort fields.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="searchTuningRuleSortFieldsIn">The details of the updated search tuning rule sort fields.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="searchTuningRuleSortFieldsIn"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRuleSortFields"/>}
 		/// </returns>
@@ -251,11 +252,11 @@ public partial class SearchClient 	{
 		}
 
 		/// <summary>
-		/// Updates a collection of synonym definitions.Refer to [Search Synonyms](../../../../developer/api-guides/search-settings.htm#search_synonyms) for more information about search synonyms.
+		/// 
 		/// </summary>
-		/// <param name="localeCode">The two character country code that sets the locale, such as US for United States. Sites, tenants, and catalogs use locale codes for localizing content, such as translated product text per supported country.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="collection">The updated details of the synonym definition collection.</param>
+		/// <param name="localeCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="collection"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinitionCollection"/>}
 		/// </returns>
@@ -277,10 +278,10 @@ public partial class SearchClient 	{
 		}
 
 		/// <summary>
-		/// Creates a new synonym definition.Refer to [Search Synonyms](../../../../developer/api-guides/search-settings.htm#search_synonyms) for more information about search synonyms.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="synonymDefinition">The details of the new synonym definition.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="synonymDefinition"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinition"/>}
 		/// </returns>
@@ -302,11 +303,11 @@ public partial class SearchClient 	{
 		}
 
 		/// <summary>
-		/// Updates the details of the specified search tuning rule.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="searchTuningRuleCode">The unique identifier of the search tuning rule.</param>
-		/// <param name="searchTuningRuleIn">The details of the updated search tuning rule.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="searchTuningRuleCode"></param>
+		/// <param name="searchTuningRuleIn"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRule"/>}
 		/// </returns>
@@ -328,10 +329,10 @@ public partial class SearchClient 	{
 		}
 
 		/// <summary>
-		/// Updates the search setting properties for a specific site.Refer to [Search Settings API Overview](../../../../developer/api-guides/search-settings.htm) for more information about 's search settings.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="settings">The search settings to update.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="settings"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.SearchSettings"/>}
 		/// </returns>
@@ -353,11 +354,11 @@ public partial class SearchClient 	{
 		}
 
 		/// <summary>
-		/// Updates the details of a synonym definition.Refer to [Search Synonyms](../../../../developer/api-guides/search-settings.htm#search_synonyms) for more information about search synonyms.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="synonymId">The unique identifier of the synonym definition.</param>
-		/// <param name="synonymDefinition">The updated synonym definition details.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="synonymId"></param>
+		/// <param name="synonymDefinition"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinition"/>}
 		/// </returns>
@@ -379,9 +380,9 @@ public partial class SearchClient 	{
 		}
 
 		/// <summary>
-		/// Deletes the specified search tuning rule from the site.
+		/// 
 		/// </summary>
-		/// <param name="searchTuningRuleCode">The unique identifier of the search tuning rule.</param>
+		/// <param name="searchTuningRuleCode"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
@@ -403,9 +404,9 @@ public static MozuClient DeleteSearchTuningRuleClient(string searchTuningRuleCod
 		}
 
 		/// <summary>
-		/// Deletes the specified synonym definition.Refer to [Search Synonyms](../../../../developer/api-guides/search-settings.htm#search_synonyms) for more information about search synonyms.
+		/// 
 		/// </summary>
-		/// <param name="synonymId">The unique identifier of the synonym definition.</param>
+		/// <param name="synonymId"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Catalog/Admin/SoftAllocationClient.cs b/Mozu.Api/Clients/Commerce/Catalog/Admin/SoftAllocationClient.cs
old mode 100644
new mode 100755
index f3156036..2b24ca79
--- a/Mozu.Api/Clients/Commerce/Catalog/Admin/SoftAllocationClient.cs
+++ b/Mozu.Api/Clients/Commerce/Catalog/Admin/SoftAllocationClient.cs
@@ -13,22 +13,23 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Catalog.Admin
 {
 	/// <summary>
-	/// The Soft Allocations resource allows you to temporarily hold a product from inventory while a shopper is filling out payment information. You create a product reservation when a shopper proceeds to check out and then release the reservation when the order process is complete.
+	/// 
 	/// </summary>
 	public partial class SoftAllocationClient 	{
 		
 		/// <summary>
-		/// Retrieves a list of sof allocations according to any specified filter criteria and sort options.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.SoftAllocationCollection"/>}
@@ -51,10 +52,10 @@ public partial class SoftAllocationClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the details of a soft allocation.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="softAllocationId">The unique identifier of the soft allocation.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="softAllocationId"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductAdmin.SoftAllocation"/>}
@@ -77,10 +78,10 @@ public partial class SoftAllocationClient 	{
 		}
 
 		/// <summary>
-		/// Creates a new soft allocation for a product. This places a hold on the product inventory for the quantity specified during the ordering process.
+		/// 
 		/// </summary>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="softAllocationsIn">The details of the new soft allocation.</param>
+		/// <param name="softAllocationsIn"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.ProductAdmin.SoftAllocation"/>}}
 		/// </returns>
@@ -102,10 +103,10 @@ public partial class SoftAllocationClient 	{
 		}
 
 		/// <summary>
-		/// Converts a set of existing soft product allocations into product reservations.
+		/// 
 		/// </summary>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="softAllocations">The details of the soft allocation which you want to convert into product reservations.</param>
+		/// <param name="softAllocations"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductReservation"/>}}
 		/// </returns>
@@ -127,10 +128,10 @@ public partial class SoftAllocationClient 	{
 		}
 
 		/// <summary>
-		/// Updates the expiration time for a set of soft allocations in a non-transactional batch.
+		/// 
 		/// </summary>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="softAllocationRenew">The details of the soft allocation that you want to renew.</param>
+		/// <param name="softAllocationRenew"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.ProductAdmin.SoftAllocation"/>}}
 		/// </returns>
@@ -152,10 +153,10 @@ public partial class SoftAllocationClient 	{
 		}
 
 		/// <summary>
-		/// Updates a soft allocation. This updates a hold on the product inventory for the quantity specified during the ordering process.
+		/// 
 		/// </summary>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="softAllocations">The details of the updated soft allocations.</param>
+		/// <param name="softAllocations"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.ProductAdmin.SoftAllocation"/>}}
 		/// </returns>
@@ -177,9 +178,9 @@ public partial class SoftAllocationClient 	{
 		}
 
 		/// <summary>
-		/// Deletes a soft allocation. You might delete a soft allocation when an order or cart is not processed in order to return the product quantity back to inventory.
+		/// 
 		/// </summary>
-		/// <param name="softAllocationId">The unique identifier of the soft allocation.</param>
+		/// <param name="softAllocationId"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
diff --git a/Mozu.Api/Clients/Commerce/Catalog/Storefront/CategoryClient.cs b/Mozu.Api/Clients/Commerce/Catalog/Storefront/CategoryClient.cs
old mode 100644
new mode 100755
index d75654ac..476b96fe
--- a/Mozu.Api/Clients/Commerce/Catalog/Storefront/CategoryClient.cs
+++ b/Mozu.Api/Clients/Commerce/Catalog/Storefront/CategoryClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Catalog.Storefront
 {
@@ -22,11 +23,11 @@ namespace Mozu.Api.Clients.Commerce.Catalog.Storefront
 	public partial class CategoryClient 	{
 		
 		/// <summary>
-		/// Retrieves a list of categories according to any specified filter criteria and sort options.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. You can filter product category search results by any of its properties, including its position in the category hierarchy. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
 		/// <param name="sortBy"></param>
 		/// <param name="startIndex"></param>
 		/// <returns>
@@ -51,11 +52,11 @@ public partial class CategoryClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the details of a single category.
+		/// 
 		/// </summary>
 		/// <param name="allowInactive">If true, allow inactive categories to be retrieved in the category list response. If false, the categories retrieved will not include ones marked inactive.</param>
-		/// <param name="categoryId">Unique identifier for the storefront container used to organize products.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="categoryId">Unique identifier of the product category.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductRuntime.Category"/>}
 		/// </returns>
@@ -78,9 +79,9 @@ public partial class CategoryClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the list of product categories that appear on the storefront organized in a hierarchical format. Hidden categories do not appear in the list.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductRuntime.CategoryCollection"/>}
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Catalog/Storefront/OrderTaxContextClient.cs b/Mozu.Api/Clients/Commerce/Catalog/Storefront/OrderTaxContextClient.cs
old mode 100644
new mode 100755
index 82ab7ca8..e60c155b
--- a/Mozu.Api/Clients/Commerce/Catalog/Storefront/OrderTaxContextClient.cs
+++ b/Mozu.Api/Clients/Commerce/Catalog/Storefront/OrderTaxContextClient.cs
@@ -13,18 +13,19 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Catalog.Storefront
 {
 	/// <summary>
-	/// Use the Storefront Tax resource to retrieve tax information from the storefront.
+	/// 
 	/// </summary>
 	public partial class OrderTaxContextClient 	{
 		
 		/// <summary>
-		/// Retrieves tax information applicable to the site.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="taxableOrder"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.PricingRuntime.OrderTaxContext"/>}
diff --git a/Mozu.Api/Clients/Commerce/Catalog/Storefront/PriceListClient.cs b/Mozu.Api/Clients/Commerce/Catalog/Storefront/PriceListClient.cs
old mode 100644
new mode 100755
index c502f6b6..8942839d
--- a/Mozu.Api/Clients/Commerce/Catalog/Storefront/PriceListClient.cs
+++ b/Mozu.Api/Clients/Commerce/Catalog/Storefront/PriceListClient.cs
@@ -13,19 +13,20 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Catalog.Storefront
 {
 	/// <summary>
-	/// Retrieves the details of a price list. The details may contain a hierarchy of ancestor and/or descendant price lists dependening on your configuration.
+	/// 
 	/// </summary>
 	public partial class PriceListClient 	{
 		
 		/// <summary>
-		/// Retrieves the details of the specified price list.
+		/// 
 		/// </summary>
-		/// <param name="priceListCode">The unique code of the price list for which you want to retrieve the details.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="priceListCode"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductRuntime.PriceList"/>}
 		/// </returns>
@@ -47,10 +48,10 @@ public partial class PriceListClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the details of a price list to which the specified customer resolves. This is primarly used when creating an offline order for a shopper.You can use this operation alongside custom Arc.js actions to alter the price list to which a shopper resolves.
+		/// 
 		/// </summary>
-		/// <param name="customerAccountId">The unique identifier of the customer account for which to retrieve wish lists.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="customerAccountId"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductRuntime.ResolvedPriceList"/>}
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Catalog/Storefront/ProductClient.cs b/Mozu.Api/Clients/Commerce/Catalog/Storefront/ProductClient.cs
old mode 100644
new mode 100755
index ad4daff1..96525a76
--- a/Mozu.Api/Clients/Commerce/Catalog/Storefront/ProductClient.cs
+++ b/Mozu.Api/Clients/Commerce/Catalog/Storefront/ProductClient.cs
@@ -13,22 +13,23 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Catalog.Storefront
 {
 	/// <summary>
-	/// Use the Storefront Products resource to manage the shopper product selection process during a visit to the web storefront. You can update product options as shoppers pick and choose their product choices. A shopper cannot add a product to a cart until all of its required options have been selected.
+	/// Use the Storefront Products  resource to manage the shopper product selection process during a visit to the web storefront. You can update product options as shoppers pick and choose their product choices. A shopper cannot add a product to a cart until all of its required options have been selected.
 	/// </summary>
 	public partial class ProductClient 	{
 		
 		/// <summary>
-		/// Retrieves a list of products that appear on the web storefront according to any specified filter criteria and sort options.
+		/// 
 		/// </summary>
-		/// <param name="cursorMark">In your first deep paged request, set this parameter to . Then, in all subsequent requests, set this parameter to the subsequent values of  that's returned in each response to continue paging through the results. Continue this pattern until  is null, which signifies the end of the paged results.</param>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="responseOptions">Options you can specify for the response. This parameter is null by default.You can primarily use this parameter to return volume price band information in product details, which you can then display on category pages and search results depanding on your theme configuration. To return volume price band information, set this parameter to .</param>
+		/// <param name="cursorMark"></param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize">Used to page results from a query. Indicates the maximum number of entities to return from a single query. Default value: 20. Maximum value: 200.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="responseOptions"></param>
 		/// <param name="sortBy"></param>
 		/// <param name="startIndex"></param>
 		/// <returns>
@@ -53,11 +54,11 @@ public partial class ProductClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the active inventory level information associated with the product or location specified in the request.
+		/// 
 		/// </summary>
 		/// <param name="locationCodes">Array of location codes for which to retrieve product inventory information.</param>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductRuntime.LocationInventoryCollection"/>}
 		/// </returns>
@@ -80,28 +81,29 @@ public partial class ProductClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves information about a single product given its product code.
+		/// 
 		/// </summary>
-		/// <param name="acceptVariantProductCode">Specifies whether to accept a product variant's code as the .When you set this parameter to , you can pass in a product variant's code in the GetProduct call to retrieve the product variant details that are associated with the base product.</param>
-		/// <param name="allowInactive">If true, allow inactive categories to be retrieved in the category list response. If false, the categories retrieved will not include ones marked inactive.</param>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="quantity">The number of cart items in the shopper's active cart.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="skipInventoryCheck">If true, skip the process to validate inventory when creating this product reservation.</param>
-		/// <param name="supressOutOfStock404">Specifies whether to supress the 404 error when the product is out of stock.</param>
+		/// <param name="acceptVariantProductCode"></param>
+		/// <param name="allowInactive">If true, returns an inactive product as part of the query.</param>
+		/// <param name="productCode"></param>
+		/// <param name="purchaseLocation"></param>
+		/// <param name="quantity"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="skipInventoryCheck">If true, skip the inventory validation process for the specified product.</param>
+		/// <param name="supressOutOfStock404"></param>
 		/// <param name="variationProductCode">Merchant-created code associated with a specific product variation. Variation product codes maintain an association with the base product code.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductRuntime.Product"/>}
 		/// </returns>
 		/// <example>
 		/// <code>
-		///   var mozuClient=GetProduct(dataViewMode,  productCode,  variationProductCode,  allowInactive,  skipInventoryCheck,  supressOutOfStock404,  quantity,  acceptVariantProductCode,  responseFields);
+		///   var mozuClient=GetProduct(dataViewMode,  productCode,  variationProductCode,  allowInactive,  skipInventoryCheck,  supressOutOfStock404,  quantity,  acceptVariantProductCode,  purchaseLocation,  responseFields);
 		///   var productClient = mozuClient.WithBaseAddress(url).Execute().Result();
 		/// </code>
 		/// </example>
-		public static MozuClient<Mozu.Api.Contracts.ProductRuntime.Product> GetProductClient(DataViewMode dataViewMode, string productCode, string variationProductCode =  null, bool? allowInactive =  null, bool? skipInventoryCheck =  null, bool? supressOutOfStock404 =  null, int? quantity =  null, bool? acceptVariantProductCode =  null, string responseFields =  null)
+		public static MozuClient<Mozu.Api.Contracts.ProductRuntime.Product> GetProductClient(DataViewMode dataViewMode, string productCode, string variationProductCode =  null, bool? allowInactive =  null, bool? skipInventoryCheck =  null, bool? supressOutOfStock404 =  null, int? quantity =  null, bool? acceptVariantProductCode =  null, string purchaseLocation =  null, string responseFields =  null)
 		{
-			var url = Mozu.Api.Urls.Commerce.Catalog.Storefront.ProductUrl.GetProductUrl(productCode, variationProductCode, allowInactive, skipInventoryCheck, supressOutOfStock404, quantity, acceptVariantProductCode, responseFields);
+			var url = Mozu.Api.Urls.Commerce.Catalog.Storefront.ProductUrl.GetProductUrl(productCode, variationProductCode, allowInactive, skipInventoryCheck, supressOutOfStock404, quantity, acceptVariantProductCode, purchaseLocation, responseFields);
 			const string verb = "GET";
 			var mozuClient = new MozuClient<Mozu.Api.Contracts.ProductRuntime.Product>()
 									.WithVerb(verb).WithResourceUrl(url)
@@ -112,12 +114,12 @@ public partial class ProductClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves information about a single product given its product code for  to index in the search engine
+		/// 
 		/// </summary>
-		/// <param name="lastModifiedDate">The date when the product was last updated.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="productVersion">The product version.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="lastModifiedDate"></param>
+		/// <param name="productCode"></param>
+		/// <param name="productVersion"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductRuntime.Product"/>}
 		/// </returns>
@@ -140,26 +142,27 @@ public partial class ProductClient 	{
 		}
 
 		/// <summary>
-		/// Creates a new product configuration each time a shopper selects a product option value. After the shopper defines values for all required product options, the shopper can add the product configuration to a cart.
+		/// 
 		/// </summary>
 		/// <param name="includeOptionDetails">If true, the response returns details about the product. If false, returns a product summary such as the product name, price, and sale price.</param>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="quantity">The number of cart items in the shopper's active cart.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="skipInventoryCheck">If true, skip the process to validate inventory when creating this product reservation.</param>
+		/// <param name="productCode"></param>
+		/// <param name="purchaseLocation"></param>
+		/// <param name="quantity"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="skipInventoryCheck">If true, skip the inventory validation process for the specified product.</param>
 		/// <param name="productOptionSelections">For a product with shopper-configurable options, the properties of the product options selected by the shopper.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductRuntime.ConfiguredProduct"/>}
 		/// </returns>
 		/// <example>
 		/// <code>
-		///   var mozuClient=ConfiguredProduct( productOptionSelections,  productCode,  includeOptionDetails,  skipInventoryCheck,  quantity,  responseFields);
+		///   var mozuClient=ConfiguredProduct( productOptionSelections,  productCode,  includeOptionDetails,  skipInventoryCheck,  quantity,  purchaseLocation,  responseFields);
 		///   var configuredProductClient = mozuClient.WithBaseAddress(url).Execute().Result();
 		/// </code>
 		/// </example>
-		public static MozuClient<Mozu.Api.Contracts.ProductRuntime.ConfiguredProduct> ConfiguredProductClient(Mozu.Api.Contracts.ProductRuntime.ProductOptionSelections productOptionSelections, string productCode, bool? includeOptionDetails =  null, bool? skipInventoryCheck =  null, int? quantity =  null, string responseFields =  null)
+		public static MozuClient<Mozu.Api.Contracts.ProductRuntime.ConfiguredProduct> ConfiguredProductClient(Mozu.Api.Contracts.ProductRuntime.ProductOptionSelections productOptionSelections, string productCode, bool? includeOptionDetails =  null, bool? skipInventoryCheck =  null, int? quantity =  null, string purchaseLocation =  null, string responseFields =  null)
 		{
-			var url = Mozu.Api.Urls.Commerce.Catalog.Storefront.ProductUrl.ConfiguredProductUrl(productCode, includeOptionDetails, skipInventoryCheck, quantity, responseFields);
+			var url = Mozu.Api.Urls.Commerce.Catalog.Storefront.ProductUrl.ConfiguredProductUrl(productCode, includeOptionDetails, skipInventoryCheck, quantity, purchaseLocation, responseFields);
 			const string verb = "POST";
 			var mozuClient = new MozuClient<Mozu.Api.Contracts.ProductRuntime.ConfiguredProduct>()
 									.WithVerb(verb).WithResourceUrl(url)
@@ -169,26 +172,27 @@ public partial class ProductClient 	{
 		}
 
 		/// <summary>
-		/// Validate the final state of shopper-selected options.
+		/// 
 		/// </summary>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="quantity">The number of cart items in the shopper's active cart.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="skipDefaults">Normally, product validation applies default extras to products that do not have options specified. If , product validation does not apply default extras to products.</param>
-		/// <param name="skipInventoryCheck">If true, skip the process to validate inventory when creating this product reservation.</param>
+		/// <param name="productCode"></param>
+		/// <param name="purchaseLocation"></param>
+		/// <param name="quantity"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="skipDefaults"></param>
+		/// <param name="skipInventoryCheck">If true, skip the inventory validation process for the specified product.</param>
 		/// <param name="productOptionSelections">For a product with shopper-configurable options, the properties of the product options selected by the shopper.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductRuntime.ProductValidationSummary"/>}
 		/// </returns>
 		/// <example>
 		/// <code>
-		///   var mozuClient=ValidateProduct( productOptionSelections,  productCode,  skipInventoryCheck,  quantity,  skipDefaults,  responseFields);
+		///   var mozuClient=ValidateProduct( productOptionSelections,  productCode,  skipInventoryCheck,  quantity,  skipDefaults,  purchaseLocation,  responseFields);
 		///   var productValidationSummaryClient = mozuClient.WithBaseAddress(url).Execute().Result();
 		/// </code>
 		/// </example>
-		public static MozuClient<Mozu.Api.Contracts.ProductRuntime.ProductValidationSummary> ValidateProductClient(Mozu.Api.Contracts.ProductRuntime.ProductOptionSelections productOptionSelections, string productCode, bool? skipInventoryCheck =  null, int? quantity =  null, bool? skipDefaults =  null, string responseFields =  null)
+		public static MozuClient<Mozu.Api.Contracts.ProductRuntime.ProductValidationSummary> ValidateProductClient(Mozu.Api.Contracts.ProductRuntime.ProductOptionSelections productOptionSelections, string productCode, bool? skipInventoryCheck =  null, int? quantity =  null, bool? skipDefaults =  null, string purchaseLocation =  null, string responseFields =  null)
 		{
-			var url = Mozu.Api.Urls.Commerce.Catalog.Storefront.ProductUrl.ValidateProductUrl(productCode, skipInventoryCheck, quantity, skipDefaults, responseFields);
+			var url = Mozu.Api.Urls.Commerce.Catalog.Storefront.ProductUrl.ValidateProductUrl(productCode, skipInventoryCheck, quantity, skipDefaults, purchaseLocation, responseFields);
 			const string verb = "POST";
 			var mozuClient = new MozuClient<Mozu.Api.Contracts.ProductRuntime.ProductValidationSummary>()
 									.WithVerb(verb).WithResourceUrl(url)
@@ -198,15 +202,15 @@ public partial class ProductClient 	{
 		}
 
 		/// <summary>
-		/// Evaluates whether a collection of discounts specified in the request can be redeemed for the supplied product code.
+		/// 
 		/// </summary>
-		/// <param name="allowInactive">If true, allow inactive categories to be retrieved in the category list response. If false, the categories retrieved will not include ones marked inactive.</param>
-		/// <param name="customerAccountId">The unique identifier of the customer account for which to retrieve wish lists.</param>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="skipInventoryCheck">If true, skip the process to validate inventory when creating this product reservation.</param>
+		/// <param name="allowInactive">If true, this operation returns inactive product discounts as part of the POST.</param>
+		/// <param name="customerAccountId">Unique ID of the customer account associated with the shopper requesting the discount.</param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="skipInventoryCheck">If true, do not validate the product inventory when evaluating the list of discounts.</param>
 		/// <param name="variationProductCode">Merchant-created code associated with a specific product variation. Variation product codes maintain an association with the base product code.</param>
-		/// <param name="discountSelections">The discounts to evaluate for a specified product code at the time of purchase.</param>
+		/// <param name="discountSelections">List of discount IDs to evaluate for the specified product.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductRuntime.DiscountValidationSummary"/>}
 		/// </returns>
@@ -228,10 +232,10 @@ public partial class ProductClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the product cost based on a list of product codes. The product cost is the amount the merchant pays for the product—it is not the price that the shopper sees on the storefront (which is usually higher).
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="query">Properties for the product location inventory provided for queries to locate products by their location.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="query"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductRuntime.ProductCostCollection"/>}
 		/// </returns>
@@ -254,10 +258,10 @@ public partial class ProductClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves product inventories for the storefront displayed products.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="query">Properties for the product location inventory provided for queries to locate products by their location.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="query"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductRuntime.LocationInventoryCollection"/>}
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Catalog/Storefront/ProductSearchResultClient.cs b/Mozu.Api/Clients/Commerce/Catalog/Storefront/ProductSearchResultClient.cs
old mode 100644
new mode 100755
index cdf05a6a..73bc5876
--- a/Mozu.Api/Clients/Commerce/Catalog/Storefront/ProductSearchResultClient.cs
+++ b/Mozu.Api/Clients/Commerce/Catalog/Storefront/ProductSearchResultClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Catalog.Storefront
 {
@@ -22,12 +23,12 @@ namespace Mozu.Api.Clients.Commerce.Catalog.Storefront
 	public partial class ProductSearchResultClient 	{
 		
 		/// <summary>
-		/// Random access paging computes a set of , which can each then be provided to the  operation in the  resource or the  operation in the  resource. You can provide the computed groups in any order to the operations, and can therefore parallelize calls to retrieve products more quickly. To generate the set of , call this () operation, in which you can optionally provide query and/or filter parameters to limit the products matched by the cursor. After executing this operation, pass one of the returned  to the  parameter of the  or  operations.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="query">Properties for the product location inventory provided for queries to locate products by their location.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="query"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductRuntime.ProductSearchRandomAccessCursor"/>}
 		/// </returns>
@@ -49,33 +50,33 @@ public partial class ProductSearchResultClient 	{
 		}
 
 		/// <summary>
-		/// Searches the categories displayed on the web storefront for products or product options that the shopper types in a search query.
+		/// 
 		/// </summary>
-		/// <param name="cursorMark">In your first deep paged request, set this parameter to . Then, in all subsequent requests, set this parameter to the subsequent values of  that's returned in each response to continue paging through the results. Continue this pattern until  is null, which signifies the end of the paged results.</param>
-		/// <param name="enableSearchTuningRules">Enables search tuning rules on your site.</param>
+		/// <param name="cursorMark"></param>
+		/// <param name="enableSearchTuningRules"></param>
 		/// <param name="facet">Individually list the facet fields you want to display in a web storefront product search.</param>
 		/// <param name="facetFieldRangeQuery">Display a range facet not specified in a template in a web storefront product search by listing the facet field and the range to display.</param>
 		/// <param name="facetHierDepth">If filtering using category facets in a hierarchy, the number of category hierarchy levels to return for the facet. This option is only available for category facets.</param>
 		/// <param name="facetHierPrefix">If filtering using category facets in a hierarchy, the parent categories you want to skip in the storefront product search. This parameter is only available for category facets.</param>
 		/// <param name="facetHierValue">If filtering using category facets in a hierarchy, the category in the hierarchy to begin faceting on. This parameter is only available for category facets.</param>
 		/// <param name="facetPageSize">The number of facet values to return for one or more facets.</param>
-		/// <param name="facetPrefix">Use this parameter to filter facet values that are returned by an associated search result by a prefix.For example, to filter on colors that start with b, such as blue, black, or brown you can specify the following:</param>
+		/// <param name="facetPrefix"></param>
 		/// <param name="facetSettings">Settings reserved for future facet search functionality on a web storefront product search.</param>
 		/// <param name="facetStartIndex">When paging through multiple facets, the startIndex value for each facet.</param>
 		/// <param name="facetTemplate">The facet template to use on the storefront. A template displays all facets associated with the template on the web storefront product search. Currently, only category-level facet templates are available.</param>
-		/// <param name="facetTemplateExclude">A comma-separated list of the facets to exclude from the facetTemplate.        </param>
+		/// <param name="facetTemplateExclude"></param>
 		/// <param name="facetTemplateSubset">Display a subset of the facets defined in the template specified in facetTemplate parameter.</param>
 		/// <param name="facetValueFilter">The facet values to apply to the filter.</param>
-		/// <param name="facetValueSort">Use this parameter to specify facet sorting outside the predefined facet definitions (which require a category). The most common options are:*  (default)—Sorts by product count (highest count first).* —Sorts by lexicographic order. In most cases, this means alphabetical order.The following code demonstrates an example of  sort:</param>
-		/// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="query">Properties for the product location inventory provided for queries to locate products by their location.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="responseOptions">Options you can specify for the response. This parameter is null by default.You can primarily use this parameter to return volume price band information in product details, which you can then display on category pages and search results depanding on your theme configuration. To return volume price band information, set this parameter to .</param>
-		/// <param name="searchSettings">The settings to control product search and indexing behavior.</param>
-		/// <param name="searchTuningRuleCode">The unique identifier of the search tuning rule.</param>
-		/// <param name="searchTuningRuleContext">The category ID that the search tuning rule applies to.</param>
-		/// <param name="sortBy"></param>
+		/// <param name="facetValueSort"></param>
+		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. You can filter product search results by any of its properties, including product code, type, category, and name. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=categoryId+eq+12"</param>
+		/// <param name="pageSize">Used to page results from a query. Indicates the maximum number of entities to return from a query. Default value: 12. Max value is 200.</param>
+		/// <param name="query">The terms to search on.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="responseOptions"></param>
+		/// <param name="searchSettings"></param>
+		/// <param name="searchTuningRuleCode"></param>
+		/// <param name="searchTuningRuleContext"></param>
+		/// <param name="sortBy">The element to sort the results by and the order in which the results appear. Either ascending order (a-z) which accepts 'asc' or 'asc' or descending order (z-a) which accepts 'desc' or 'desc'. The sortBy parameter follows an available property.</param>
 		/// <param name="startIndex"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductRuntime.ProductSearchResult"/>}
@@ -98,12 +99,12 @@ public partial class ProductSearchResultClient 	{
 		}
 
 		/// <summary>
-		/// Suggests possible search terms as the shopper enters search text.
+		/// 
 		/// </summary>
-		/// <param name="groups">Specifies the group that you want this operation to return in the response. This parameter accepts one or more values, separated by comma.For example, if you set this parameter to , then this operation returns a  object that contains suggestions for products that match the user entered characters in the search field.The valid values for this parameter are the following:*  — Indicates that products should be matched against and returned in the response. The search  value is compared against product name and code. The response contains a  with a name of  and a collection of . Each collection item has a  of Product and contains a  equal to a complete product object.*  — Indicates that categories should be matched against and returned in the response. The search  value is compared to category name.  The response contains a  with a name of  and a collection of . Each collection item has a  of Category and contains a  equal to a complete category object.*  — Indicates that previously used search terms (keywords) should be matched against and returned in the response, sorted by frequency of use. Keep in mind that it is not currently possible to edit or remove search terms that may be considered undesirable via the  API. The response contains a  with a name of  and a collection of . Each collection item has a  of Term and contains a  equal to a string value of the matched search term.The default value is ; however, the  Core Theme only integrates  and ignores the  group.This operation only returns data that is then made available to your theme. If you set this paramter to multiple values,  returns multiple  in the response. Depending on your requirements, you can then customize your theme to display the groups together or as separate lists in the displayed search suggestions.</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="query">Properties for the product location inventory provided for queries to locate products by their location.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="groups"></param>
+		/// <param name="pageSize">Indicates the maximum number of entities to return from a query. Default value: 10. Max value: 200.</param>
+		/// <param name="query"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ProductRuntime.SearchSuggestionResult"/>}
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Catalog/Storefront/ShippingClient.cs b/Mozu.Api/Clients/Commerce/Catalog/Storefront/ShippingClient.cs
old mode 100644
new mode 100755
index c6988671..919652f3
--- a/Mozu.Api/Clients/Commerce/Catalog/Storefront/ShippingClient.cs
+++ b/Mozu.Api/Clients/Commerce/Catalog/Storefront/ShippingClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Catalog.Storefront
 {
@@ -22,11 +23,36 @@ namespace Mozu.Api.Clients.Commerce.Catalog.Storefront
 	public partial class ShippingClient 	{
 		
 		/// <summary>
-		/// Retrieves the shipping rates applicable for the site.
+		/// 
 		/// </summary>
-		/// <param name="includeRawResponse">Set this parameter to  to retrieve the full raw JSON response from a shipping carrier (instead of just the shipping rate).</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="rateRequest">Properties required to request a shipping rate calculation.</param>
+		/// <param name="includeRawResponse"></param>
+		/// <param name="rateRequestGroupList"></param>
+		/// <returns>
+		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.ShippingRuntime.RatesResponseGroup"/>}}
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var mozuClient=GetMultiRates( rateRequestGroupList,  includeRawResponse);
+		///   var ratesResponseGroupClient = mozuClient.WithBaseAddress(url).Execute().Result();
+		/// </code>
+		/// </example>
+		public static MozuClient<List<Mozu.Api.Contracts.ShippingRuntime.RatesResponseGroup>> GetMultiRatesClient(List<Mozu.Api.Contracts.ShippingRuntime.RateRequestGroup> rateRequestGroupList, bool? includeRawResponse =  null)
+		{
+			var url = Mozu.Api.Urls.Commerce.Catalog.Storefront.ShippingUrl.GetMultiRatesUrl(includeRawResponse);
+			const string verb = "POST";
+			var mozuClient = new MozuClient<List<Mozu.Api.Contracts.ShippingRuntime.RatesResponseGroup>>()
+									.WithVerb(verb).WithResourceUrl(url)
+									.WithBody<List<Mozu.Api.Contracts.ShippingRuntime.RateRequestGroup>>(rateRequestGroupList);
+			return mozuClient;
+
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="includeRawResponse"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="rateRequest">Properties of the shipping rate request sent on behalf of the storefront website.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ShippingRuntime.RatesResponse"/>}
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/ChannelClient.cs b/Mozu.Api/Clients/Commerce/ChannelClient.cs
old mode 100644
new mode 100755
index 716783e8..3f466fef
--- a/Mozu.Api/Clients/Commerce/ChannelClient.cs
+++ b/Mozu.Api/Clients/Commerce/ChannelClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce
 {
@@ -22,13 +23,13 @@ namespace Mozu.Api.Clients.Commerce
 	public partial class ChannelClient 	{
 		
 		/// <summary>
-		/// Retrieves a list of channels defined for a tenant according to any filter or sort criteria specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelCollection"/>}
 		/// </returns>
@@ -50,10 +51,10 @@ public partial class ChannelClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the details of the channel specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="code">User-defined code that identifies the channel to retrieve.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Channels.Channel"/>}
 		/// </returns>
@@ -75,10 +76,10 @@ public partial class ChannelClient 	{
 		}
 
 		/// <summary>
-		/// Creates a new channel that defines a new logical business division to use for financial reporting.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="channel">Properties of a channel used to divide a company into logical business divisions, such as "US Retail," "US Online," or "Amazon." All sites and orders are associated with a channel.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="channel">Properties of the channel to create.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Channels.Channel"/>}
 		/// </returns>
@@ -100,11 +101,11 @@ public partial class ChannelClient 	{
 		}
 
 		/// <summary>
-		/// Updates one or more details of a defined channel, including the associated sites.
+		/// 
 		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="channel">Properties of a channel used to divide a company into logical business divisions, such as "US Retail," "US Online," or "Amazon." All sites and orders are associated with a channel.</param>
+		/// <param name="code">User-defined code that identifies the channel to update.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="channel">Properties of a the channel to update.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Channels.Channel"/>}
 		/// </returns>
@@ -126,9 +127,9 @@ public partial class ChannelClient 	{
 		}
 
 		/// <summary>
-		/// Deletes a defined channel for the tenant and removes the defined site associations. After deleting this channel, assign its associated sites to another channel.
+		/// 
 		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
+		/// <param name="code">User-defined code that identifies the channel to delete.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/ChannelGroupClient.cs b/Mozu.Api/Clients/Commerce/ChannelGroupClient.cs
old mode 100644
new mode 100755
index e314f282..bdbecaa3
--- a/Mozu.Api/Clients/Commerce/ChannelGroupClient.cs
+++ b/Mozu.Api/Clients/Commerce/ChannelGroupClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce
 {
@@ -22,13 +23,13 @@ namespace Mozu.Api.Clients.Commerce
 	public partial class ChannelGroupClient 	{
 		
 		/// <summary>
-		/// Retrieves a list of defined channel groups according to any filter and sort criteria specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelGroupCollection"/>}
 		/// </returns>
@@ -50,10 +51,10 @@ public partial class ChannelGroupClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the details of a defined channel group.
+		/// 
 		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="code">The code that uniquely identifies the channel group.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelGroup"/>}
 		/// </returns>
@@ -75,10 +76,10 @@ public partial class ChannelGroupClient 	{
 		}
 
 		/// <summary>
-		/// Creates a new group of channels with common information.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="channelGroup">Properties of a group of channels that share common information.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="channelGroup">Properties of the channel group to create.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelGroup"/>}
 		/// </returns>
@@ -100,11 +101,11 @@ public partial class ChannelGroupClient 	{
 		}
 
 		/// <summary>
-		/// Updates one or more properties of a defined channel group.
+		/// 
 		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="channelGroup">Properties of a group of channels that share common information.</param>
+		/// <param name="code">Code that identifies the channel group.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="channelGroup">Properties of the channel group to update.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelGroup"/>}
 		/// </returns>
@@ -126,7 +127,7 @@ public partial class ChannelGroupClient 	{
 		}
 
 		/// <summary>
-		/// Deletes a defined group of channels, which removes the group association with each channel in the group but does not delete the channel definitions themselves.
+		/// 
 		/// </summary>
 		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
 		/// <returns>
diff --git a/Mozu.Api/Clients/Commerce/CheckoutClient.cs b/Mozu.Api/Clients/Commerce/CheckoutClient.cs
new file mode 100755
index 00000000..5b2bdc28
--- /dev/null
+++ b/Mozu.Api/Clients/Commerce/CheckoutClient.cs
@@ -0,0 +1,313 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using Mozu.Api.Security;
+using System.Threading.Tasks;
+using Newtonsoft.Json.Linq;
+using System.Threading;
+
+namespace Mozu.Api.Clients.Commerce
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	public partial class CheckoutClient 	{
+		
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="q"></param>
+		/// <param name="qLimit"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
+		/// <returns>
+		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Checkouts.CheckoutCollection"/>}
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var mozuClient=GetCheckouts( startIndex,  pageSize,  sortBy,  filter,  q,  qLimit,  responseFields);
+		///   var checkoutCollectionClient = mozuClient.WithBaseAddress(url).Execute().Result();
+		/// </code>
+		/// </example>
+		public static MozuClient<Mozu.Api.Contracts.CommerceRuntime.Checkouts.CheckoutCollection> GetCheckoutsClient(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string q =  null, int? qLimit =  null, string responseFields =  null)
+		{
+			var url = Mozu.Api.Urls.Commerce.CheckoutUrl.GetCheckoutsUrl(startIndex, pageSize, sortBy, filter, q, qLimit, responseFields);
+			const string verb = "GET";
+			var mozuClient = new MozuClient<Mozu.Api.Contracts.CommerceRuntime.Checkouts.CheckoutCollection>()
+									.WithVerb(verb).WithResourceUrl(url)
+;
+			return mozuClient;
+
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="checkoutId"></param>
+		/// <returns>
+		///  <see cref="Mozu.Api.MozuClient" />{List{string}}
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var mozuClient=GetAvailableActions( checkoutId);
+		///   var stringClient = mozuClient.WithBaseAddress(url).Execute().Result();
+		/// </code>
+		/// </example>
+		public static MozuClient<List<string>> GetAvailableActionsClient(string checkoutId)
+		{
+			var url = Mozu.Api.Urls.Commerce.CheckoutUrl.GetAvailableActionsUrl(checkoutId);
+			const string verb = "GET";
+			var mozuClient = new MozuClient<List<string>>()
+									.WithVerb(verb).WithResourceUrl(url)
+;
+			return mozuClient;
+
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="checkoutId"></param>
+		/// <returns>
+		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.CommerceRuntime.Checkouts.CheckoutGroupRates"/>}}
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var mozuClient=GetAvailableShippingMethods( checkoutId);
+		///   var checkoutGroupRatesClient = mozuClient.WithBaseAddress(url).Execute().Result();
+		/// </code>
+		/// </example>
+		public static MozuClient<List<Mozu.Api.Contracts.CommerceRuntime.Checkouts.CheckoutGroupRates>> GetAvailableShippingMethodsClient(string checkoutId)
+		{
+			var url = Mozu.Api.Urls.Commerce.CheckoutUrl.GetAvailableShippingMethodsUrl(checkoutId);
+			const string verb = "GET";
+			var mozuClient = new MozuClient<List<Mozu.Api.Contracts.CommerceRuntime.Checkouts.CheckoutGroupRates>>()
+									.WithVerb(verb).WithResourceUrl(url)
+;
+			return mozuClient;
+
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="checkoutId"></param>
+		/// <param name="responseFields"></param>
+		/// <returns>
+		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout"/>}
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var mozuClient=GetCheckout( checkoutId,  responseFields);
+		///   var checkoutClient = mozuClient.WithBaseAddress(url).Execute().Result();
+		/// </code>
+		/// </example>
+		public static MozuClient<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout> GetCheckoutClient(string checkoutId, string responseFields =  null)
+		{
+			var url = Mozu.Api.Urls.Commerce.CheckoutUrl.GetCheckoutUrl(checkoutId, responseFields);
+			const string verb = "GET";
+			var mozuClient = new MozuClient<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout>()
+									.WithVerb(verb).WithResourceUrl(url)
+;
+			return mozuClient;
+
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="cartId"></param>
+		/// <param name="responseFields"></param>
+		/// <returns>
+		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout"/>}
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var mozuClient=CreateCheckoutFromCart( cartId,  responseFields);
+		///   var checkoutClient = mozuClient.WithBaseAddress(url).Execute().Result();
+		/// </code>
+		/// </example>
+		public static MozuClient<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout> CreateCheckoutFromCartClient(string cartId, string responseFields =  null)
+		{
+			var url = Mozu.Api.Urls.Commerce.CheckoutUrl.CreateCheckoutFromCartUrl(cartId, responseFields);
+			const string verb = "POST";
+			var mozuClient = new MozuClient<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout>()
+									.WithVerb(verb).WithResourceUrl(url)
+;
+			return mozuClient;
+
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="checkoutId"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="action"></param>
+		/// <returns>
+		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout"/>}
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var mozuClient=PerformCheckoutAction( action,  checkoutId,  responseFields);
+		///   var checkoutClient = mozuClient.WithBaseAddress(url).Execute().Result();
+		/// </code>
+		/// </example>
+		public static MozuClient<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout> PerformCheckoutActionClient(Mozu.Api.Contracts.CommerceRuntime.Checkouts.CheckoutAction action, string checkoutId, string responseFields =  null)
+		{
+			var url = Mozu.Api.Urls.Commerce.CheckoutUrl.PerformCheckoutActionUrl(checkoutId, responseFields);
+			const string verb = "POST";
+			var mozuClient = new MozuClient<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout>()
+									.WithVerb(verb).WithResourceUrl(url)
+									.WithBody<Mozu.Api.Contracts.CommerceRuntime.Checkouts.CheckoutAction>(action);
+			return mozuClient;
+
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="checkoutId"></param>
+		/// <returns>
+		///  <see cref="Mozu.Api.MozuClient" />
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var mozuClient=ResendCheckoutConfirmationEmail( checkoutId);
+		///mozuClient.WithBaseAddress(url).Execute();
+		/// </code>
+		/// </example>
+		public static MozuClient ResendCheckoutConfirmationEmailClient(string checkoutId)
+		{
+			var url = Mozu.Api.Urls.Commerce.CheckoutUrl.ResendCheckoutConfirmationEmailUrl(checkoutId);
+			const string verb = "POST";
+			var mozuClient = new MozuClient()
+									.WithVerb(verb).WithResourceUrl(url)
+;
+			return mozuClient;
+
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="checkoutId"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="groupShippingMethods"></param>
+		/// <returns>
+		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout"/>}
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var mozuClient=SetShippingMethods( groupShippingMethods,  checkoutId,  responseFields);
+		///   var checkoutClient = mozuClient.WithBaseAddress(url).Execute().Result();
+		/// </code>
+		/// </example>
+		public static MozuClient<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout> SetShippingMethodsClient(List<Mozu.Api.Contracts.CommerceRuntime.Checkouts.CheckoutGroupShippingMethod> groupShippingMethods, string checkoutId, string responseFields =  null)
+		{
+			var url = Mozu.Api.Urls.Commerce.CheckoutUrl.SetShippingMethodsUrl(checkoutId, responseFields);
+			const string verb = "POST";
+			var mozuClient = new MozuClient<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout>()
+									.WithVerb(verb).WithResourceUrl(url)
+									.WithBody<List<Mozu.Api.Contracts.CommerceRuntime.Checkouts.CheckoutGroupShippingMethod>>(groupShippingMethods);
+			return mozuClient;
+
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="checkoutId"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="checkout"></param>
+		/// <returns>
+		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout"/>}
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var mozuClient=UpdateCheckout( checkout,  checkoutId,  responseFields);
+		///   var checkoutClient = mozuClient.WithBaseAddress(url).Execute().Result();
+		/// </code>
+		/// </example>
+		public static MozuClient<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout> UpdateCheckoutClient(Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout checkout, string checkoutId, string responseFields =  null)
+		{
+			var url = Mozu.Api.Urls.Commerce.CheckoutUrl.UpdateCheckoutUrl(checkoutId, responseFields);
+			const string verb = "POST";
+			var mozuClient = new MozuClient<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout>()
+									.WithVerb(verb).WithResourceUrl(url)
+									.WithBody<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout>(checkout);
+			return mozuClient;
+
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="checkoutId"></param>
+		/// <param name="digitalWalletType"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="digitalWallet"></param>
+		/// <returns>
+		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout"/>}
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var mozuClient=ProcessDigitalWallet( digitalWallet,  checkoutId,  digitalWalletType,  responseFields);
+		///   var checkoutClient = mozuClient.WithBaseAddress(url).Execute().Result();
+		/// </code>
+		/// </example>
+		public static MozuClient<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout> ProcessDigitalWalletClient(Mozu.Api.Contracts.CommerceRuntime.Orders.DigitalWallet digitalWallet, string checkoutId, string digitalWalletType, string responseFields =  null)
+		{
+			var url = Mozu.Api.Urls.Commerce.CheckoutUrl.ProcessDigitalWalletUrl(checkoutId, digitalWalletType, responseFields);
+			const string verb = "PUT";
+			var mozuClient = new MozuClient<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout>()
+									.WithVerb(verb).WithResourceUrl(url)
+									.WithBody<Mozu.Api.Contracts.CommerceRuntime.Orders.DigitalWallet>(digitalWallet);
+			return mozuClient;
+
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="checkoutId"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="priceListCode"></param>
+		/// <returns>
+		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout"/>}
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var mozuClient=ChangeCheckoutPriceList( priceListCode,  checkoutId,  responseFields);
+		///   var checkoutClient = mozuClient.WithBaseAddress(url).Execute().Result();
+		/// </code>
+		/// </example>
+		public static MozuClient<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout> ChangeCheckoutPriceListClient(string priceListCode, string checkoutId, string responseFields =  null)
+		{
+			var url = Mozu.Api.Urls.Commerce.CheckoutUrl.ChangeCheckoutPriceListUrl(checkoutId, responseFields);
+			const string verb = "PUT";
+			var mozuClient = new MozuClient<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout>()
+									.WithVerb(verb).WithResourceUrl(url)
+									.WithBody(priceListCode);
+			return mozuClient;
+
+		}
+
+
+	}
+
+}
+
+
diff --git a/Mozu.Api/Clients/Commerce/Checkouts/AppliedDiscountClient.cs b/Mozu.Api/Clients/Commerce/Checkouts/AppliedDiscountClient.cs
new file mode 100755
index 00000000..021807d5
--- /dev/null
+++ b/Mozu.Api/Clients/Commerce/Checkouts/AppliedDiscountClient.cs
@@ -0,0 +1,105 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using Mozu.Api.Security;
+using System.Threading.Tasks;
+using Newtonsoft.Json.Linq;
+using System.Threading;
+
+namespace Mozu.Api.Clients.Commerce.Checkouts
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	public partial class AppliedDiscountClient 	{
+		
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="checkoutId"></param>
+		/// <param name="couponCode"></param>
+		/// <param name="responseFields"></param>
+		/// <returns>
+		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout"/>}
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var mozuClient=ApplyCoupon( checkoutId,  couponCode,  responseFields);
+		///   var checkoutClient = mozuClient.WithBaseAddress(url).Execute().Result();
+		/// </code>
+		/// </example>
+		public static MozuClient<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout> ApplyCouponClient(string checkoutId, string couponCode, string responseFields =  null)
+		{
+			var url = Mozu.Api.Urls.Commerce.Checkouts.AppliedDiscountUrl.ApplyCouponUrl(checkoutId, couponCode, responseFields);
+			const string verb = "PUT";
+			var mozuClient = new MozuClient<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout>()
+									.WithVerb(verb).WithResourceUrl(url)
+;
+			return mozuClient;
+
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="checkoutId"></param>
+		/// <returns>
+		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout"/>}
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var mozuClient=RemoveCoupons( checkoutId);
+		///   var checkoutClient = mozuClient.WithBaseAddress(url).Execute().Result();
+		/// </code>
+		/// </example>
+		public static MozuClient<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout> RemoveCouponsClient(string checkoutId)
+		{
+			var url = Mozu.Api.Urls.Commerce.Checkouts.AppliedDiscountUrl.RemoveCouponsUrl(checkoutId);
+			const string verb = "DELETE";
+			var mozuClient = new MozuClient<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout>()
+									.WithVerb(verb).WithResourceUrl(url)
+;
+			return mozuClient;
+
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="checkoutId"></param>
+		/// <param name="couponCode"></param>
+		/// <returns>
+		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout"/>}
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var mozuClient=RemoveCoupon( checkoutId,  couponCode);
+		///   var checkoutClient = mozuClient.WithBaseAddress(url).Execute().Result();
+		/// </code>
+		/// </example>
+		public static MozuClient<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout> RemoveCouponClient(string checkoutId, string couponCode)
+		{
+			var url = Mozu.Api.Urls.Commerce.Checkouts.AppliedDiscountUrl.RemoveCouponUrl(checkoutId, couponCode);
+			const string verb = "DELETE";
+			var mozuClient = new MozuClient<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout>()
+									.WithVerb(verb).WithResourceUrl(url)
+;
+			return mozuClient;
+
+		}
+
+
+	}
+
+}
+
+
diff --git a/Mozu.Api/Clients/Commerce/Checkouts/DestinationClient.cs b/Mozu.Api/Clients/Commerce/Checkouts/DestinationClient.cs
new file mode 100755
index 00000000..42c55337
--- /dev/null
+++ b/Mozu.Api/Clients/Commerce/Checkouts/DestinationClient.cs
@@ -0,0 +1,158 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using Mozu.Api.Security;
+using System.Threading.Tasks;
+using Newtonsoft.Json.Linq;
+using System.Threading;
+
+namespace Mozu.Api.Clients.Commerce.Checkouts
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	public partial class DestinationClient 	{
+		
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="checkoutId"></param>
+		/// <returns>
+		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Destination"/>}}
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var mozuClient=GetDestinations( checkoutId);
+		///   var destinationClient = mozuClient.WithBaseAddress(url).Execute().Result();
+		/// </code>
+		/// </example>
+		public static MozuClient<List<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Destination>> GetDestinationsClient(string checkoutId)
+		{
+			var url = Mozu.Api.Urls.Commerce.Checkouts.DestinationUrl.GetDestinationsUrl(checkoutId);
+			const string verb = "GET";
+			var mozuClient = new MozuClient<List<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Destination>>()
+									.WithVerb(verb).WithResourceUrl(url)
+;
+			return mozuClient;
+
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="checkoutId"></param>
+		/// <param name="destinationId"></param>
+		/// <param name="responseFields"></param>
+		/// <returns>
+		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Destination"/>}
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var mozuClient=GetDestination( checkoutId,  destinationId,  responseFields);
+		///   var destinationClient = mozuClient.WithBaseAddress(url).Execute().Result();
+		/// </code>
+		/// </example>
+		public static MozuClient<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Destination> GetDestinationClient(string checkoutId, string destinationId, string responseFields =  null)
+		{
+			var url = Mozu.Api.Urls.Commerce.Checkouts.DestinationUrl.GetDestinationUrl(checkoutId, destinationId, responseFields);
+			const string verb = "GET";
+			var mozuClient = new MozuClient<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Destination>()
+									.WithVerb(verb).WithResourceUrl(url)
+;
+			return mozuClient;
+
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="checkoutId"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="destination"></param>
+		/// <returns>
+		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Destination"/>}
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var mozuClient=AddDestination( destination,  checkoutId,  responseFields);
+		///   var destinationClient = mozuClient.WithBaseAddress(url).Execute().Result();
+		/// </code>
+		/// </example>
+		public static MozuClient<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Destination> AddDestinationClient(Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Destination destination, string checkoutId, string responseFields =  null)
+		{
+			var url = Mozu.Api.Urls.Commerce.Checkouts.DestinationUrl.AddDestinationUrl(checkoutId, responseFields);
+			const string verb = "POST";
+			var mozuClient = new MozuClient<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Destination>()
+									.WithVerb(verb).WithResourceUrl(url)
+									.WithBody<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Destination>(destination);
+			return mozuClient;
+
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="checkoutId"></param>
+		/// <param name="destinationId"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="destination"></param>
+		/// <returns>
+		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Destination"/>}
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var mozuClient=UpdateDestination( destination,  checkoutId,  destinationId,  responseFields);
+		///   var destinationClient = mozuClient.WithBaseAddress(url).Execute().Result();
+		/// </code>
+		/// </example>
+		public static MozuClient<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Destination> UpdateDestinationClient(Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Destination destination, string checkoutId, string destinationId, string responseFields =  null)
+		{
+			var url = Mozu.Api.Urls.Commerce.Checkouts.DestinationUrl.UpdateDestinationUrl(checkoutId, destinationId, responseFields);
+			const string verb = "PUT";
+			var mozuClient = new MozuClient<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Destination>()
+									.WithVerb(verb).WithResourceUrl(url)
+									.WithBody<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Destination>(destination);
+			return mozuClient;
+
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="checkoutId"></param>
+		/// <param name="destinationId"></param>
+		/// <returns>
+		///  <see cref="Mozu.Api.MozuClient" />
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var mozuClient=RemoveDestination( checkoutId,  destinationId);
+		///mozuClient.WithBaseAddress(url).Execute();
+		/// </code>
+		/// </example>
+		public static MozuClient RemoveDestinationClient(string checkoutId, string destinationId)
+		{
+			var url = Mozu.Api.Urls.Commerce.Checkouts.DestinationUrl.RemoveDestinationUrl(checkoutId, destinationId);
+			const string verb = "DELETE";
+			var mozuClient = new MozuClient()
+									.WithVerb(verb).WithResourceUrl(url)
+;
+			return mozuClient;
+
+		}
+
+
+	}
+
+}
+
+
diff --git a/Mozu.Api/Clients/Commerce/Checkouts/OrderAttributeClient.cs b/Mozu.Api/Clients/Commerce/Checkouts/OrderAttributeClient.cs
new file mode 100755
index 00000000..e5caed71
--- /dev/null
+++ b/Mozu.Api/Clients/Commerce/Checkouts/OrderAttributeClient.cs
@@ -0,0 +1,105 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using Mozu.Api.Security;
+using System.Threading.Tasks;
+using Newtonsoft.Json.Linq;
+using System.Threading;
+
+namespace Mozu.Api.Clients.Commerce.Checkouts
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	public partial class OrderAttributeClient 	{
+		
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="checkoutId"></param>
+		/// <returns>
+		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAttribute"/>}}
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var mozuClient=GetCheckoutAttributes( checkoutId);
+		///   var orderAttributeClient = mozuClient.WithBaseAddress(url).Execute().Result();
+		/// </code>
+		/// </example>
+		public static MozuClient<List<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAttribute>> GetCheckoutAttributesClient(string checkoutId)
+		{
+			var url = Mozu.Api.Urls.Commerce.Checkouts.OrderAttributeUrl.GetCheckoutAttributesUrl(checkoutId);
+			const string verb = "GET";
+			var mozuClient = new MozuClient<List<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAttribute>>()
+									.WithVerb(verb).WithResourceUrl(url)
+;
+			return mozuClient;
+
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="checkoutId"></param>
+		/// <param name="checkoutAttributes"></param>
+		/// <returns>
+		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAttribute"/>}}
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var mozuClient=CreateCheckoutAttributes( checkoutAttributes,  checkoutId);
+		///   var orderAttributeClient = mozuClient.WithBaseAddress(url).Execute().Result();
+		/// </code>
+		/// </example>
+		public static MozuClient<List<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAttribute>> CreateCheckoutAttributesClient(List<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAttribute> checkoutAttributes, string checkoutId)
+		{
+			var url = Mozu.Api.Urls.Commerce.Checkouts.OrderAttributeUrl.CreateCheckoutAttributesUrl(checkoutId);
+			const string verb = "POST";
+			var mozuClient = new MozuClient<List<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAttribute>>()
+									.WithVerb(verb).WithResourceUrl(url)
+									.WithBody<List<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAttribute>>(checkoutAttributes);
+			return mozuClient;
+
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="checkoutId"></param>
+		/// <param name="removeMissing"></param>
+		/// <param name="checkoutAttributes"></param>
+		/// <returns>
+		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAttribute"/>}}
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var mozuClient=UpdateCheckoutAttribute( checkoutAttributes,  checkoutId,  removeMissing);
+		///   var orderAttributeClient = mozuClient.WithBaseAddress(url).Execute().Result();
+		/// </code>
+		/// </example>
+		public static MozuClient<List<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAttribute>> UpdateCheckoutAttributeClient(List<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAttribute> checkoutAttributes, string checkoutId, bool? removeMissing =  null)
+		{
+			var url = Mozu.Api.Urls.Commerce.Checkouts.OrderAttributeUrl.UpdateCheckoutAttributeUrl(checkoutId, removeMissing);
+			const string verb = "PUT";
+			var mozuClient = new MozuClient<List<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAttribute>>()
+									.WithVerb(verb).WithResourceUrl(url)
+									.WithBody<List<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAttribute>>(checkoutAttributes);
+			return mozuClient;
+
+		}
+
+
+	}
+
+}
+
+
diff --git a/Mozu.Api/Clients/Commerce/Checkouts/OrderItemClient.cs b/Mozu.Api/Clients/Commerce/Checkouts/OrderItemClient.cs
new file mode 100755
index 00000000..36b9bf95
--- /dev/null
+++ b/Mozu.Api/Clients/Commerce/Checkouts/OrderItemClient.cs
@@ -0,0 +1,110 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using Mozu.Api.Security;
+using System.Threading.Tasks;
+using Newtonsoft.Json.Linq;
+using System.Threading;
+
+namespace Mozu.Api.Clients.Commerce.Checkouts
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	public partial class OrderItemClient 	{
+		
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="checkoutId"></param>
+		/// <param name="itemId"></param>
+		/// <param name="quantity"></param>
+		/// <param name="responseFields"></param>
+		/// <returns>
+		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout"/>}
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var mozuClient=SplitItem( checkoutId,  itemId,  quantity,  responseFields);
+		///   var checkoutClient = mozuClient.WithBaseAddress(url).Execute().Result();
+		/// </code>
+		/// </example>
+		public static MozuClient<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout> SplitItemClient(string checkoutId, string itemId, int? quantity =  null, string responseFields =  null)
+		{
+			var url = Mozu.Api.Urls.Commerce.Checkouts.OrderItemUrl.SplitItemUrl(checkoutId, itemId, quantity, responseFields);
+			const string verb = "POST";
+			var mozuClient = new MozuClient<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout>()
+									.WithVerb(verb).WithResourceUrl(url)
+;
+			return mozuClient;
+
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="checkoutId"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="itemsForDestination"></param>
+		/// <returns>
+		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout"/>}
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var mozuClient=BulkUpdateItemDestinations( itemsForDestination,  checkoutId,  responseFields);
+		///   var checkoutClient = mozuClient.WithBaseAddress(url).Execute().Result();
+		/// </code>
+		/// </example>
+		public static MozuClient<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout> BulkUpdateItemDestinationsClient(List<Mozu.Api.Contracts.CommerceRuntime.Checkouts.ItemsForDestination> itemsForDestination, string checkoutId, string responseFields =  null)
+		{
+			var url = Mozu.Api.Urls.Commerce.Checkouts.OrderItemUrl.BulkUpdateItemDestinationsUrl(checkoutId, responseFields);
+			const string verb = "POST";
+			var mozuClient = new MozuClient<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout>()
+									.WithVerb(verb).WithResourceUrl(url)
+									.WithBody<List<Mozu.Api.Contracts.CommerceRuntime.Checkouts.ItemsForDestination>>(itemsForDestination);
+			return mozuClient;
+
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="checkoutId"></param>
+		/// <param name="destinationId"></param>
+		/// <param name="itemId"></param>
+		/// <param name="responseFields"></param>
+		/// <returns>
+		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout"/>}
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var mozuClient=UpdateItemDestination( checkoutId,  itemId,  destinationId,  responseFields);
+		///   var checkoutClient = mozuClient.WithBaseAddress(url).Execute().Result();
+		/// </code>
+		/// </example>
+		public static MozuClient<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout> UpdateItemDestinationClient(string checkoutId, string itemId, string destinationId, string responseFields =  null)
+		{
+			var url = Mozu.Api.Urls.Commerce.Checkouts.OrderItemUrl.UpdateItemDestinationUrl(checkoutId, itemId, destinationId, responseFields);
+			const string verb = "PUT";
+			var mozuClient = new MozuClient<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout>()
+									.WithVerb(verb).WithResourceUrl(url)
+;
+			return mozuClient;
+
+		}
+
+
+	}
+
+}
+
+
diff --git a/Mozu.Api/Clients/Commerce/Checkouts/PaymentClient.cs b/Mozu.Api/Clients/Commerce/Checkouts/PaymentClient.cs
new file mode 100755
index 00000000..169e24c8
--- /dev/null
+++ b/Mozu.Api/Clients/Commerce/Checkouts/PaymentClient.cs
@@ -0,0 +1,83 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using Mozu.Api.Security;
+using System.Threading.Tasks;
+using Newtonsoft.Json.Linq;
+using System.Threading;
+
+namespace Mozu.Api.Clients.Commerce.Checkouts
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	public partial class PaymentClient 	{
+		
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="checkoutId"></param>
+		/// <param name="paymentId"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="action"></param>
+		/// <returns>
+		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout"/>}
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var mozuClient=PerformPaymentAction( action,  checkoutId,  paymentId,  responseFields);
+		///   var checkoutClient = mozuClient.WithBaseAddress(url).Execute().Result();
+		/// </code>
+		/// </example>
+		public static MozuClient<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout> PerformPaymentActionClient(Mozu.Api.Contracts.CommerceRuntime.Payments.PaymentAction action, string checkoutId, string paymentId, string responseFields =  null)
+		{
+			var url = Mozu.Api.Urls.Commerce.Checkouts.PaymentUrl.PerformPaymentActionUrl(checkoutId, paymentId, responseFields);
+			const string verb = "POST";
+			var mozuClient = new MozuClient<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout>()
+									.WithVerb(verb).WithResourceUrl(url)
+									.WithBody<Mozu.Api.Contracts.CommerceRuntime.Payments.PaymentAction>(action);
+			return mozuClient;
+
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="checkoutId"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="action"></param>
+		/// <returns>
+		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout"/>}
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var mozuClient=CreatePaymentAction( action,  checkoutId,  responseFields);
+		///   var checkoutClient = mozuClient.WithBaseAddress(url).Execute().Result();
+		/// </code>
+		/// </example>
+		public static MozuClient<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout> CreatePaymentActionClient(Mozu.Api.Contracts.CommerceRuntime.Payments.PaymentAction action, string checkoutId, string responseFields =  null)
+		{
+			var url = Mozu.Api.Urls.Commerce.Checkouts.PaymentUrl.CreatePaymentActionUrl(checkoutId, responseFields);
+			const string verb = "POST";
+			var mozuClient = new MozuClient<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout>()
+									.WithVerb(verb).WithResourceUrl(url)
+									.WithBody<Mozu.Api.Contracts.CommerceRuntime.Payments.PaymentAction>(action);
+			return mozuClient;
+
+		}
+
+
+	}
+
+}
+
+
diff --git a/Mozu.Api/Clients/Commerce/Customer/Accounts/CardClient.cs b/Mozu.Api/Clients/Commerce/Customer/Accounts/CardClient.cs
old mode 100644
new mode 100755
index ee927f45..a41d7845
--- a/Mozu.Api/Clients/Commerce/Customer/Accounts/CardClient.cs
+++ b/Mozu.Api/Clients/Commerce/Customer/Accounts/CardClient.cs
@@ -13,20 +13,21 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Customer.Accounts
 {
 	/// <summary>
-	/// Use the Cards subresource to manage stored credit cards for customer accounts.  stores limited card data in the Customer service for expedited ordering purposes; however, the complete card data is stored in the Payment service.
+	/// Use the Cards subresource to manage stored credit cards for customer accounts. Mozu stores limited card data in the Customer service for expedited ordering purposes; however, the complete card data is stored in the Payment service.
 	/// </summary>
 	public partial class CardClient 	{
 		
 		/// <summary>
-		/// Retrieves the details of a credit card stored with a customer account billing contact.
+		/// 
 		/// </summary>
 		/// <param name="accountId">Unique identifier of the customer account.</param>
 		/// <param name="cardId">Unique identifier of the card associated with the customer account billing contact.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Customer.Card"/>}
 		/// </returns>
@@ -48,10 +49,10 @@ public partial class CardClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves all stored credit cards for the customer account.
+		/// 
 		/// </summary>
 		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Customer.CardCollection"/>}
 		/// </returns>
@@ -73,11 +74,11 @@ public partial class CardClient 	{
 		}
 
 		/// <summary>
-		/// Creates a new credit card record and stores it for the customer account.
+		/// 
 		/// </summary>
 		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="card">Properties of a credit card used to submit payment for an order.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="card">Properties of the customer credit card to add to the account.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Customer.Card"/>}
 		/// </returns>
@@ -99,12 +100,12 @@ public partial class CardClient 	{
 		}
 
 		/// <summary>
-		/// Update one or more properties of a credit card defined for a customer account.
+		/// 
 		/// </summary>
 		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="cardId">Unique identifier of the card associated with the customer account billing contact.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="card">Properties of a credit card used to submit payment for an order.</param>
+		/// <param name="cardId">Unique identifier of the credit card.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="card">Properties of the customer account credit card to update.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Customer.Card"/>}
 		/// </returns>
@@ -126,10 +127,10 @@ public partial class CardClient 	{
 		}
 
 		/// <summary>
-		/// Removes a stored credit card from a customer account.
+		/// 
 		/// </summary>
 		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="cardId">Unique identifier of the card associated with the customer account billing contact.</param>
+		/// <param name="cardId">Unique identifier of the credit card to delete.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Customer/Accounts/CustomerAttributeClient.cs b/Mozu.Api/Clients/Commerce/Customer/Accounts/CustomerAttributeClient.cs
old mode 100644
new mode 100755
index 1b35db12..0836239b
--- a/Mozu.Api/Clients/Commerce/Customer/Accounts/CustomerAttributeClient.cs
+++ b/Mozu.Api/Clients/Commerce/Customer/Accounts/CustomerAttributeClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Customer.Accounts
 {
@@ -22,11 +23,11 @@ namespace Mozu.Api.Clients.Commerce.Customer.Accounts
 	public partial class CustomerAttributeClient 	{
 		
 		/// <summary>
-		/// Retrieves the contents of an attribute associated with the specified customer account.
+		/// 
 		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="accountId">Identifier of the customer account associated with the attribute to retrieve.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Customer.CustomerAttribute"/>}
 		/// </returns>
@@ -48,12 +49,12 @@ public partial class CustomerAttributeClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the list of customer account attributes.
+		/// 
 		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
+		/// <param name="accountId">Identifier of the customer account associated with the attributes to retrieve.</param>
 		/// <param name="filter"></param>
 		/// <param name="pageSize"></param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="sortBy"></param>
 		/// <param name="startIndex"></param>
 		/// <returns>
@@ -77,11 +78,11 @@ public partial class CustomerAttributeClient 	{
 		}
 
 		/// <summary>
-		/// Applies a defined attribute to the customer account specified in the request and assigns a value to the customer attribute.
+		/// 
 		/// </summary>
 		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="attribute">Properties of an attribute associated with a customer account.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="attribute">The attribute to add to the customer account.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Customer.CustomerAttribute"/>}
 		/// </returns>
@@ -103,12 +104,12 @@ public partial class CustomerAttributeClient 	{
 		}
 
 		/// <summary>
-		/// Updates one or more details of a customer account attribute.
+		/// 
 		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="attribute">Properties of an attribute associated with a customer account.</param>
+		/// <param name="accountId">Identifier of the customer account associated with the attribute.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="attribute">Properties of the customer account attribute to update.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Customer.CustomerAttribute"/>}
 		/// </returns>
@@ -130,10 +131,10 @@ public partial class CustomerAttributeClient 	{
 		}
 
 		/// <summary>
-		/// Removes the attribute specified in the request from the customer account.
+		/// 
 		/// </summary>
 		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
+		/// <param name="attributeFQN"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Customer/Accounts/CustomerAuditEntryClient.cs b/Mozu.Api/Clients/Commerce/Customer/Accounts/CustomerAuditEntryClient.cs
old mode 100644
new mode 100755
index cc428bad..354247d2
--- a/Mozu.Api/Clients/Commerce/Customer/Accounts/CustomerAuditEntryClient.cs
+++ b/Mozu.Api/Clients/Commerce/Customer/Accounts/CustomerAuditEntryClient.cs
@@ -13,23 +13,24 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Customer.Accounts
 {
 	/// <summary>
-	/// Use the Audit Log resource to retrieve audit logs for customer accounts.
+	/// 
 	/// </summary>
 	public partial class CustomerAuditEntryClient 	{
 		
 		/// <summary>
-		/// Retrieves audit log entries for the specified customer account.
+		/// 
 		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
+		/// <param name="accountId"></param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Customer.CustomerAuditEntryCollection"/>}
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Customer/Accounts/CustomerContactClient.cs b/Mozu.Api/Clients/Commerce/Customer/Accounts/CustomerContactClient.cs
old mode 100644
new mode 100755
index 5ea66183..d36e37c8
--- a/Mozu.Api/Clients/Commerce/Customer/Accounts/CustomerContactClient.cs
+++ b/Mozu.Api/Clients/Commerce/Customer/Accounts/CustomerContactClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Customer.Accounts
 {
@@ -22,11 +23,11 @@ namespace Mozu.Api.Clients.Commerce.Customer.Accounts
 	public partial class CustomerContactClient 	{
 		
 		/// <summary>
-		/// Retrieves the specified contact for a customer account such as a billing or shipping contact.
+		/// 
 		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="contactId">Unique identifer of the customer account contact being updated.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="accountId">Unique identifier of the customer account whose contact information is being retrieved.</param>
+		/// <param name="contactId">Unique identifier of the customer account contact to retrieve.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Customer.CustomerContact"/>}
 		/// </returns>
@@ -48,12 +49,12 @@ public partial class CustomerContactClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves a list of contacts for a customer according to any specified filter criteria and sort options.
+		/// 
 		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="accountId">Unique identifier of the customer account associated with the contact information to retrieve.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
 		/// <param name="sortBy"></param>
 		/// <param name="startIndex"></param>
 		/// <returns>
@@ -77,11 +78,11 @@ public partial class CustomerContactClient 	{
 		}
 
 		/// <summary>
-		/// Creates a new contact for a customer account such as a new shipping address.
+		/// 
 		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="contact">Contact information, including the contact's name, address, phone numbers, email addresses, and company (if supplied). Also indicates whether this is a billing, shipping, or billing and shipping contact.</param>
+		/// <param name="accountId">Unique identifier of the customer account containing the new contact.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="contact">Properties of the new contact. Required properties: Contact.Email, ContactType.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Customer.CustomerContact"/>}
 		/// </returns>
@@ -103,12 +104,12 @@ public partial class CustomerContactClient 	{
 		}
 
 		/// <summary>
-		/// Updates a contact for a specified customer account such as to update addresses or change which contact is the primary contact for billing.
+		/// 
 		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
+		/// <param name="accountId">Unique identifier of the customer account whose contact information is being updated.</param>
 		/// <param name="contactId">Unique identifer of the customer account contact being updated.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="contact">Contact information, including the contact's name, address, phone numbers, email addresses, and company (if supplied). Also indicates whether this is a billing, shipping, or billing and shipping contact.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="contact">All properties the updated contact will have. Required properties: Name and email address.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Customer.CustomerContact"/>}
 		/// </returns>
@@ -130,10 +131,36 @@ public partial class CustomerContactClient 	{
 		}
 
 		/// <summary>
-		/// Deletes a contact for the specified customer account.
+		/// 
+		/// </summary>
+		/// <param name="accountId"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="contactList"></param>
+		/// <returns>
+		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Customer.CustomerContactCollection"/>}
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var mozuClient=AddAccountContactList( contactList,  accountId,  responseFields);
+		///   var customerContactCollectionClient = mozuClient.WithBaseAddress(url).Execute().Result();
+		/// </code>
+		/// </example>
+		public static MozuClient<Mozu.Api.Contracts.Customer.CustomerContactCollection> AddAccountContactListClient(List<Mozu.Api.Contracts.Customer.CustomerContact> contactList, int accountId, string responseFields =  null)
+		{
+			var url = Mozu.Api.Urls.Commerce.Customer.Accounts.CustomerContactUrl.AddAccountContactListUrl(accountId, responseFields);
+			const string verb = "PUT";
+			var mozuClient = new MozuClient<Mozu.Api.Contracts.Customer.CustomerContactCollection>()
+									.WithVerb(verb).WithResourceUrl(url)
+									.WithBody<List<Mozu.Api.Contracts.Customer.CustomerContact>>(contactList);
+			return mozuClient;
+
+		}
+
+		/// <summary>
+		/// 
 		/// </summary>
 		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="contactId">Unique identifer of the customer account contact being updated.</param>
+		/// <param name="contactId">Unique identifier of the customer account contact to delete.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Customer/Accounts/CustomerNoteClient.cs b/Mozu.Api/Clients/Commerce/Customer/Accounts/CustomerNoteClient.cs
old mode 100644
new mode 100755
index ddcc83bc..ff4d216e
--- a/Mozu.Api/Clients/Commerce/Customer/Accounts/CustomerNoteClient.cs
+++ b/Mozu.Api/Clients/Commerce/Customer/Accounts/CustomerNoteClient.cs
@@ -13,20 +13,21 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Customer.Accounts
 {
 	/// <summary>
-	/// This resources manages notes for a customer account. For example, a client can track a shopper's interests or complaints. Only clients can add and view notes. Shoppers cannot view these notes from the My Account page.
+	/// Tenant administrators can add and view internal notes for a customer account. For example, a client can track a shopper's interests or complaints. Only clients can add and view notes. Shoppers cannot view these notes from the My Account page.
 	/// </summary>
 	public partial class CustomerNoteClient 	{
 		
 		/// <summary>
-		/// Retrieves the contents of a particular note attached to a specified customer account.
+		/// 
 		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
+		/// <param name="accountId">Unique identifier of the customer account that contains the note being retrieved.</param>
 		/// <param name="noteId">Unique identifier of a particular note to retrieve.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Customer.CustomerNote"/>}
 		/// </returns>
@@ -48,14 +49,14 @@ public partial class CustomerNoteClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves a list of notes added to a customer account according to any specified filter criteria and sort options.
+		/// 
 		/// </summary>
 		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Customer.CustomerNoteCollection"/>}
 		/// </returns>
@@ -77,11 +78,11 @@ public partial class CustomerNoteClient 	{
 		}
 
 		/// <summary>
-		/// Adds a new note to the specified customer account.
+		/// 
 		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="note">Properties of a note configured for a customer account.</param>
+		/// <param name="accountId">Unique identifier of the customer account for which to create the note.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="note">Properties of the customer account note to create.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Customer.CustomerNote"/>}
 		/// </returns>
@@ -103,12 +104,12 @@ public partial class CustomerNoteClient 	{
 		}
 
 		/// <summary>
-		/// Modifies an existing note for a customer account.
+		/// 
 		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="noteId">Unique identifier of a particular note to retrieve.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="note">Properties of a note configured for a customer account.</param>
+		/// <param name="accountId">Unique identifier of the customer account note to modify.</param>
+		/// <param name="noteId">Unique identifier of the note to update.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="note">The new content to replace the existing note.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Customer.CustomerNote"/>}
 		/// </returns>
@@ -130,10 +131,10 @@ public partial class CustomerNoteClient 	{
 		}
 
 		/// <summary>
-		/// Removes a note from the specified customer account.
+		/// 
 		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="noteId">Unique identifier of a particular note to retrieve.</param>
+		/// <param name="accountId">Unique identifier of the customer account that contains the note being deleted.</param>
+		/// <param name="noteId">Unique identifier of the customer account note being deleted.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Customer/Accounts/CustomerPurchaseOrderAccountClient.cs b/Mozu.Api/Clients/Commerce/Customer/Accounts/CustomerPurchaseOrderAccountClient.cs
old mode 100644
new mode 100755
index cb047f60..c9cf0f4f
--- a/Mozu.Api/Clients/Commerce/Customer/Accounts/CustomerPurchaseOrderAccountClient.cs
+++ b/Mozu.Api/Clients/Commerce/Customer/Accounts/CustomerPurchaseOrderAccountClient.cs
@@ -13,19 +13,20 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Customer.Accounts
 {
 	/// <summary>
-	/// Use the Customer Account Purchase Order resource to manage purchase order details for specific customer acocunts.
+	/// 
 	/// </summary>
 	public partial class CustomerPurchaseOrderAccountClient 	{
 		
 		/// <summary>
-		/// Retrieves the details of the specified customer purchase order account.
+		/// 
 		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="accountId"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Customer.CustomerPurchaseOrderAccount"/>}
 		/// </returns>
@@ -47,14 +48,14 @@ public partial class CustomerPurchaseOrderAccountClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves a list of purchase order transactions for the specified customer account according to any specified sort options.
+		/// 
 		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
+		/// <param name="accountId"></param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Customer.PurchaseOrderTransactionCollection"/>}
 		/// </returns>
@@ -76,11 +77,11 @@ public partial class CustomerPurchaseOrderAccountClient 	{
 		}
 
 		/// <summary>
-		/// Adds a purchase order account to the specified customer account.This adds the ability for the specified customer account to use the purchase order payment method.
+		/// 
 		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="customerPurchaseOrderAccount">Unique identifier of the customer purchase order account.</param>
+		/// <param name="accountId"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="customerPurchaseOrderAccount"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Customer.CustomerPurchaseOrderAccount"/>}
 		/// </returns>
@@ -102,11 +103,11 @@ public partial class CustomerPurchaseOrderAccountClient 	{
 		}
 
 		/// <summary>
-		/// Creates a purchase order transaction on the specified customer purchase order account.
+		/// 
 		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="purchaseOrderTransaction">The purchase order transaction type to add to the specified customer account.</param>
+		/// <param name="accountId"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="purchaseOrderTransaction"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Customer.PurchaseOrderTransaction"/>}
 		/// </returns>
@@ -128,11 +129,11 @@ public partial class CustomerPurchaseOrderAccountClient 	{
 		}
 
 		/// <summary>
-		/// Updates the details of the purchase order account for the specified customer account.
+		/// 
 		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="customerPurchaseOrderAccount">Unique identifier of the customer purchase order account.</param>
+		/// <param name="accountId"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="customerPurchaseOrderAccount"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Customer.CustomerPurchaseOrderAccount"/>}
 		/// </returns>
@@ -154,9 +155,9 @@ public partial class CustomerPurchaseOrderAccountClient 	{
 		}
 
 		/// <summary>
-		/// Deletes the specified customer purchase order account.This removes the ability for the specified customer account to use the purchase order payment method.
+		/// 
 		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
+		/// <param name="accountId"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Customer/Accounts/CustomerSegmentClient.cs b/Mozu.Api/Clients/Commerce/Customer/Accounts/CustomerSegmentClient.cs
old mode 100644
new mode 100755
index ac69b11e..0c227bea
--- a/Mozu.Api/Clients/Commerce/Customer/Accounts/CustomerSegmentClient.cs
+++ b/Mozu.Api/Clients/Commerce/Customer/Accounts/CustomerSegmentClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Customer.Accounts
 {
@@ -22,14 +23,14 @@ namespace Mozu.Api.Clients.Commerce.Customer.Accounts
 	public partial class CustomerSegmentClient 	{
 		
 		/// <summary>
-		/// Retrieves the list of segments associated with a customer account.
+		/// 
 		/// </summary>
 		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Customer.CustomerSegmentCollection"/>}
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Customer/Accounts/TransactionClient.cs b/Mozu.Api/Clients/Commerce/Customer/Accounts/TransactionClient.cs
old mode 100644
new mode 100755
index c1009191..64f11065
--- a/Mozu.Api/Clients/Commerce/Customer/Accounts/TransactionClient.cs
+++ b/Mozu.Api/Clients/Commerce/Customer/Accounts/TransactionClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Customer.Accounts
 {
@@ -22,9 +23,9 @@ namespace Mozu.Api.Clients.Commerce.Customer.Accounts
 	public partial class TransactionClient 	{
 		
 		/// <summary>
-		/// Retrieves a list of transactions associated with the customer account specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
+		/// <param name="accountId">Unique identifier of the customer account for which to retrieve transactions.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.Customer.Transaction"/>}}
 		/// </returns>
@@ -46,11 +47,11 @@ public partial class TransactionClient 	{
 		}
 
 		/// <summary>
-		/// Creates a new transaction for the customer account specified in the request.
+		/// 
 		/// </summary>
 		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="transaction">Properties of a transaction performed by a customer account. The system creates a transaction each time the customer submits an order, returns an item, picks up items for an order, or manages items on a wish list.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="transaction">Properties of the transaction to create for the customer account.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Customer.Transaction"/>}
 		/// </returns>
@@ -72,9 +73,9 @@ public partial class TransactionClient 	{
 		}
 
 		/// <summary>
-		/// Deletes a transaction from the customer account specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
+		/// <param name="accountId">Unique identifier of the customer account from which to delete the transaction.</param>
 		/// <param name="transactionId">Unique identifier of the transaction to delete.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
diff --git a/Mozu.Api/Clients/Commerce/Customer/AddressValidationRequestClient.cs b/Mozu.Api/Clients/Commerce/Customer/AddressValidationRequestClient.cs
old mode 100644
new mode 100755
index d1e6f6c6..38ac8a95
--- a/Mozu.Api/Clients/Commerce/Customer/AddressValidationRequestClient.cs
+++ b/Mozu.Api/Clients/Commerce/Customer/AddressValidationRequestClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Customer
 {
@@ -22,10 +23,10 @@ namespace Mozu.Api.Clients.Commerce.Customer
 	public partial class AddressValidationRequestClient 	{
 		
 		/// <summary>
-		/// Validates the customer address supplied in the request.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="addressValidationRequest">Properties of the address used for validation of the account's full address. This content may include multiple lines of an address, city, state/province, zip/postal code, and country.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="addressValidationRequest">Properties of the address to validate.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Customer.AddressValidationResponse"/>}
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Customer/Attributedefinition/AttributeClient.cs b/Mozu.Api/Clients/Commerce/Customer/Attributedefinition/AttributeClient.cs
old mode 100644
new mode 100755
index 81c89a1b..f3ee0f73
--- a/Mozu.Api/Clients/Commerce/Customer/Attributedefinition/AttributeClient.cs
+++ b/Mozu.Api/Clients/Commerce/Customer/Attributedefinition/AttributeClient.cs
@@ -13,23 +13,23 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Customer.Attributedefinition
 {
 	/// <summary>
-	/// Attributes are used to add custom definitions and characteristics to the following objects:
-
+	/// Use the Customer Attribute Definition resource to manage the attributes to define for your shoppers.
 	/// </summary>
 	public partial class AttributeClient 	{
 		
 		/// <summary>
-		/// Retrieves a paged list of attributes according to any specified filter criteria and sort options.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Core.Extensible.AttributeCollection"/>}
 		/// </returns>
@@ -51,9 +51,9 @@ public partial class AttributeClient 	{
 		}
 
 		/// <summary>
-		/// Retrieve a list of the vocabulary values defined for the customer attribute specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
+		/// <param name="attributeFQN"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.Core.Extensible.AttributeVocabularyValue"/>}}
 		/// </returns>
@@ -75,10 +75,10 @@ public partial class AttributeClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the details of the specified product attribute.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Core.Extensible.Attribute"/>}
 		/// </returns>
@@ -99,6 +99,57 @@ public partial class AttributeClient 	{
 
 		}
 
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="responseFields"></param>
+		/// <param name="attribute"></param>
+		/// <returns>
+		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Core.Extensible.Attribute"/>}
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var mozuClient=CreateAttribute( attribute,  responseFields);
+		///   var attributeClient = mozuClient.WithBaseAddress(url).Execute().Result();
+		/// </code>
+		/// </example>
+		public static MozuClient<Mozu.Api.Contracts.Core.Extensible.Attribute> CreateAttributeClient(Mozu.Api.Contracts.Core.Extensible.Attribute attribute, string responseFields =  null)
+		{
+			var url = Mozu.Api.Urls.Commerce.Customer.Attributedefinition.AttributeUrl.CreateAttributeUrl(responseFields);
+			const string verb = "POST";
+			var mozuClient = new MozuClient<Mozu.Api.Contracts.Core.Extensible.Attribute>()
+									.WithVerb(verb).WithResourceUrl(url)
+									.WithBody<Mozu.Api.Contracts.Core.Extensible.Attribute>(attribute);
+			return mozuClient;
+
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="attributeFQN"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="attribute"></param>
+		/// <returns>
+		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Core.Extensible.Attribute"/>}
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var mozuClient=UpdateAttribute( attribute,  attributeFQN,  responseFields);
+		///   var attributeClient = mozuClient.WithBaseAddress(url).Execute().Result();
+		/// </code>
+		/// </example>
+		public static MozuClient<Mozu.Api.Contracts.Core.Extensible.Attribute> UpdateAttributeClient(Mozu.Api.Contracts.Core.Extensible.Attribute attribute, string attributeFQN, string responseFields =  null)
+		{
+			var url = Mozu.Api.Urls.Commerce.Customer.Attributedefinition.AttributeUrl.UpdateAttributeUrl(attributeFQN, responseFields);
+			const string verb = "PUT";
+			var mozuClient = new MozuClient<Mozu.Api.Contracts.Core.Extensible.Attribute>()
+									.WithVerb(verb).WithResourceUrl(url)
+									.WithBody<Mozu.Api.Contracts.Core.Extensible.Attribute>(attribute);
+			return mozuClient;
+
+		}
+
 
 	}
 
diff --git a/Mozu.Api/Clients/Commerce/Customer/CreditClient.cs b/Mozu.Api/Clients/Commerce/Customer/CreditClient.cs
old mode 100644
new mode 100755
index 2d9de028..ffcbf0d5
--- a/Mozu.Api/Clients/Commerce/Customer/CreditClient.cs
+++ b/Mozu.Api/Clients/Commerce/Customer/CreditClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Customer
 {
@@ -22,13 +23,13 @@ namespace Mozu.Api.Clients.Commerce.Customer
 	public partial class CreditClient 	{
 		
 		/// <summary>
-		/// Retrieves a list of store credits applied to customer accounts, according any filter and sort criteria specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Customer.Credit.CreditCollection"/>}
 		/// </returns>
@@ -50,10 +51,10 @@ public partial class CreditClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the details of a store credit applied to a customer account.
+		/// 
 		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="code">User-defined code that identifies the store credit to retrieve.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Customer.Credit.Credit"/>}
 		/// </returns>
@@ -75,10 +76,10 @@ public partial class CreditClient 	{
 		}
 
 		/// <summary>
-		/// Creates a new store credit for the customer account specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="credit">Properties of the store credit of gift card applied to a customer account. At this time, gift card functionality is reserved for future use.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="credit">Properties of the store credit to create.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Customer.Credit.Credit"/>}
 		/// </returns>
@@ -100,10 +101,10 @@ public partial class CreditClient 	{
 		}
 
 		/// <summary>
-		/// Associates an unclaimed customer credit with the shopper user authenticated in the request header.
+		/// 
 		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="code">The code that represents the credit to claim for the shopper.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Customer.Credit.Credit"/>}
 		/// </returns>
@@ -125,9 +126,9 @@ public partial class CreditClient 	{
 		}
 
 		/// <summary>
-		/// Resend the notification email that informs a shopper that a credit has been created.
+		/// 
 		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
+		/// <param name="code"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
@@ -149,11 +150,11 @@ public static MozuClient ResendCreditCreatedEmailClient(string code)
 		}
 
 		/// <summary>
-		/// Updates one or more properties of a defined store credit applied to a customer account.
+		/// 
 		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="credit">Properties of the store credit of gift card applied to a customer account. At this time, gift card functionality is reserved for future use.</param>
+		/// <param name="code">User-defined code of the store credit to update.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="credit">Properties of the store credit to update.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Customer.Credit.Credit"/>}
 		/// </returns>
@@ -175,9 +176,9 @@ public static MozuClient ResendCreditCreatedEmailClient(string code)
 		}
 
 		/// <summary>
-		/// Deletes a store credit previously applied to a customer account.
+		/// 
 		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
+		/// <param name="code">User-defined code of the store credit to delete.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Customer/Credits/CreditAuditEntryClient.cs b/Mozu.Api/Clients/Commerce/Customer/Credits/CreditAuditEntryClient.cs
old mode 100644
new mode 100755
index f2e986e5..ab2a44ef
--- a/Mozu.Api/Clients/Commerce/Customer/Credits/CreditAuditEntryClient.cs
+++ b/Mozu.Api/Clients/Commerce/Customer/Credits/CreditAuditEntryClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Customer.Credits
 {
@@ -22,14 +23,14 @@ namespace Mozu.Api.Clients.Commerce.Customer.Credits
 	public partial class CreditAuditEntryClient 	{
 		
 		/// <summary>
-		/// Retrieves the list of audit entries for the credit, according to any filter or sort criteria specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+		/// <param name="code">User-defined code of the credit for which to retrieve audit entries.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Customer.Credit.CreditAuditEntryCollection"/>}
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Customer/Credits/CreditTransactionClient.cs b/Mozu.Api/Clients/Commerce/Customer/Credits/CreditTransactionClient.cs
old mode 100644
new mode 100755
index 1471e282..725c60a2
--- a/Mozu.Api/Clients/Commerce/Customer/Credits/CreditTransactionClient.cs
+++ b/Mozu.Api/Clients/Commerce/Customer/Credits/CreditTransactionClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Customer.Credits
 {
@@ -22,14 +23,14 @@ namespace Mozu.Api.Clients.Commerce.Customer.Credits
 	public partial class CreditTransactionClient 	{
 		
 		/// <summary>
-		/// Retrieves a list of the transactions performed using a customer credit that update the balance of the credit.
+		/// 
 		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+		/// <param name="code">User-defined code that identifies the customer credit.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Customer.Credit.CreditTransactionCollection"/>}
 		/// </returns>
@@ -51,11 +52,11 @@ public partial class CreditTransactionClient 	{
 		}
 
 		/// <summary>
-		/// Creates a new transaction and updates the amount of a store credit or gift card.
+		/// 
 		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="creditTransaction">Properties of a transaction performed for a customer credit that update the remaining balance of the credit.</param>
+		/// <param name="code">User-defined code that identifies the customer credit to update.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="creditTransaction">Properties of the transaction to create for the customer credit.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Customer.Credit.CreditTransaction"/>}
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Customer/CustomerAccountClient.cs b/Mozu.Api/Clients/Commerce/Customer/CustomerAccountClient.cs
old mode 100644
new mode 100755
index 3162a449..284a7dd9
--- a/Mozu.Api/Clients/Commerce/Customer/CustomerAccountClient.cs
+++ b/Mozu.Api/Clients/Commerce/Customer/CustomerAccountClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Customer
 {
@@ -22,15 +23,15 @@ namespace Mozu.Api.Clients.Commerce.Customer
 	public partial class CustomerAccountClient 	{
 		
 		/// <summary>
-		/// Retrieves a list of customer accounts.
+		/// 
 		/// </summary>
 		/// <param name="fields">The fields to include in the response.</param>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
+		/// <param name="filter"></param>
 		/// <param name="isAnonymous">If true, retrieve anonymous shopper accounts in the response.</param>
 		/// <param name="pageSize"></param>
-		/// <param name="q">A list of order search terms (not phrases) to use in the query when searching across order number and the name or email of the billing contact. When entering, separate multiple search terms with a space character.</param>
+		/// <param name="q">A list of customer account search terms to use in the query when searching across customer name and email. Separate multiple search terms with a space character.</param>
 		/// <param name="qLimit">The maximum number of search results to return in the response. You can limit any range between 1-100.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="sortBy"></param>
 		/// <param name="startIndex"></param>
 		/// <returns>
@@ -54,10 +55,10 @@ public partial class CustomerAccountClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the current login state of the customer account specified in the request.
+		/// 
 		/// </summary>
 		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Customer.LoginState"/>}
 		/// </returns>
@@ -79,10 +80,10 @@ public partial class CustomerAccountClient 	{
 		}
 
 		/// <summary>
-		/// Retrieve details of a customer account.
+		/// 
 		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="accountId">Unique identifier of the customer account to retrieve.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Customer.CustomerAccount"/>}
 		/// </returns>
@@ -104,10 +105,10 @@ public partial class CustomerAccountClient 	{
 		}
 
 		/// <summary>
-		/// Creates a new customer account based on the information specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="account">Properties of the customer account.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="account">Properties of the customer account to update.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Customer.CustomerAccount"/>}
 		/// </returns>
@@ -129,11 +130,11 @@ public partial class CustomerAccountClient 	{
 		}
 
 		/// <summary>
-		/// Modifies the password associated with a customer account.
+		/// 
 		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="unlockAccount">Specifies whether to unlock the specified customer account.</param>
-		/// <param name="passwordInfo">The information required to modify a shopper account password.</param>
+		/// <param name="accountId">The customer account information required to change the userpassword.</param>
+		/// <param name="unlockAccount"></param>
+		/// <param name="passwordInfo">The password information required to change the user password.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
@@ -155,11 +156,11 @@ public static MozuClient ChangePasswordClient(Mozu.Api.Contracts.Customer.Passwo
 		}
 
 		/// <summary>
-		/// Adds a new user login to a defined customer account.
+		/// 
 		/// </summary>
 		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="customerAuthInfo">The login information for a customer account.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="customerAuthInfo">The authentication information for the customer account.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Customer.CustomerAuthTicket"/>}
 		/// </returns>
@@ -181,9 +182,9 @@ public static MozuClient ChangePasswordClient(Mozu.Api.Contracts.Customer.Passwo
 		}
 
 		/// <summary>
-		/// Updates the customer lifetime value of the specified customer account in the event of an order import or a lifetime value calculation error.
+		/// 
 		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
+		/// <param name="accountId">The unique identifier of the customer account for which to calculate customer lifetime value.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
@@ -205,9 +206,9 @@ public static MozuClient RecomputeCustomerLifetimeValueClient(int accountId)
 		}
 
 		/// <summary>
-		/// Lock or unlock a customer account.
+		/// 
 		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
+		/// <param name="accountId">The unique identifier of the customer account.</param>
 		/// <param name="isLocked">If true, the customer account is locked from logging in.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
@@ -230,7 +231,7 @@ public static MozuClient SetLoginLockedClient(bool isLocked, int accountId)
 		}
 
 		/// <summary>
-		/// Requires the password for the customer account to be changed.
+		/// 
 		/// </summary>
 		/// <param name="accountId">Unique identifier of the customer account.</param>
 		/// <param name="isPasswordChangeRequired">If true, the password for the customer account must be changed.</param>
@@ -255,10 +256,10 @@ public static MozuClient SetPasswordChangeRequiredClient(bool isPasswordChangeRe
 		}
 
 		/// <summary>
-		/// Creates a new customer account and logs the user associated with the customer account into the site.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="accountAndAuthInfo">The authentication information associated with a customer account. The data includes the account properties such as the name, username, authorization access, and email address, the required password to match, and indicates if the account was imported from a third party resource. </param>
+		/// <param name="responseFields"></param>
+		/// <param name="accountAndAuthInfo">Properties of the customer account to create, including the user authentication information.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Customer.CustomerAuthTicket"/>}
 		/// </returns>
@@ -280,10 +281,10 @@ public static MozuClient SetPasswordChangeRequiredClient(bool isPasswordChangeRe
 		}
 
 		/// <summary>
-		/// Creates multiple customer accounts based on the information specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="customers">The authentication information associated with a customer account. The data includes the account properties such as the name, username, authorization access, and email address, the required password to match, and indicates if the account was imported from a third party resource. </param>
+		/// <param name="responseFields"></param>
+		/// <param name="customers">Properties of the customer accounts to create.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Customer.CustomerAccountCollection"/>}
 		/// </returns>
@@ -305,10 +306,10 @@ public static MozuClient SetPasswordChangeRequiredClient(bool isPasswordChangeRe
 		}
 
 		/// <summary>
-		/// Changes a collection of customer account passwords.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="accountPasswordInfos">The details of the changed customer account passwords.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="accountPasswordInfos"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Customer.ChangePasswordResultCollection"/>}
 		/// </returns>
@@ -330,11 +331,11 @@ public static MozuClient SetPasswordChangeRequiredClient(bool isPasswordChangeRe
 		}
 
 		/// <summary>
-		/// Retrieves the current login state of a customer account by providing the customer's email address.
+		/// 
 		/// </summary>
-		/// <param name="customerSetCode">The unique idenfitier of the customer set.</param>
+		/// <param name="customerSetCode"></param>
 		/// <param name="emailAddress">The email address associated with the customer account.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Customer.LoginState"/>}
 		/// </returns>
@@ -356,10 +357,10 @@ public static MozuClient SetPasswordChangeRequiredClient(bool isPasswordChangeRe
 		}
 
 		/// <summary>
-		/// Retrieves the current login state of a customer account by providing the user name associated with the customer account.
+		/// 
 		/// </summary>
-		/// <param name="customerSetCode">The unique idenfitier of the customer set.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="customerSetCode"></param>
+		/// <param name="responseFields"></param>
 		/// <param name="userName">The user name associated with the customer account.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Customer.LoginState"/>}
@@ -382,12 +383,12 @@ public static MozuClient SetPasswordChangeRequiredClient(bool isPasswordChangeRe
 		}
 
 		/// <summary>
-		/// Retrieves a list of customer purchase order accounts according to according to any specified sort options.
+		/// 
 		/// </summary>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Customer.CustomerPurchaseOrderAccountCollection"/>}
 		/// </returns>
@@ -409,7 +410,7 @@ public static MozuClient SetPasswordChangeRequiredClient(bool isPasswordChangeRe
 		}
 
 		/// <summary>
-		/// Resets the password for a customer account.
+		/// 
 		/// </summary>
 		/// <param name="resetPasswordInfo">Information required to reset the password for a customer account.</param>
 		/// <returns>
@@ -433,11 +434,11 @@ public static MozuClient ResetPasswordClient(Mozu.Api.Contracts.Customer.ResetPa
 		}
 
 		/// <summary>
-		/// Updates a customer account.
+		/// 
 		/// </summary>
 		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="account">Properties of the customer account.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="account">Properties of the customer account to update.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Customer.CustomerAccount"/>}
 		/// </returns>
@@ -459,9 +460,9 @@ public static MozuClient ResetPasswordClient(Mozu.Api.Contracts.Customer.ResetPa
 		}
 
 		/// <summary>
-		/// Deletes a customer account. A customer account cannot be deleted if any orders exist, past or present.
+		/// 
 		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
+		/// <param name="accountId">Unique identifier of the customer account to delete.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Customer/CustomerAuthTicketClient.cs b/Mozu.Api/Clients/Commerce/Customer/CustomerAuthTicketClient.cs
old mode 100644
new mode 100755
index 42be3d4c..b0a3440b
--- a/Mozu.Api/Clients/Commerce/Customer/CustomerAuthTicketClient.cs
+++ b/Mozu.Api/Clients/Commerce/Customer/CustomerAuthTicketClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Customer
 {
@@ -22,9 +23,9 @@ namespace Mozu.Api.Clients.Commerce.Customer
 	public partial class CustomerAuthTicketClient 	{
 		
 		/// <summary>
-		/// Creates an authentication ticket for an anonymous shopper user.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Customer.CustomerAuthTicket"/>}
 		/// </returns>
@@ -46,10 +47,10 @@ public partial class CustomerAuthTicketClient 	{
 		}
 
 		/// <summary>
-		/// Generates a new authentication ticket for a customer account.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="userAuthInfo">The authentication information required to generate an authentication ticket for a customer account.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="userAuthInfo">The authentication information required to generate an authetication ticket for a user, which consists of a user name and password.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Customer.CustomerAuthTicket"/>}
 		/// </returns>
@@ -71,10 +72,10 @@ public partial class CustomerAuthTicketClient 	{
 		}
 
 		/// <summary>
-		/// Refreshes an existing authentication ticket for a customer account by providing the refresh token string.
+		/// 
 		/// </summary>
-		/// <param name="refreshToken">Alphanumeric string used for access tokens. This token refreshes access for accounts by generating a new developer or application account authentication ticket after an access token expires.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="refreshToken">The refresh token string required to refresh a user's authentication ticket.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Customer.CustomerAuthTicket"/>}
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Customer/CustomerSegmentClient.cs b/Mozu.Api/Clients/Commerce/Customer/CustomerSegmentClient.cs
old mode 100644
new mode 100755
index ecae2b80..74a0eb42
--- a/Mozu.Api/Clients/Commerce/Customer/CustomerSegmentClient.cs
+++ b/Mozu.Api/Clients/Commerce/Customer/CustomerSegmentClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Customer
 {
@@ -22,13 +23,13 @@ namespace Mozu.Api.Clients.Commerce.Customer
 	public partial class CustomerSegmentClient 	{
 		
 		/// <summary>
-		/// Retrieves a list of defined customer segments according to any filter and sort criteria.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Customer.CustomerSegmentCollection"/>}
 		/// </returns>
@@ -50,10 +51,10 @@ public partial class CustomerSegmentClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the details of the customer segment specified in the request. This operation does not return a list of the customer accounts associated with the segment.
+		/// 
 		/// </summary>
 		/// <param name="id">Unique identifier of the customer segment to retrieve.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Customer.CustomerSegment"/>}
 		/// </returns>
@@ -75,10 +76,10 @@ public partial class CustomerSegmentClient 	{
 		}
 
 		/// <summary>
-		/// Creates a new customer segments. New customer segments do not have any associated customer accounts.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="segment">The Customer Segment object includes properties of a defined customer segment used to group customer accounts.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="segment">Properties of the customer segment to add.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Customer.CustomerSegment"/>}
 		/// </returns>
@@ -100,9 +101,9 @@ public partial class CustomerSegmentClient 	{
 		}
 
 		/// <summary>
-		/// Adds one or more customer accounts to a defined customer segment.
+		/// 
 		/// </summary>
-		/// <param name="id">Unique identifier of the customer segment to retrieve.</param>
+		/// <param name="id">Unique identifier of the customer segment for which to add the associated customer accounts.</param>
 		/// <param name="accountIds">List of customer account IDs to add to the customer segment specified in the request.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
@@ -125,11 +126,11 @@ public static MozuClient AddSegmentAccountsClient(List<int> accountIds, int id)
 		}
 
 		/// <summary>
-		/// Updates the details of the customer segment specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="id">Unique identifier of the customer segment to retrieve.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="segment">The Customer Segment object includes properties of a defined customer segment used to group customer accounts.</param>
+		/// <param name="id">Unique identifier of the customer segment.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="segment">Properties of the customer segment to update.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Customer.CustomerSegment"/>}
 		/// </returns>
@@ -151,9 +152,9 @@ public static MozuClient AddSegmentAccountsClient(List<int> accountIds, int id)
 		}
 
 		/// <summary>
-		/// Deletes a customer segment specified by its unique identifier. Deleting a segment removes any customer account associations, but does not delete the customer account itself.
+		/// 
 		/// </summary>
-		/// <param name="id">Unique identifier of the customer segment to retrieve.</param>
+		/// <param name="id">Unique identifier of the customer segment to delete.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
@@ -175,10 +176,10 @@ public static MozuClient DeleteSegmentClient(int id)
 		}
 
 		/// <summary>
-		/// Removes single account from a segment.
+		/// 
 		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="id">Unique identifier of the customer segment to retrieve.</param>
+		/// <param name="accountId"></param>
+		/// <param name="id"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Customer/CustomerSetClient.cs b/Mozu.Api/Clients/Commerce/Customer/CustomerSetClient.cs
old mode 100644
new mode 100755
index cf6fa267..6fd98af7
--- a/Mozu.Api/Clients/Commerce/Customer/CustomerSetClient.cs
+++ b/Mozu.Api/Clients/Commerce/Customer/CustomerSetClient.cs
@@ -13,21 +13,22 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Customer
 {
 	/// <summary>
-	/// Use the Customer Sets resource to manage your customer sets. You can use customer sets to control the specific sites your customers can access using the same login credentials, as well as what customer My Account information is shared between sites.Refer to [Customer Sets](../../../guides/settings/customer-sets.htm) in the Guides section for more information.
+	/// 
 	/// </summary>
 	public partial class CustomerSetClient 	{
 		
 		/// <summary>
-		/// Retrieves a collection of customer sets according to any specified filter criteria.
+		/// 
 		/// </summary>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Customer.CustomerSetCollection"/>}
 		/// </returns>
@@ -49,10 +50,10 @@ public partial class CustomerSetClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the details of the specified customer set.
+		/// 
 		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="code"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Customer.CustomerSet"/>}
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Customer/VisitClient.cs b/Mozu.Api/Clients/Commerce/Customer/VisitClient.cs
old mode 100644
new mode 100755
index 6c5b4849..50b23c66
--- a/Mozu.Api/Clients/Commerce/Customer/VisitClient.cs
+++ b/Mozu.Api/Clients/Commerce/Customer/VisitClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Customer
 {
@@ -22,13 +23,13 @@ namespace Mozu.Api.Clients.Commerce.Customer
 	public partial class VisitClient 	{
 		
 		/// <summary>
-		/// Retrieves a list of customer visits according to any filter or sort criteria specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Customer.VisitCollection"/>}
 		/// </returns>
@@ -50,10 +51,10 @@ public partial class VisitClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the details of the customer visit specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="visitId">Unique identifier of the customer visit to update.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="visitId">Unique identifier of the customer visit to retrieve.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Customer.Visit"/>}
 		/// </returns>
@@ -75,10 +76,10 @@ public partial class VisitClient 	{
 		}
 
 		/// <summary>
-		/// Creates a new visit for the customer account specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="visit">Properties of a customer visit to one of a company's sites.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="visit">Properties of the visit to add to the customer account.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Customer.Visit"/>}
 		/// </returns>
@@ -100,11 +101,11 @@ public partial class VisitClient 	{
 		}
 
 		/// <summary>
-		/// Updates one or more properties of a defined customer visit.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="visitId">Unique identifier of the customer visit to update.</param>
-		/// <param name="visit">Properties of a customer visit to one of a company's sites.</param>
+		/// <param name="visit">Properties of the customer visit to update.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Customer.Visit"/>}
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/InStockNotificationSubscriptionClient.cs b/Mozu.Api/Clients/Commerce/InStockNotificationSubscriptionClient.cs
old mode 100644
new mode 100755
index b83a27a4..7ae73da4
--- a/Mozu.Api/Clients/Commerce/InStockNotificationSubscriptionClient.cs
+++ b/Mozu.Api/Clients/Commerce/InStockNotificationSubscriptionClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce
 {
@@ -22,13 +23,13 @@ namespace Mozu.Api.Clients.Commerce
 	public partial class InStockNotificationSubscriptionClient 	{
 		
 		/// <summary>
-		/// Retrieves a list of in-stock notification subscriptions.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Customer.InStockNotificationSubscriptionCollection"/>}
 		/// </returns>
@@ -50,10 +51,10 @@ public partial class InStockNotificationSubscriptionClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the details of a subscription that sends a push notification when a product is available in a site's active stock.
+		/// 
 		/// </summary>
-		/// <param name="id">Unique identifier of the customer segment to retrieve.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="id">Unique identifier of the in-stock notification subscription to retrieve.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Customer.InStockNotificationSubscription"/>}
 		/// </returns>
@@ -75,10 +76,10 @@ public partial class InStockNotificationSubscriptionClient 	{
 		}
 
 		/// <summary>
-		/// Creates a new subscription that notifies the customer when the product specified in the request is available in the active inventory of the defined location.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="inStockNotificationSubscription">Properties of a push notification to which the shopper subscribes. This notification sends the shopper an alert when a new product or a product previously out of stock becomes available in the specified location's active product inventory.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="inStockNotificationSubscription">Properties of a subscription that sends the customer a notification when a product is available in a site's active stock.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Customer.InStockNotificationSubscription"/>}
 		/// </returns>
@@ -100,9 +101,9 @@ public partial class InStockNotificationSubscriptionClient 	{
 		}
 
 		/// <summary>
-		/// Deletes a subscription for a customer in-stock notification.
+		/// 
 		/// </summary>
-		/// <param name="id">Unique identifier of the customer segment to retrieve.</param>
+		/// <param name="id">Unique identifier of the customer in-stock notification subscription to delete.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/LocationClient.cs b/Mozu.Api/Clients/Commerce/LocationClient.cs
old mode 100644
new mode 100755
index 0ce988a0..bd7fa82c
--- a/Mozu.Api/Clients/Commerce/LocationClient.cs
+++ b/Mozu.Api/Clients/Commerce/LocationClient.cs
@@ -13,31 +13,33 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce
 {
 	/// <summary>
-	/// Use the Location resource to retrieve details about a location from a  hosted storefront.
+	/// Use the Location resource to retrieve details about a location from a Mozu hosted storefront.
 	/// </summary>
 	public partial class LocationClient 	{
 		
 		/// <summary>
-		/// Retrieves the details of the location specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="includeAttributeDefinition"></param>
+		/// <param name="locationCode"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Location.Location"/>}
 		/// </returns>
 		/// <example>
 		/// <code>
-		///   var mozuClient=GetLocation( code,  responseFields);
+		///   var mozuClient=GetLocation( locationCode,  includeAttributeDefinition,  responseFields);
 		///   var locationClient = mozuClient.WithBaseAddress(url).Execute().Result();
 		/// </code>
 		/// </example>
-		public static MozuClient<Mozu.Api.Contracts.Location.Location> GetLocationClient(string code, string responseFields =  null)
+		public static MozuClient<Mozu.Api.Contracts.Location.Location> GetLocationClient(string locationCode, bool? includeAttributeDefinition =  null, string responseFields =  null)
 		{
-			var url = Mozu.Api.Urls.Commerce.LocationUrl.GetLocationUrl(code, responseFields);
+			var url = Mozu.Api.Urls.Commerce.LocationUrl.GetLocationUrl(locationCode, includeAttributeDefinition, responseFields);
 			const string verb = "GET";
 			var mozuClient = new MozuClient<Mozu.Api.Contracts.Location.Location>()
 									.WithVerb(verb).WithResourceUrl(url)
@@ -47,26 +49,27 @@ public partial class LocationClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves a list of the locations configured for a specified location usage type for the specified site, according to any defined filter or sort criteria.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
+		/// <param name="filter"></param>
+		/// <param name="includeAttributeDefinition"></param>
 		/// <param name="locationUsageType">System-defined location usage type code, which is DS for direct ship, SP for in-store pickup, or storeFinder.</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Location.LocationCollection"/>}
 		/// </returns>
 		/// <example>
 		/// <code>
-		///   var mozuClient=GetLocationsInUsageType( locationUsageType,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
+		///   var mozuClient=GetLocationsInUsageType( locationUsageType,  startIndex,  pageSize,  sortBy,  filter,  includeAttributeDefinition,  responseFields);
 		///   var locationCollectionClient = mozuClient.WithBaseAddress(url).Execute().Result();
 		/// </code>
 		/// </example>
-		public static MozuClient<Mozu.Api.Contracts.Location.LocationCollection> GetLocationsInUsageTypeClient(string locationUsageType, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
+		public static MozuClient<Mozu.Api.Contracts.Location.LocationCollection> GetLocationsInUsageTypeClient(string locationUsageType, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, bool? includeAttributeDefinition =  null, string responseFields =  null)
 		{
-			var url = Mozu.Api.Urls.Commerce.LocationUrl.GetLocationsInUsageTypeUrl(locationUsageType, startIndex, pageSize, sortBy, filter, responseFields);
+			var url = Mozu.Api.Urls.Commerce.LocationUrl.GetLocationsInUsageTypeUrl(locationUsageType, startIndex, pageSize, sortBy, filter, includeAttributeDefinition, responseFields);
 			const string verb = "GET";
 			var mozuClient = new MozuClient<Mozu.Api.Contracts.Location.LocationCollection>()
 									.WithVerb(verb).WithResourceUrl(url)
@@ -76,21 +79,22 @@ public partial class LocationClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the details of the location configured for the direct shipping (DS) location usage type for the site specified in the request. This location acts as an origin address from which order packages will ship, as well as the location where product reservations are created when order items are submitted with the direct ship fulfillment type (DS). If the direct ship location usage type is not configured for this site, the operation returns an error.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="includeAttributeDefinition"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Location.Location"/>}
 		/// </returns>
 		/// <example>
 		/// <code>
-		///   var mozuClient=GetDirectShipLocation( responseFields);
+		///   var mozuClient=GetDirectShipLocation( includeAttributeDefinition,  responseFields);
 		///   var locationClient = mozuClient.WithBaseAddress(url).Execute().Result();
 		/// </code>
 		/// </example>
-		public static MozuClient<Mozu.Api.Contracts.Location.Location> GetDirectShipLocationClient(string responseFields =  null)
+		public static MozuClient<Mozu.Api.Contracts.Location.Location> GetDirectShipLocationClient(bool? includeAttributeDefinition =  null, string responseFields =  null)
 		{
-			var url = Mozu.Api.Urls.Commerce.LocationUrl.GetDirectShipLocationUrl(responseFields);
+			var url = Mozu.Api.Urls.Commerce.LocationUrl.GetDirectShipLocationUrl(includeAttributeDefinition, responseFields);
 			const string verb = "GET";
 			var mozuClient = new MozuClient<Mozu.Api.Contracts.Location.Location>()
 									.WithVerb(verb).WithResourceUrl(url)
@@ -100,22 +104,23 @@ public partial class LocationClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the details of the location configured for the in-store pickup (SP) location usage type for the site specified in the request. If the location is not associated with a location type configured for the in-store pickup location usage type (SP), the operation returns an error.
+		/// 
 		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="includeAttributeDefinition"></param>
+		/// <param name="locationCode"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Location.Location"/>}
 		/// </returns>
 		/// <example>
 		/// <code>
-		///   var mozuClient=GetInStorePickupLocation( code,  responseFields);
+		///   var mozuClient=GetInStorePickupLocation( locationCode,  includeAttributeDefinition,  responseFields);
 		///   var locationClient = mozuClient.WithBaseAddress(url).Execute().Result();
 		/// </code>
 		/// </example>
-		public static MozuClient<Mozu.Api.Contracts.Location.Location> GetInStorePickupLocationClient(string code, string responseFields =  null)
+		public static MozuClient<Mozu.Api.Contracts.Location.Location> GetInStorePickupLocationClient(string locationCode, bool? includeAttributeDefinition =  null, string responseFields =  null)
 		{
-			var url = Mozu.Api.Urls.Commerce.LocationUrl.GetInStorePickupLocationUrl(code, responseFields);
+			var url = Mozu.Api.Urls.Commerce.LocationUrl.GetInStorePickupLocationUrl(locationCode, includeAttributeDefinition, responseFields);
 			const string verb = "GET";
 			var mozuClient = new MozuClient<Mozu.Api.Contracts.Location.Location>()
 									.WithVerb(verb).WithResourceUrl(url)
@@ -125,25 +130,26 @@ public partial class LocationClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves a list of locations valid for in-store pickup of an item in an order according to any filter and sort criteria. For example, an application could use this operation to provide a store finder feature based on the shopper's GPS coordinates. If the location types for the in-store pickup location usage type are not configured for the site, this operation returns an error.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+		/// <param name="filter"></param>
+		/// <param name="includeAttributeDefinition"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Location.LocationCollection"/>}
 		/// </returns>
 		/// <example>
 		/// <code>
-		///   var mozuClient=GetInStorePickupLocations( startIndex,  pageSize,  sortBy,  filter,  responseFields);
+		///   var mozuClient=GetInStorePickupLocations( startIndex,  pageSize,  sortBy,  filter,  includeAttributeDefinition,  responseFields);
 		///   var locationCollectionClient = mozuClient.WithBaseAddress(url).Execute().Result();
 		/// </code>
 		/// </example>
-		public static MozuClient<Mozu.Api.Contracts.Location.LocationCollection> GetInStorePickupLocationsClient(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
+		public static MozuClient<Mozu.Api.Contracts.Location.LocationCollection> GetInStorePickupLocationsClient(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, bool? includeAttributeDefinition =  null, string responseFields =  null)
 		{
-			var url = Mozu.Api.Urls.Commerce.LocationUrl.GetInStorePickupLocationsUrl(startIndex, pageSize, sortBy, filter, responseFields);
+			var url = Mozu.Api.Urls.Commerce.LocationUrl.GetInStorePickupLocationsUrl(startIndex, pageSize, sortBy, filter, includeAttributeDefinition, responseFields);
 			const string verb = "GET";
 			var mozuClient = new MozuClient<Mozu.Api.Contracts.Location.LocationCollection>()
 									.WithVerb(verb).WithResourceUrl(url)
diff --git a/Mozu.Api/Clients/Commerce/OrderClient.cs b/Mozu.Api/Clients/Commerce/OrderClient.cs
old mode 100644
new mode 100755
index 9ff6fe89..e5881711
--- a/Mozu.Api/Clients/Commerce/OrderClient.cs
+++ b/Mozu.Api/Clients/Commerce/OrderClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce
 {
@@ -22,27 +23,28 @@ namespace Mozu.Api.Clients.Commerce
 	public partial class OrderClient 	{
 		
 		/// <summary>
-		/// Retrieves a list of orders according to any specified filter criteria and sort options.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="q">A list of order search terms (not phrases) to use in the query when searching across order number and the name or email of the billing contact. When entering, separate multiple search terms with a space character.</param>
+		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. You can filter an order's search results by any of its properties, including status, contact information, or total. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=Status+eq+Submitted"</param>
+		/// <param name="includeBin"></param>
+		/// <param name="pageSize">Used to page results from a query. Indicates the maximum number of entities to return from a query. Default value: 20. Max value: 200.</param>
+		/// <param name="q">A list of order search terms to use in the query when searching across order number and the name or email of the billing contact. Separate multiple search terms with a space character.</param>
 		/// <param name="qLimit">The maximum number of search results to return in the response. You can limit any range between 1-100.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy">The element to sort the results by and the order in which the results appear. Either ascending order (a-z) which accepts 'asc' or 'asc' or descending order (z-a) which accepts 'desc' or 'desc'. The sortBy parameter follows an available property. For examp</param>
 		/// <param name="startIndex"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.OrderCollection"/>}
 		/// </returns>
 		/// <example>
 		/// <code>
-		///   var mozuClient=GetOrders( startIndex,  pageSize,  sortBy,  filter,  q,  qLimit,  responseFields);
+		///   var mozuClient=GetOrders( startIndex,  pageSize,  sortBy,  filter,  q,  qLimit,  includeBin,  responseFields);
 		///   var orderCollectionClient = mozuClient.WithBaseAddress(url).Execute().Result();
 		/// </code>
 		/// </example>
-		public static MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderCollection> GetOrdersClient(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string q =  null, int? qLimit =  null, string responseFields =  null)
+		public static MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderCollection> GetOrdersClient(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string q =  null, int? qLimit =  null, bool? includeBin =  null, string responseFields =  null)
 		{
-			var url = Mozu.Api.Urls.Commerce.OrderUrl.GetOrdersUrl(startIndex, pageSize, sortBy, filter, q, qLimit, responseFields);
+			var url = Mozu.Api.Urls.Commerce.OrderUrl.GetOrdersUrl(startIndex, pageSize, sortBy, filter, q, qLimit, includeBin, responseFields);
 			const string verb = "GET";
 			var mozuClient = new MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderCollection>()
 									.WithVerb(verb).WithResourceUrl(url)
@@ -52,9 +54,9 @@ public partial class OrderClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the actions available to perform for an order based on its current status.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
+		/// <param name="orderId">Unique identifier of the available order actions to get.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{string}}
 		/// </returns>
@@ -76,9 +78,9 @@ public static MozuClient<List<string>> GetAvailableActionsClient(string orderId)
 		}
 
 		/// <summary>
-		/// Retrieves an order for the purpose of splitting it into multiple taxable orders in order to fulfill the order in multiple locations.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
+		/// <param name="orderId">Unique identifier of the order to retrieve.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.PricingRuntime.TaxableOrder"/>}}
 		/// </returns>
@@ -100,23 +102,24 @@ public static MozuClient<List<string>> GetAvailableActionsClient(string orderId)
 		}
 
 		/// <summary>
-		/// Retrieves the details of an order specified by the order ID.
+		/// 
 		/// </summary>
 		/// <param name="draft">If true, retrieve the draft version of the order, which might include uncommitted changes to the order or its components.</param>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="includeBin"></param>
+		/// <param name="orderId">Unique identifier of the order details to get.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>}
 		/// </returns>
 		/// <example>
 		/// <code>
-		///   var mozuClient=GetOrder( orderId,  draft,  responseFields);
+		///   var mozuClient=GetOrder( orderId,  draft,  includeBin,  responseFields);
 		///   var orderClient = mozuClient.WithBaseAddress(url).Execute().Result();
 		/// </code>
 		/// </example>
-		public static MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> GetOrderClient(string orderId, bool? draft =  null, string responseFields =  null)
+		public static MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> GetOrderClient(string orderId, bool? draft =  null, bool? includeBin =  null, string responseFields =  null)
 		{
-			var url = Mozu.Api.Urls.Commerce.OrderUrl.GetOrderUrl(orderId, draft, responseFields);
+			var url = Mozu.Api.Urls.Commerce.OrderUrl.GetOrderUrl(orderId, draft, includeBin, responseFields);
 			const string verb = "GET";
 			var mozuClient = new MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order>()
 									.WithVerb(verb).WithResourceUrl(url)
@@ -126,10 +129,10 @@ public static MozuClient<List<string>> GetAvailableActionsClient(string orderId)
 		}
 
 		/// <summary>
-		/// Creates a new order from an existing cart when the customer chooses to proceed to checkout.
+		/// 
 		/// </summary>
-		/// <param name="cartId">Identifier of the cart to delete.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="cartId">Unique identifier of the cart. This is the original cart ID expressed as a GUID.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>}
 		/// </returns>
@@ -151,10 +154,10 @@ public static MozuClient<List<string>> GetAvailableActionsClient(string orderId)
 		}
 
 		/// <summary>
-		/// Creates a new order for no-cart quick-ordering scenarios.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="order">Properties of an order, including its components.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="order">Properties of the order to create and submit.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>}
 		/// </returns>
@@ -176,10 +179,10 @@ public static MozuClient<List<string>> GetAvailableActionsClient(string orderId)
 		}
 
 		/// <summary>
-		/// Perform the specified action for an order. The actions you can perform depend on the current status of the order.
+		/// 
 		/// </summary>
 		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="action">The action to perform for the order.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>}
@@ -202,12 +205,39 @@ public static MozuClient<List<string>> GetAvailableActionsClient(string orderId)
 		}
 
 		/// <summary>
-		/// Processes a digital wallet (used to hold 3rd party payment and shipping information).
+		/// 
 		/// </summary>
-		/// <param name="digitalWalletType">The type of digital wallet to be processed.</param>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="digitalWallet">The details of the digitial wallet.</param>
+		/// <param name="couponCodeToApply"></param>
+		/// <param name="refreshShipping"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="order"></param>
+		/// <returns>
+		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>}
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var mozuClient=PriceOrder( order,  refreshShipping,  couponCodeToApply,  responseFields);
+		///   var orderClient = mozuClient.WithBaseAddress(url).Execute().Result();
+		/// </code>
+		/// </example>
+		public static MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> PriceOrderClient(Mozu.Api.Contracts.CommerceRuntime.Orders.Order order, bool refreshShipping, string couponCodeToApply =  null, string responseFields =  null)
+		{
+			var url = Mozu.Api.Urls.Commerce.OrderUrl.PriceOrderUrl(refreshShipping, couponCodeToApply, responseFields);
+			const string verb = "POST";
+			var mozuClient = new MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order>()
+									.WithVerb(verb).WithResourceUrl(url)
+									.WithBody<Mozu.Api.Contracts.CommerceRuntime.Orders.Order>(order);
+			return mozuClient;
+
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="digitalWalletType"></param>
+		/// <param name="orderId"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="digitalWallet"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>}
 		/// </returns>
@@ -229,14 +259,14 @@ public static MozuClient<List<string>> GetAvailableActionsClient(string orderId)
 		}
 
 		/// <summary>
-		/// Update the properties of a discount applied to an order.
+		/// 
 		/// </summary>
-		/// <param name="discountId">discountId parameter description DOCUMENT_HERE </param>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
-		/// <param name="discount">Properties of all applied discounts for an associated cart, order, or product. </param>
+		/// <param name="discountId">Unique identifier of the discount. System-supplied and read only.</param>
+		/// <param name="orderId">Unique identifier of the order discount. System-supplied and read only.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="updateMode">Specifies whether to modify the discount by updating the original order, updating the order in draft mode, or updating the order in draft mode and then committing the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
+		/// <param name="version"></param>
+		/// <param name="discount">Properties of the order discount to update.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>}
 		/// </returns>
@@ -258,10 +288,10 @@ public static MozuClient<List<string>> GetAvailableActionsClient(string orderId)
 		}
 
 		/// <summary>
-		/// Deletes the current draft version of the order, which also deletes any uncommitted changes made to the order in draft mode.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="version">Determines whether or not to check versioning of items for concurrency purposes.</param>
+		/// <param name="orderId">Unique identifier of the order associated with the draft to delete.</param>
+		/// <param name="version">If applicable, the version of the order draft to delete.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
@@ -283,10 +313,10 @@ public static MozuClient DeleteOrderDraftClient(string orderId, string version =
 		}
 
 		/// <summary>
-		/// Triggers an order confirmation email to be resent.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="action">The action to perform for the order.</param>
+		/// <param name="orderId"></param>
+		/// <param name="action"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
@@ -308,13 +338,13 @@ public static MozuClient ResendOrderConfirmationEmailClient(Mozu.Api.Contracts.C
 		}
 
 		/// <summary>
-		/// Changes the price list associated with an order. The desired price list code should be specified in the ApiContext.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">Determines whether or not to check versioning of items for concurrency purposes.</param>
-		/// <param name="priceListCode">The unique price list code.</param>
+		/// <param name="orderId"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="updateMode"></param>
+		/// <param name="version"></param>
+		/// <param name="priceListCode"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>}
 		/// </returns>
@@ -336,10 +366,10 @@ public static MozuClient ResendOrderConfirmationEmailClient(Mozu.Api.Contracts.C
 		}
 
 		/// <summary>
-		/// Updates the user ID of the shopper who placed the order to the current user.
+		/// 
 		/// </summary>
 		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>}
 		/// </returns>
@@ -361,13 +391,13 @@ public static MozuClient ResendOrderConfirmationEmailClient(Mozu.Api.Contracts.C
 		}
 
 		/// <summary>
-		/// Updates the specified order when additional order information, such as shipping or billing information, is modified during the checkout process.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="orderId">Unique identifier of the order to update.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
-		/// <param name="order">Properties of an order, including its components.</param>
+		/// <param name="version"></param>
+		/// <param name="order">The properties of the order to update.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>}
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Orders/AdjustmentClient.cs b/Mozu.Api/Clients/Commerce/Orders/AdjustmentClient.cs
old mode 100644
new mode 100755
index 5b14f087..b774d6b4
--- a/Mozu.Api/Clients/Commerce/Orders/AdjustmentClient.cs
+++ b/Mozu.Api/Clients/Commerce/Orders/AdjustmentClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Orders
 {
@@ -22,12 +23,12 @@ namespace Mozu.Api.Clients.Commerce.Orders
 	public partial class AdjustmentClient 	{
 		
 		/// <summary>
-		/// Updates the order handling adjustment.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">Determines whether or not to check versioning of items for concurrency purposes.</param>
+		/// <param name="orderId"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="updateMode"></param>
+		/// <param name="version"></param>
 		/// <param name="adjustment"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>}
@@ -50,13 +51,13 @@ public partial class AdjustmentClient 	{
 		}
 
 		/// <summary>
-		/// Applies a shipping adjustment to the specified order.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
-		/// <param name="adjustment">Properties of an ad-hoc price adjustment for an order.</param>
+		/// <param name="orderId">Unique identifier of the order associated with the shipping adjustment.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="updateMode">Specifies whether to apply the shipping adjustment by updating the original order, updating the order in draft mode, or updating the order in draft mode and then committing the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
+		/// <param name="version"></param>
+		/// <param name="adjustment">Properties of the shipping adjustment to apply to the order.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>}
 		/// </returns>
@@ -78,13 +79,13 @@ public partial class AdjustmentClient 	{
 		}
 
 		/// <summary>
-		/// Applies a price adjustment to the specified order.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
-		/// <param name="adjustment">Properties of an ad-hoc price adjustment for an order.</param>
+		/// <param name="orderId">Unique identifier of the order for which to apply the adjustment.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="updateMode">Specifies whether to apply the adjustment by updating the original order, updating the order in draft mode, or updating the order in draft mode and then committing the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
+		/// <param name="version"></param>
+		/// <param name="adjustment">Properties of the price adjustment to apply to the order.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>}
 		/// </returns>
@@ -106,11 +107,11 @@ public partial class AdjustmentClient 	{
 		}
 
 		/// <summary>
-		/// Removes an adjustment to the order handling fee.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">Determines whether or not to check versioning of items for concurrency purposes.</param>
+		/// <param name="orderId"></param>
+		/// <param name="updateMode"></param>
+		/// <param name="version"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>}
 		/// </returns>
@@ -132,11 +133,11 @@ public partial class AdjustmentClient 	{
 		}
 
 		/// <summary>
-		/// Removes a shipping adjustment previously applied to an order or draft.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
+		/// <param name="orderId">Unique identifier of the order with the applied shipping adjustment.</param>
+		/// <param name="updateMode">Specifies whether to remove the shipping adjustment by updating the original order, updating the order in draft mode, or updating the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
+		/// <param name="version"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>}
 		/// </returns>
@@ -158,11 +159,11 @@ public partial class AdjustmentClient 	{
 		}
 
 		/// <summary>
-		/// Removes a price adjustment from the specified order.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
+		/// <param name="orderId">Unique identifier of the order for which to delete the adjustment.</param>
+		/// <param name="updateMode">Specifies whether to remove the adjustment by updating the original order, updating the order in draft mode, or updating the order in draft mode and then committing the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
+		/// <param name="version"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>}
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Orders/AppliedDiscountClient.cs b/Mozu.Api/Clients/Commerce/Orders/AppliedDiscountClient.cs
old mode 100644
new mode 100755
index 9bb448b4..be12f042
--- a/Mozu.Api/Clients/Commerce/Orders/AppliedDiscountClient.cs
+++ b/Mozu.Api/Clients/Commerce/Orders/AppliedDiscountClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Orders
 {
@@ -22,13 +23,13 @@ namespace Mozu.Api.Clients.Commerce.Orders
 	public partial class AppliedDiscountClient 	{
 		
 		/// <summary>
-		/// Apply a coupon to the order.
+		/// 
 		/// </summary>
-		/// <param name="couponCode">Alphanumeric code associated with the coupon or promotion that results in a discounted price.</param>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
+		/// <param name="couponCode"></param>
+		/// <param name="orderId">Unique identifier of the order to associate the coupon. System-supplied and read-only.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="updateMode">Specifies whether to apply the coupon by updating the original order, updating the order in draft mode, or updating the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
+		/// <param name="version"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>}
 		/// </returns>
@@ -50,12 +51,12 @@ public partial class AppliedDiscountClient 	{
 		}
 
 		/// <summary>
-		/// Removes a coupon previously applied to the order.
+		/// 
 		/// </summary>
-		/// <param name="couponCode">Alphanumeric code associated with the coupon or promotion that results in a discounted price.</param>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
+		/// <param name="couponCode"></param>
+		/// <param name="orderId">Unique identifier of the order with the coupon to remove.</param>
+		/// <param name="updateMode">Specifies whether to remove the coupon by updating the original order, updating the order in draft mode, or updating the order in draft mode and then committing the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
+		/// <param name="version"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>}
 		/// </returns>
@@ -77,11 +78,11 @@ public partial class AppliedDiscountClient 	{
 		}
 
 		/// <summary>
-		/// Removes all coupons previously applied to the order.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
+		/// <param name="orderId">Unique identifier of the order with the coupons to remove.</param>
+		/// <param name="updateMode">Specifies whether to remove coupons by updating the original order, updating the order in draft mode, or updating the order in draft mode and then committing the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
+		/// <param name="version"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>}
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Orders/Attributedefinition/AttributeClient.cs b/Mozu.Api/Clients/Commerce/Orders/Attributedefinition/AttributeClient.cs
old mode 100644
new mode 100755
index 862affb6..3777be67
--- a/Mozu.Api/Clients/Commerce/Orders/Attributedefinition/AttributeClient.cs
+++ b/Mozu.Api/Clients/Commerce/Orders/Attributedefinition/AttributeClient.cs
@@ -13,24 +13,23 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Orders.Attributedefinition
 {
 	/// <summary>
-	/// Attributes are used to add custom definitions and characteristics to the following objects:
-
-
+	/// Use the Order Attribute Definition resource to manage the attributes that uniquely describe orders, such as the associated shopping season or "How did you hear about us?". Merchants can display order attributes on the order summary, the order confirmation page, invoices, or packing slips.
 	/// </summary>
 	public partial class AttributeClient 	{
 		
 		/// <summary>
-		/// Retrieves a paged list of attributes according to any specified filter criteria and sort options.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Core.Extensible.AttributeCollection"/>}
 		/// </returns>
@@ -52,9 +51,9 @@ public partial class AttributeClient 	{
 		}
 
 		/// <summary>
-		/// Retrieve a list of the vocabulary values defined for the customer attribute specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
+		/// <param name="attributeFQN"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.Core.Extensible.AttributeVocabularyValue"/>}}
 		/// </returns>
@@ -76,10 +75,10 @@ public partial class AttributeClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the details of the specified product attribute.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Core.Extensible.Attribute"/>}
 		/// </returns>
@@ -101,10 +100,10 @@ public partial class AttributeClient 	{
 		}
 
 		/// <summary>
-		/// Create and save a new attribute. These attributes are used in products and product options.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="attribute">Properties of an attribute used to describe customers or orders.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="attribute">The properties of the order attribute to create.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Core.Extensible.Attribute"/>}
 		/// </returns>
@@ -126,11 +125,11 @@ public partial class AttributeClient 	{
 		}
 
 		/// <summary>
-		/// Updates an existing attribute with attribute properties to set.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="attribute">Properties of an attribute used to describe customers or orders.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="attribute">The properties of the order attribute to update.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Core.Extensible.Attribute"/>}
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Orders/BillingInfoClient.cs b/Mozu.Api/Clients/Commerce/Orders/BillingInfoClient.cs
old mode 100644
new mode 100755
index 30fa53be..39327a8a
--- a/Mozu.Api/Clients/Commerce/Orders/BillingInfoClient.cs
+++ b/Mozu.Api/Clients/Commerce/Orders/BillingInfoClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Orders
 {
@@ -22,11 +23,11 @@ namespace Mozu.Api.Clients.Commerce.Orders
 	public partial class BillingInfoClient 	{
 		
 		/// <summary>
-		/// Retrieves the billing information associated with an order.
+		/// 
 		/// </summary>
-		/// <param name="draft">If true, retrieve the draft version of the order, which might include uncommitted changes to the order or its components.</param>
+		/// <param name="draft">If true, retrieve the draft version of the order billing information, which might include uncommitted changes.</param>
 		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Payments.BillingInfo"/>}
 		/// </returns>
@@ -48,13 +49,13 @@ public partial class BillingInfoClient 	{
 		}
 
 		/// <summary>
-		/// Updates the billing information supplied for an order.
+		/// 
 		/// </summary>
 		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
-		/// <param name="billingInfo">Properties of the billing information entered for an order during checkout.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="updateMode">Specifies whether to set the billing information by updating the original order, updating the order in draft mode, or updating the order in draft mode and then committing the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
+		/// <param name="version"></param>
+		/// <param name="billingInfo">The properties of the order billing information to update.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Payments.BillingInfo"/>}
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Orders/DigitalPackageClient.cs b/Mozu.Api/Clients/Commerce/Orders/DigitalPackageClient.cs
old mode 100644
new mode 100755
index 91187c27..04126ac7
--- a/Mozu.Api/Clients/Commerce/Orders/DigitalPackageClient.cs
+++ b/Mozu.Api/Clients/Commerce/Orders/DigitalPackageClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Orders
 {
@@ -22,10 +23,10 @@ namespace Mozu.Api.Clients.Commerce.Orders
 	public partial class DigitalPackageClient 	{
 		
 		/// <summary>
-		/// Retrieves a collection of fulfillment options for digital packages. Options may include emailed files/links or provided links. 
+		/// 
 		/// </summary>
 		/// <param name="digitalPackageId">This parameter supplies package ID to get fulfillment actions for the digital package.</param>
-		/// <param name="orderId">Unique identifier of the order.</param>
+		/// <param name="orderId">This parameter provides the unique identifier of the order on which to get a list of available actions.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{string}}
 		/// </returns>
@@ -47,11 +48,11 @@ public static MozuClient<List<string>> GetAvailableDigitalPackageFulfillmentActi
 		}
 
 		/// <summary>
-		/// This operation retreives a digital package within an order and it requires two parameters: orderId and digitalPackageId.
+		/// 
 		/// </summary>
-		/// <param name="digitalPackageId">This parameter supplies package ID to get fulfillment actions for the digital package.</param>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="digitalPackageId">This parameter provides the digital package Id.</param>
+		/// <param name="orderId">This parameter provides the unique identifier of the order with which to associate the digital package.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.DigitalPackage"/>}
 		/// </returns>
@@ -73,11 +74,11 @@ public static MozuClient<List<string>> GetAvailableDigitalPackageFulfillmentActi
 		}
 
 		/// <summary>
-		/// Lets you apply a digital package to the order using the orderId and digitalPackage parameters.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="digitalPackage">Lets you manage an order's digital packages, by applying a digital package to the order.</param>
+		/// <param name="orderId">The orderID is a required paramter for the digitalpackages operation. The orderId is a unique identifier of the order with which to associate the digital package.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="digitalPackage">The digitalPackage parameter is a required parameter for the CreateDigitalPackages operation. The digitalPackage is the digital package to create and add to the order.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.DigitalPackage"/>}
 		/// </returns>
@@ -99,12 +100,12 @@ public static MozuClient<List<string>> GetAvailableDigitalPackageFulfillmentActi
 		}
 
 		/// <summary>
-		/// This method operates on one digital package, specified by the id given. This method ensures that the digital package ID provided is in the order with the id given, and then updates the properties of that package with the properties of the one passed in using the ‘digitalpackage’ parameter.
+		/// 
 		/// </summary>
-		/// <param name="digitalPackageId">This parameter supplies package ID to get fulfillment actions for the digital package.</param>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="digitalPackage">Lets you manage an order's digital packages, by applying a digital package to the order.</param>
+		/// <param name="digitalPackageId">This parameter specifies the digital package to update in the order.</param>
+		/// <param name="orderId">This parameter provides the unique identifier of the order with which to associate the digital package.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="digitalPackage">This parameter provides the package content to update in the order.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.DigitalPackage"/>}
 		/// </returns>
@@ -126,10 +127,10 @@ public static MozuClient<List<string>> GetAvailableDigitalPackageFulfillmentActi
 		}
 
 		/// <summary>
-		/// This operation deletes a digital package from an order. This operation requires three parameters: orderId, digitalPackageId, and digitalPackage.
+		/// 
 		/// </summary>
-		/// <param name="digitalPackageId">This parameter supplies package ID to get fulfillment actions for the digital package.</param>
-		/// <param name="orderId">Unique identifier of the order.</param>
+		/// <param name="digitalPackageId">The digitalPackage ID is unique package ID to update on the order.</param>
+		/// <param name="orderId">The orderId is unique identifier of the order with which to associate the package.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Orders/ExtendedPropertyClient.cs b/Mozu.Api/Clients/Commerce/Orders/ExtendedPropertyClient.cs
old mode 100644
new mode 100755
index 01d783b8..920ca17d
--- a/Mozu.Api/Clients/Commerce/Orders/ExtendedPropertyClient.cs
+++ b/Mozu.Api/Clients/Commerce/Orders/ExtendedPropertyClient.cs
@@ -13,19 +13,20 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Orders
 {
 	/// <summary>
-	/// Use the Extended Properties resource to store tracking strings for your orders. Extended properties can help you track affiliate sources.
+	/// 
 	/// </summary>
 	public partial class ExtendedPropertyClient 	{
 		
 		/// <summary>
-		/// Retrieves the extended property string associated with the order. 
+		/// 
 		/// </summary>
-		/// <param name="draft">If true, retrieve the draft version of the order, which might include uncommitted changes to the order or its components.</param>
-		/// <param name="orderId">Unique identifier of the order.</param>
+		/// <param name="draft"></param>
+		/// <param name="orderId"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty"/>}}
 		/// </returns>
@@ -47,12 +48,12 @@ public partial class ExtendedPropertyClient 	{
 		}
 
 		/// <summary>
-		/// Creates an extended property for the order.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">Determines whether or not to check versioning of items for concurrency purposes.</param>
-		/// <param name="extendedProperties">The details of the extended property.</param>
+		/// <param name="orderId"></param>
+		/// <param name="updateMode"></param>
+		/// <param name="version"></param>
+		/// <param name="extendedProperties"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty"/>}}
 		/// </returns>
@@ -74,15 +75,15 @@ public partial class ExtendedPropertyClient 	{
 		}
 
 		/// <summary>
-		/// Updates one ore more extended properties.
+		/// 
 		/// </summary>
-		/// <param name="key">The extended property key.</param>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="upsert">Inserts and updates an extended property.        </param>
-		/// <param name="version">Determines whether or not to check versioning of items for concurrency purposes.</param>
-		/// <param name="extendedProperty">The details of the updated extended property.</param>
+		/// <param name="key"></param>
+		/// <param name="orderId"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="updateMode"></param>
+		/// <param name="upsert"></param>
+		/// <param name="version"></param>
+		/// <param name="extendedProperty"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty"/>}
 		/// </returns>
@@ -104,13 +105,13 @@ public partial class ExtendedPropertyClient 	{
 		}
 
 		/// <summary>
-		/// Updates one or more extended properties.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="upsert">Inserts and updates the extended property.        </param>
-		/// <param name="version">Determines whether or not to check versioning of items for concurrency purposes.</param>
-		/// <param name="extendedProperties">The details of the updated extended properties.</param>
+		/// <param name="orderId"></param>
+		/// <param name="updateMode"></param>
+		/// <param name="upsert"></param>
+		/// <param name="version"></param>
+		/// <param name="extendedProperties"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty"/>}}
 		/// </returns>
@@ -132,12 +133,12 @@ public partial class ExtendedPropertyClient 	{
 		}
 
 		/// <summary>
-		/// Deletes one or more extended properties.
+		/// 
 		/// </summary>
-		/// <param name="key">The extended property key.</param>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">Determines whether or not to check versioning of items for concurrency purposes.</param>
+		/// <param name="key"></param>
+		/// <param name="orderId"></param>
+		/// <param name="updateMode"></param>
+		/// <param name="version"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
@@ -159,12 +160,12 @@ public static MozuClient DeleteExtendedPropertyClient(string orderId, string key
 		}
 
 		/// <summary>
-		/// Deletes the extended property associated with the order. 
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">Determines whether or not to check versioning of items for concurrency purposes.</param>
-		/// <param name="keys">The extended property keys.</param>
+		/// <param name="orderId"></param>
+		/// <param name="updateMode"></param>
+		/// <param name="version"></param>
+		/// <param name="keys"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Orders/FulfillmentActionClient.cs b/Mozu.Api/Clients/Commerce/Orders/FulfillmentActionClient.cs
old mode 100644
new mode 100755
index 34c40613..79b3e3c9
--- a/Mozu.Api/Clients/Commerce/Orders/FulfillmentActionClient.cs
+++ b/Mozu.Api/Clients/Commerce/Orders/FulfillmentActionClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Orders
 {
@@ -22,11 +23,11 @@ namespace Mozu.Api.Clients.Commerce.Orders
 	public partial class FulfillmentActionClient 	{
 		
 		/// <summary>
-		/// Sets the fulfillment action to "Ship" or "PickUp". To ship an order or prepare it for in-store pickup, the order must have a customer name, the "Open" or "OpenAndProcessing" status. To ship the order, it must also have the full shipping address and shipping method. Shipping all packages or picking up all pickups for an order will complete a paid order.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="action">Properties of an action to perform when fulfilling an item in an order, whether through in-store pickup or direct shipping.</param>
+		/// <param name="orderId">Unique identifier of the order for which to perform the fulfillment action.</param>
+		/// <param name="responseFields">Updated order with a new fulfillment status resulting from the action supplied in the request.</param>
+		/// <param name="action">The action to perform for the order fulfillment.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>}
 		/// </returns>
@@ -48,11 +49,11 @@ public partial class FulfillmentActionClient 	{
 		}
 
 		/// <summary>
-		/// Resends an email with details about the package fulfillment to the shopper. 
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="action">Properties of an action to perform when fulfilling an item in an order, whether through in-store pickup or direct shipping.</param>
+		/// <param name="orderId"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="action"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>}
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Orders/FulfillmentInfoClient.cs b/Mozu.Api/Clients/Commerce/Orders/FulfillmentInfoClient.cs
old mode 100644
new mode 100755
index 08646098..8c74f7b9
--- a/Mozu.Api/Clients/Commerce/Orders/FulfillmentInfoClient.cs
+++ b/Mozu.Api/Clients/Commerce/Orders/FulfillmentInfoClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Orders
 {
@@ -22,11 +23,11 @@ namespace Mozu.Api.Clients.Commerce.Orders
 	public partial class FulfillmentInfoClient 	{
 		
 		/// <summary>
-		/// Retrieves a list of the fulfillment information for the specified order.
+		/// 
 		/// </summary>
-		/// <param name="draft">If true, retrieve the draft version of the order, which might include uncommitted changes to the order or its components.</param>
+		/// <param name="draft">If true, retrieve the draft version of the order's fulfillment information, which might include uncommitted changes.</param>
 		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.FulfillmentInfo"/>}
 		/// </returns>
@@ -48,13 +49,13 @@ public partial class FulfillmentInfoClient 	{
 		}
 
 		/// <summary>
-		/// Updates one or more properties of fulfillment information for the specified order.
+		/// 
 		/// </summary>
 		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
-		/// <param name="fulfillmentInfo">Properties of the information needed to fulfill an order, whether via in-store pickup or direct shipping.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="updateMode">Specifies whether to set the fulfillment information by updating the original order, updating the order in draft mode, or updating the order in draft mode and then committing the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
+		/// <param name="version"></param>
+		/// <param name="fulfillmentInfo">Array list of fulfillment information associated with an order.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.FulfillmentInfo"/>}
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Orders/OrderAttributeClient.cs b/Mozu.Api/Clients/Commerce/Orders/OrderAttributeClient.cs
old mode 100644
new mode 100755
index 066dfe51..f75b70af
--- a/Mozu.Api/Clients/Commerce/Orders/OrderAttributeClient.cs
+++ b/Mozu.Api/Clients/Commerce/Orders/OrderAttributeClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Orders
 {
@@ -22,9 +23,9 @@ namespace Mozu.Api.Clients.Commerce.Orders
 	public partial class OrderAttributeClient 	{
 		
 		/// <summary>
-		/// Retrieves a list of the attributes defined for the order specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
+		/// <param name="orderId">Unique identifier of the order for which to retrieve a list of defined attributes.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAttribute"/>}}
 		/// </returns>
@@ -46,10 +47,10 @@ public partial class OrderAttributeClient 	{
 		}
 
 		/// <summary>
-		/// Applies a list of attributes to the order specified in the request and defines a value for each attribute in the request body.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="orderAttributes">Properties of an attribute applied to an order.</param>
+		/// <param name="orderId">Unique identifier of the order for which to assign the attributes.</param>
+		/// <param name="orderAttributes">The list of attributes to associate with the order, and the properties of each attribute to define for the order.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAttribute"/>}}
 		/// </returns>
@@ -71,11 +72,11 @@ public partial class OrderAttributeClient 	{
 		}
 
 		/// <summary>
-		/// Updates one or more properties of an attribute defined for the order specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
+		/// <param name="orderId">Identifier of the order for which to update attributes.</param>
 		/// <param name="removeMissing">If true, the operation removes missing properties so that the updated order attributes will not show properties with a null value.</param>
-		/// <param name="orderAttributes">Properties of an attribute applied to an order.</param>
+		/// <param name="orderAttributes">List of order attributes to update, including the properties of each defined attribute in the list.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAttribute"/>}}
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Orders/OrderItemClient.cs b/Mozu.Api/Clients/Commerce/Orders/OrderItemClient.cs
old mode 100644
new mode 100755
index 09cc5b18..467b5bcf
--- a/Mozu.Api/Clients/Commerce/Orders/OrderItemClient.cs
+++ b/Mozu.Api/Clients/Commerce/Orders/OrderItemClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Orders
 {
@@ -22,12 +23,12 @@ namespace Mozu.Api.Clients.Commerce.Orders
 	public partial class OrderItemClient 	{
 		
 		/// <summary>
-		/// Retrieves an order item with the order line ID.
+		/// 
 		/// </summary>
-		/// <param name="draft">If true, retrieve the draft version of the order, which might include uncommitted changes to the order or its components.</param>
-		/// <param name="lineId">The specific line id that's associated with the order item.</param>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="draft"></param>
+		/// <param name="lineId"></param>
+		/// <param name="orderId"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.OrderItem"/>}
 		/// </returns>
@@ -49,12 +50,12 @@ public partial class OrderItemClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the details of a single order item.
+		/// 
 		/// </summary>
-		/// <param name="draft">If true, retrieve the draft version of the order, which might include uncommitted changes to the order or its components.</param>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="orderItemId">Unique identifier of the item to remove from the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="draft">If true, retrieve the draft version of this order item, which might include uncommitted changes to the order item, the order, or other order components.</param>
+		/// <param name="orderId">Unique identifier of the order item to retrieve.</param>
+		/// <param name="orderItemId">Unique identifier of the order item details to retrieve.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.OrderItem"/>}
 		/// </returns>
@@ -76,11 +77,11 @@ public partial class OrderItemClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the details of all items in an order.
+		/// 
 		/// </summary>
-		/// <param name="draft">If true, retrieve the draft version of the order, which might include uncommitted changes to the order or its components.</param>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="draft">If true, retrieve the draft version of the order's items, which might include uncommitted changes to one or more order items, the order itself, or other order components.</param>
+		/// <param name="orderId">Unique identifier of the order items to retrieve.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.OrderItemCollection"/>}
 		/// </returns>
@@ -102,14 +103,14 @@ public partial class OrderItemClient 	{
 		}
 
 		/// <summary>
-		/// Adds a new item to a defined order.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="skipInventoryCheck">If true, skip the process to validate inventory when creating this product reservation.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
-		/// <param name="orderItem">The details associated with a specific item in an order.</param>
+		/// <param name="orderId">Unique identifier of the order for which to add the item.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="skipInventoryCheck">If true, do not validate the product inventory when adding this item to the order.</param>
+		/// <param name="updateMode">Specifies whether to add the item by updating the original order, updating the order in draft mode, or updating the order in draft mode and then committing the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
+		/// <param name="version"></param>
+		/// <param name="orderItem">The properties of the item to create in the existing order.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>}
 		/// </returns>
@@ -131,15 +132,15 @@ public partial class OrderItemClient 	{
 		}
 
 		/// <summary>
-		/// Update the discount applied to an item in an order.
+		/// 
 		/// </summary>
-		/// <param name="discountId">discountId parameter description DOCUMENT_HERE </param>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="orderItemId">Unique identifier of the item to remove from the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
-		/// <param name="discount">Properties of all applied discounts for an associated cart, order, or product. </param>
+		/// <param name="discountId">Unique identifier of the discount. System-supplied and read only.</param>
+		/// <param name="orderId">Unique identifier of the order associated with the item discount.</param>
+		/// <param name="orderItemId">Unique identifier of the item in the order.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="updateMode">Specifies whether to change the item discount by updating the original order, updating the order in draft mode, or updating the order in draft mode and then committing the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
+		/// <param name="version"></param>
+		/// <param name="discount">Properties of the discount to modify for the order item.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>}
 		/// </returns>
@@ -161,14 +162,14 @@ public partial class OrderItemClient 	{
 		}
 
 		/// <summary>
-		/// Update the duty fee information for an order item.
+		/// 
 		/// </summary>
-		/// <param name="dutyAmount">The amount added to the order item for duty fees.        </param>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="orderItemId">Unique identifier of the item to remove from the order.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">Determines whether or not to check versioning of items for concurrency purposes.</param>
+		/// <param name="dutyAmount"></param>
+		/// <param name="orderId"></param>
+		/// <param name="orderItemId"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="updateMode"></param>
+		/// <param name="version"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>}
 		/// </returns>
@@ -190,14 +191,14 @@ public partial class OrderItemClient 	{
 		}
 
 		/// <summary>
-		/// Updates the item fulfillment information for the order specified in the request.
+		/// 
 		/// </summary>
 		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="orderItemId">Unique identifier of the item to remove from the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
-		/// <param name="orderItem">The details associated with a specific item in an order.</param>
+		/// <param name="orderItemId">Unique identifier of the item in the order.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="updateMode">Specifies whether to apply the coupon by updating the original order, updating the order in draft mode, or updating the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
+		/// <param name="version"></param>
+		/// <param name="orderItem">Properties of the order item to update for fulfillment.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>}
 		/// </returns>
@@ -219,14 +220,14 @@ public partial class OrderItemClient 	{
 		}
 
 		/// <summary>
-		/// Override the price of an individual product on a line item in the specified order.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="orderItemId">Unique identifier of the item to remove from the order.</param>
+		/// <param name="orderId">Unique identifier of the order containing the item to price override.</param>
+		/// <param name="orderItemId">Unique identifier of the item in the order to price override.</param>
 		/// <param name="price">The override price to specify for this item in the specified order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="updateMode">Specifies whether to change the product price by updating the original order, updating the order in draft mode, or updating the order in draft mode and then committing the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
+		/// <param name="version"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>}
 		/// </returns>
@@ -248,14 +249,14 @@ public partial class OrderItemClient 	{
 		}
 
 		/// <summary>
-		/// Update the quantity of an item in an order.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="orderItemId">Unique identifier of the item to remove from the order.</param>
-		/// <param name="quantity">The number of cart items in the shopper's active cart.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
+		/// <param name="orderId">Unique identifier of the order containing the item to update quantity.</param>
+		/// <param name="orderItemId">Unique identifier of the item in the order to update quantity.</param>
+		/// <param name="quantity">The quantity of the item in the order to update.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="updateMode">Specifies whether to change the item quantity by updating the original order, updating the order in draft mode, or updating the order in draft mode and then committing the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
+		/// <param name="version"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>}
 		/// </returns>
@@ -277,12 +278,12 @@ public partial class OrderItemClient 	{
 		}
 
 		/// <summary>
-		/// Removes a previously added item from a defined order.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
+		/// <param name="orderId">Unique identifier of the order with the item to remove.</param>
 		/// <param name="orderItemId">Unique identifier of the item to remove from the order.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
+		/// <param name="updateMode">Specifies whether to remove the item by updating the original order, updating the order in draft mode, or updating the order in draft mode and then committing the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
+		/// <param name="version"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>}
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Orders/OrderNoteClient.cs b/Mozu.Api/Clients/Commerce/Orders/OrderNoteClient.cs
old mode 100644
new mode 100755
index 426ba0b2..8e688cf7
--- a/Mozu.Api/Clients/Commerce/Orders/OrderNoteClient.cs
+++ b/Mozu.Api/Clients/Commerce/Orders/OrderNoteClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Orders
 {
@@ -22,7 +23,7 @@ namespace Mozu.Api.Clients.Commerce.Orders
 	public partial class OrderNoteClient 	{
 		
 		/// <summary>
-		/// Retrieves a list of all notes for an order.
+		/// 
 		/// </summary>
 		/// <param name="orderId">Unique identifier of the order.</param>
 		/// <returns>
@@ -46,11 +47,11 @@ public partial class OrderNoteClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the details of a specific order note.
+		/// 
 		/// </summary>
-		/// <param name="noteId">Unique identifier of a particular note to retrieve.</param>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="noteId">Unique identifier of the order note to retrieve.</param>
+		/// <param name="orderId">Unique identifier of the order associated with the note.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote"/>}
 		/// </returns>
@@ -72,11 +73,11 @@ public partial class OrderNoteClient 	{
 		}
 
 		/// <summary>
-		/// Creates a new merchant note for the specified order.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="orderNote">Properties of an order note for a merchant, which is internal only for administrative purposes and not available to the shopper.</param>
+		/// <param name="orderId">Unique identifier of the order for which to add a note.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="orderNote">The alphanumeric text contained in the note. The maximum length is 256 characters.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote"/>}
 		/// </returns>
@@ -98,12 +99,12 @@ public partial class OrderNoteClient 	{
 		}
 
 		/// <summary>
-		/// Updates a specific note for an order.
+		/// 
 		/// </summary>
-		/// <param name="noteId">Unique identifier of a particular note to retrieve.</param>
+		/// <param name="noteId">Unique identifier of the order note.</param>
 		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="orderNote">Properties of an order note for a merchant, which is internal only for administrative purposes and not available to the shopper.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="orderNote">The content of the order note. The maximum length is 256 characters.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote"/>}
 		/// </returns>
@@ -125,10 +126,10 @@ public partial class OrderNoteClient 	{
 		}
 
 		/// <summary>
-		/// Deletes the specified order note.
+		/// 
 		/// </summary>
-		/// <param name="noteId">Unique identifier of a particular note to retrieve.</param>
-		/// <param name="orderId">Unique identifier of the order.</param>
+		/// <param name="noteId">Unique identifier of the order note to delete.</param>
+		/// <param name="orderId">Unique identifier of the order associated with the note.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Orders/OrderReturnableItemClient.cs b/Mozu.Api/Clients/Commerce/Orders/OrderReturnableItemClient.cs
old mode 100644
new mode 100755
index 08e2aa50..e626a5b5
--- a/Mozu.Api/Clients/Commerce/Orders/OrderReturnableItemClient.cs
+++ b/Mozu.Api/Clients/Commerce/Orders/OrderReturnableItemClient.cs
@@ -13,22 +13,20 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Orders
 {
 	/// <summary>
-	/// Use this subresource to view which order items are eligible for return.
+	/// 
 	/// </summary>
 	public partial class OrderReturnableItemClient 	{
 		
 		/// <summary>
-		/// Retrieves information about which items are eligible for return on an order.Each item displays the following information:
-
-
-
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="orderId"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.OrderReturnableItemCollection"/>}
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Orders/OrderValidationResultClient.cs b/Mozu.Api/Clients/Commerce/Orders/OrderValidationResultClient.cs
old mode 100644
new mode 100755
index 98f1e964..03d15f25
--- a/Mozu.Api/Clients/Commerce/Orders/OrderValidationResultClient.cs
+++ b/Mozu.Api/Clients/Commerce/Orders/OrderValidationResultClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Orders
 {
@@ -22,7 +23,7 @@ namespace Mozu.Api.Clients.Commerce.Orders
 	public partial class OrderValidationResultClient 	{
 		
 		/// <summary>
-		/// Retrieves a list of the validation results associated with the order.
+		/// 
 		/// </summary>
 		/// <param name="orderId">Unique identifier of the order.</param>
 		/// <returns>
@@ -46,11 +47,11 @@ public partial class OrderValidationResultClient 	{
 		}
 
 		/// <summary>
-		/// Add a new order validation result to a submitted order.
+		/// 
 		/// </summary>
 		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="validationResult">Properties of the resulting order validation performed by an order validation capability.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="validationResult">Properties of the validation result to add for the order.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.OrderValidationResult"/>}
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Orders/PackageClient.cs b/Mozu.Api/Clients/Commerce/Orders/PackageClient.cs
old mode 100644
new mode 100755
index 2d61fbff..06770603
--- a/Mozu.Api/Clients/Commerce/Orders/PackageClient.cs
+++ b/Mozu.Api/Clients/Commerce/Orders/PackageClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Orders
 {
@@ -22,10 +23,10 @@ namespace Mozu.Api.Clients.Commerce.Orders
 	public partial class PackageClient 	{
 		
 		/// <summary>
-		/// Retrieves a list of the actions available to perform for a package associated with order fulfillment.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="packageId">Unique identifier of the package for which to retrieve the label.</param>
+		/// <param name="orderId">Unique identifier of the order associated with the package fulfillment.</param>
+		/// <param name="packageId">Unique identifier of the package associated with the fulfillment actions to retrieve.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{string}}
 		/// </returns>
@@ -47,9 +48,9 @@ public static MozuClient<List<string>> GetAvailablePackageFulfillmentActionsClie
 		}
 
 		/// <summary>
-		/// Retrieves the package label image supplied by the carrier.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
+		/// <param name="orderId">Unique identifier of the order associated with the package label to retrieve.</param>
 		/// <param name="packageId">Unique identifier of the package for which to retrieve the label.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="System.IO.Stream"/>}
@@ -72,11 +73,11 @@ public static MozuClient<List<string>> GetAvailablePackageFulfillmentActionsClie
 		}
 
 		/// <summary>
-		/// Retrieves the details of a package of order items.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="packageId">Unique identifier of the package for which to retrieve the label.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="orderId">Unique identifier of the order associated with the package to retrieve.</param>
+		/// <param name="packageId">Unique identifier of the package to retrieve.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package"/>}
 		/// </returns>
@@ -98,11 +99,11 @@ public static MozuClient<List<string>> GetAvailablePackageFulfillmentActionsClie
 		}
 
 		/// <summary>
-		/// Creates a new physical package of order items.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="package">Properties of a physical package shipped for an order.</param>
+		/// <param name="orderId">Unique identifier of the order associated with this package.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="package">Properties of the physical package of order items.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package"/>}
 		/// </returns>
@@ -124,12 +125,12 @@ public static MozuClient<List<string>> GetAvailablePackageFulfillmentActionsClie
 		}
 
 		/// <summary>
-		/// Updates one or more properties of a physical package of order items.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="packageId">Unique identifier of the package for which to retrieve the label.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="package">Properties of a physical package shipped for an order.</param>
+		/// <param name="orderId">Unique identifier of the order associated with the package to update.</param>
+		/// <param name="packageId">Unique identifier of the package of order items to update.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="package">Wrapper of properties for the package of order items to update.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package"/>}
 		/// </returns>
@@ -151,10 +152,10 @@ public static MozuClient<List<string>> GetAvailablePackageFulfillmentActionsClie
 		}
 
 		/// <summary>
-		/// Removes a physical package of items from the specified order.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="packageId">Unique identifier of the package for which to retrieve the label.</param>
+		/// <param name="orderId">Unique identifier of the order associated with the package to delete.</param>
+		/// <param name="packageId">Unique identifier of the package to delete.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Orders/PaymentClient.cs b/Mozu.Api/Clients/Commerce/Orders/PaymentClient.cs
old mode 100644
new mode 100755
index d40d3a88..7d39dd18
--- a/Mozu.Api/Clients/Commerce/Orders/PaymentClient.cs
+++ b/Mozu.Api/Clients/Commerce/Orders/PaymentClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Orders
 {
@@ -22,10 +23,10 @@ namespace Mozu.Api.Clients.Commerce.Orders
 	public partial class PaymentClient 	{
 		
 		/// <summary>
-		/// Retrieves information about all payment transactions submitted for the specified order.
+		/// 
 		/// </summary>
 		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Payments.PaymentCollection"/>}
 		/// </returns>
@@ -47,10 +48,10 @@ public partial class PaymentClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the list of all available payment actions dependent on the order payment status by specifying the order ID.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="paymentId">Unique identifier of the payment for which to perform the action.</param>
+		/// <param name="orderId">Unique identifier of the order associated with the payment.</param>
+		/// <param name="paymentId">Unique identifer of the payment for which to retrieve available actions.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{string}}
 		/// </returns>
@@ -72,11 +73,11 @@ public static MozuClient<List<string>> GetAvailablePaymentActionsClient(string o
 		}
 
 		/// <summary>
-		/// Retrieves information about a specific payment transaction submitted for the specified order.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="paymentId">Unique identifier of the payment for which to perform the action.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="orderId">Unique identifier of the order associated with the payment transaction.</param>
+		/// <param name="paymentId">Unique identifier of the payment transaction submitted for the order.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Payments.Payment"/>}
 		/// </returns>
@@ -98,12 +99,12 @@ public static MozuClient<List<string>> GetAvailablePaymentActionsClient(string o
 		}
 
 		/// <summary>
-		/// Performs the specified action for an individual order payment transaction.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="paymentId">Unique identifier of the payment for which to perform the action.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="action">Properties of the payment action performed for an order.</param>
+		/// <param name="orderId">Unique identifier of the order associated with the payment.</param>
+		/// <param name="paymentId">Unique identifer of the payment for which to perform the action.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="action">The action to perform for the payment. Possible values are AuthAndCapture, AuthorizePayment, CapturePayment, VoidPayment, CreditPayment, RequestCheck, ApplyCheck, DeclineCheck.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>}
 		/// </returns>
@@ -125,11 +126,11 @@ public static MozuClient<List<string>> GetAvailablePaymentActionsClient(string o
 		}
 
 		/// <summary>
-		/// Creates a new payment transaction for the specified order and performs the specified action.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="action">Properties of the payment action performed for an order.</param>
+		/// <param name="orderId">Unique identifier of the order for which to apply the payment.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="action">To action to perform for the newly created payment. Possible values are AuthAndCapture, AuthorizePayment, CapturePayment, VoidPayment, CreditPayment, RequestCheck, ApplyCheck, DeclineCheck.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>}
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Orders/PickupClient.cs b/Mozu.Api/Clients/Commerce/Orders/PickupClient.cs
old mode 100644
new mode 100755
index 5ef5b904..d26400e5
--- a/Mozu.Api/Clients/Commerce/Orders/PickupClient.cs
+++ b/Mozu.Api/Clients/Commerce/Orders/PickupClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Orders
 {
@@ -22,10 +23,10 @@ namespace Mozu.Api.Clients.Commerce.Orders
 	public partial class PickupClient 	{
 		
 		/// <summary>
-		/// Retrieves a list of the actions available to perform for the pickup specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="pickupId">Unique identifier of the pickup to remove.</param>
+		/// <param name="orderId">Unique identifier of the order associated with the pickup.</param>
+		/// <param name="pickupId">Unique identifier of the pickup for which to retrieve available actions.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{string}}
 		/// </returns>
@@ -47,11 +48,11 @@ public static MozuClient<List<string>> GetAvailablePickupFulfillmentActionsClien
 		}
 
 		/// <summary>
-		/// Retrieves the details of the in-store pickup specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="pickupId">Unique identifier of the pickup to remove.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="orderId">Unique identifier of the order associated with the pickup.</param>
+		/// <param name="pickupId">Unique identifier of the pickup to retrieve.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Pickup"/>}
 		/// </returns>
@@ -73,11 +74,11 @@ public static MozuClient<List<string>> GetAvailablePickupFulfillmentActionsClien
 		}
 
 		/// <summary>
-		/// Create a new pickup for the order specified in the request for in-store fufillment.
+		/// 
 		/// </summary>
 		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="pickup">Properties of an in-store pickup defined to fulfill items in an order.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="pickup">Properties of the in-store pickup to create.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Pickup"/>}
 		/// </returns>
@@ -99,12 +100,12 @@ public static MozuClient<List<string>> GetAvailablePickupFulfillmentActionsClien
 		}
 
 		/// <summary>
-		/// Updates one or more details of a defined in-store pickup.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="pickupId">Unique identifier of the pickup to remove.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="pickup">Properties of an in-store pickup defined to fulfill items in an order.</param>
+		/// <param name="orderId">Unique identifier of the order associated with the in-store pickup.</param>
+		/// <param name="pickupId">Unique identifier of the pickup to update.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="pickup">Properties of the in-store pickup to update.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Pickup"/>}
 		/// </returns>
@@ -126,9 +127,9 @@ public static MozuClient<List<string>> GetAvailablePickupFulfillmentActionsClien
 		}
 
 		/// <summary>
-		/// Removes a pickup previously defined for order item in-store pickup fulfillment.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
+		/// <param name="orderId">Unique identifier of the order associated with the pickup.</param>
 		/// <param name="pickupId">Unique identifier of the pickup to remove.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
diff --git a/Mozu.Api/Clients/Commerce/Orders/RefundClient.cs b/Mozu.Api/Clients/Commerce/Orders/RefundClient.cs
old mode 100644
new mode 100755
index 861f06d8..4931ee65
--- a/Mozu.Api/Clients/Commerce/Orders/RefundClient.cs
+++ b/Mozu.Api/Clients/Commerce/Orders/RefundClient.cs
@@ -13,20 +13,21 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Orders
 {
 	/// <summary>
-	/// Use the refunds resource to create a refund.
+	/// 
 	/// </summary>
 	public partial class RefundClient 	{
 		
 		/// <summary>
-		/// Creates a refund based on the information supplied in the request.  
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="refund">The details of the refund.</param>
+		/// <param name="orderId"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="refund"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Refunds.Refund"/>}
 		/// </returns>
@@ -48,10 +49,10 @@ public partial class RefundClient 	{
 		}
 
 		/// <summary>
-		/// Resends the order refund email previously sent to the shopper. 
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="refundId">Unique ID of the refund.        </param>
+		/// <param name="orderId"></param>
+		/// <param name="refundId"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Orders/ShipmentClient.cs b/Mozu.Api/Clients/Commerce/Orders/ShipmentClient.cs
old mode 100644
new mode 100755
index 0a2ca589..124fc651
--- a/Mozu.Api/Clients/Commerce/Orders/ShipmentClient.cs
+++ b/Mozu.Api/Clients/Commerce/Orders/ShipmentClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Orders
 {
@@ -22,10 +23,10 @@ namespace Mozu.Api.Clients.Commerce.Orders
 	public partial class ShipmentClient 	{
 		
 		/// <summary>
-		/// Retrieves the details of the order shipment specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="orderId">Unique identifier of the order associated with the shipment to retrieve.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="shipmentId">Unique identifier of the shipment to retrieve.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Shipment"/>}
@@ -48,10 +49,10 @@ public partial class ShipmentClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the available shipping methods applicable to the order. Typically used to display available shipping method options on the checkout page.
+		/// 
 		/// </summary>
-		/// <param name="draft">If true, retrieve the draft version of the order, which might include uncommitted changes to the order or its components.</param>
-		/// <param name="orderId">Unique identifier of the order.</param>
+		/// <param name="draft"></param>
+		/// <param name="orderId">Unique identifier of the order for the available shipment methods being retrieved.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.ShippingRate"/>}}
 		/// </returns>
@@ -73,9 +74,9 @@ public partial class ShipmentClient 	{
 		}
 
 		/// <summary>
-		/// Creates a shipment from one or more package associated with an order and assign a label and tracking number to an order shipment.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
+		/// <param name="orderId">Unique identifier of the order for this shipment.</param>
 		/// <param name="packageIds">List of unique identifiers for each package associated with this shipment. Not all packages must belong to the same shipment.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package"/>}}
@@ -98,10 +99,10 @@ public partial class ShipmentClient 	{
 		}
 
 		/// <summary>
-		/// Deletes the shipment specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="shipmentId">Unique identifier of the shipment to retrieve.</param>
+		/// <param name="orderId">Unique identifier of the order to cancel shipment.</param>
+		/// <param name="shipmentId">Unique identifier of the shipment to cancel.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Payments/FraudScreenClient.cs b/Mozu.Api/Clients/Commerce/Payments/FraudScreenClient.cs
old mode 100644
new mode 100755
index daf41acd..e477b3c0
--- a/Mozu.Api/Clients/Commerce/Payments/FraudScreenClient.cs
+++ b/Mozu.Api/Clients/Commerce/Payments/FraudScreenClient.cs
@@ -13,19 +13,20 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Payments
 {
 	/// <summary>
-	/// commerce/payments/fraudscreen related resources. DOCUMENT_HERE 
+	/// 
 	/// </summary>
 	public partial class FraudScreenClient 	{
 		
 		/// <summary>
-		/// payments-fraudscreen Post Screen description DOCUMENT_HERE 
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="request">Mozu.PaymentService.Contracts.Request.FraudScreenRequest ApiType DOCUMENT_HERE </param>
+		/// <param name="responseFields"></param>
+		/// <param name="request"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.PaymentService.Response.FraudScreen"/>}
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Payments/PublicCardClient.cs b/Mozu.Api/Clients/Commerce/Payments/PublicCardClient.cs
old mode 100644
new mode 100755
index c5364adc..ba2cffd6
--- a/Mozu.Api/Clients/Commerce/Payments/PublicCardClient.cs
+++ b/Mozu.Api/Clients/Commerce/Payments/PublicCardClient.cs
@@ -13,19 +13,20 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Payments
 {
 	/// <summary>
-	/// commerce/payments/cards related resources. DOCUMENT_HERE 
+	/// 
 	/// </summary>
 	public partial class PublicCardClient 	{
 		
 		/// <summary>
-		/// payments-cards Post Create description DOCUMENT_HERE 
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="request">Mozu.PaymentService.Contracts.PublicCard ApiType DOCUMENT_HERE </param>
+		/// <param name="responseFields"></param>
+		/// <param name="request"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.PaymentService.Response.SyncResponse"/>}
 		/// </returns>
@@ -47,11 +48,11 @@ public partial class PublicCardClient 	{
 		}
 
 		/// <summary>
-		/// payments-cards Put Update description DOCUMENT_HERE 
+		/// 
 		/// </summary>
-		/// <param name="cardId">Unique identifier of the card associated with the customer account billing contact.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="request">Mozu.PaymentService.Contracts.PublicCard ApiType DOCUMENT_HERE </param>
+		/// <param name="cardId"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="request"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.PaymentService.Response.SyncResponse"/>}
 		/// </returns>
@@ -73,9 +74,9 @@ public partial class PublicCardClient 	{
 		}
 
 		/// <summary>
-		/// payments-cards Delete Delete description DOCUMENT_HERE 
+		/// 
 		/// </summary>
-		/// <param name="cardId">Unique identifier of the card associated with the customer account billing contact.</param>
+		/// <param name="cardId"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/ReturnClient.cs b/Mozu.Api/Clients/Commerce/ReturnClient.cs
old mode 100644
new mode 100755
index 502539d3..4f0cf10e
--- a/Mozu.Api/Clients/Commerce/ReturnClient.cs
+++ b/Mozu.Api/Clients/Commerce/ReturnClient.cs
@@ -13,23 +13,24 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce
 {
 	/// <summary>
-	/// Use the Returns resource to manage returned items that were previously fufilled. Returns can include any number of items associated with an original  order. Each return must either be associated with an original order or a product definition to represent each returned item.Refer to the [Returns API](https://www.mozu.com/docs/developer/api-guides/returns.htm) topic for more information about creating and processing returns using the API.
+	/// Use the Returns resource to manage returned items that were previously fufilled. Returns can include any number of items associated with an original Mozu order. Each return must either be associated with an original order or a product definition to represent each returned item.
 	/// </summary>
 	public partial class ReturnClient 	{
 		
 		/// <summary>
-		/// Retrieves a list of all returns according to any filter and sort criteria.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="q">A list of order search terms (not phrases) to use in the query when searching across order number and the name or email of the billing contact. When entering, separate multiple search terms with a space character.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="q"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Returns.ReturnCollection"/>}
 		/// </returns>
@@ -51,9 +52,9 @@ public partial class ReturnClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves a list of the actions available to perform for the specified return based on its current state.
+		/// 
 		/// </summary>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
+		/// <param name="returnId">Unique identifier of the return for which to retrieve available actions.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{string}}
 		/// </returns>
@@ -75,11 +76,11 @@ public static MozuClient<List<string>> GetAvailableReturnActionsClient(string re
 		}
 
 		/// <summary>
-		/// Retrieves the details of a single return item.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
-		/// <param name="returnItemId">Unique identifier of the return item whose details you want to get.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="returnId"></param>
+		/// <param name="returnItemId"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Returns.ReturnItem"/>}
 		/// </returns>
@@ -101,10 +102,10 @@ public static MozuClient<List<string>> GetAvailableReturnActionsClient(string re
 		}
 
 		/// <summary>
-		/// Retrieves the details of all return items in an order.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="returnId"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Returns.ReturnItemCollection"/>}
 		/// </returns>
@@ -126,10 +127,10 @@ public static MozuClient<List<string>> GetAvailableReturnActionsClient(string re
 		}
 
 		/// <summary>
-		/// Retrieves a list of the payment actions available to perform for the specified return when a return results in a refund to the customer.
+		/// 
 		/// </summary>
 		/// <param name="paymentId">Unique identifier of the payment for which to perform the action.</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
+		/// <param name="returnId">Unique identifier of the return associated with the payment.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{string}}
 		/// </returns>
@@ -151,11 +152,11 @@ public static MozuClient<List<string>> GetAvailablePaymentActionsForReturnClient
 		}
 
 		/// <summary>
-		/// Retrieves the details of a payment submitted as part of a refund associated with a customer return.
+		/// 
 		/// </summary>
-		/// <param name="paymentId">Unique identifier of the payment for which to perform the action.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
+		/// <param name="paymentId">Unique identifier of the return payment to retrieve.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="returnId">Unique identifier of the return associated with the payment.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Payments.Payment"/>}
 		/// </returns>
@@ -177,10 +178,10 @@ public static MozuClient<List<string>> GetAvailablePaymentActionsForReturnClient
 		}
 
 		/// <summary>
-		/// Retrieves a list of all payments submitted as part of a refund associated with a customer return.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="returnId">Returns the details of the refund payment associated with the return specified in the request.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Payments.PaymentCollection"/>}
 		/// </returns>
@@ -202,10 +203,10 @@ public static MozuClient<List<string>> GetAvailablePaymentActionsForReturnClient
 		}
 
 		/// <summary>
-		/// Retrieves a list of properties for the specified return.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="returnId">Returns the properties of the return specified in the request as well as system-supplied information.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Returns.Return"/>}
 		/// </returns>
@@ -227,9 +228,9 @@ public static MozuClient<List<string>> GetAvailablePaymentActionsForReturnClient
 		}
 
 		/// <summary>
-		/// Returns a list of reasons for a return.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Returns.ReasonCollection"/>}
 		/// </returns>
@@ -251,13 +252,10 @@ public static MozuClient<List<string>> GetAvailablePaymentActionsForReturnClient
 		}
 
 		/// <summary>
-		/// Creates a return for previously fulfilled items. Each return must either be associated with an original order or a product definition to represent each returned item.When you create a return, you must specify the following fields:
-
-
-
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="ret">Properties of a return of one or more previously fulfilled items.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="ret">Wrapper for the properties of the return to create.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Returns.Return"/>}
 		/// </returns>
@@ -279,11 +277,11 @@ public static MozuClient<List<string>> GetAvailablePaymentActionsForReturnClient
 		}
 
 		/// <summary>
-		/// Adds a return item to the return.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
-		/// <param name="returnItem">Properties of a previously fulfilled item associated with a return.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="returnId"></param>
+		/// <param name="returnItem"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Returns.Return"/>}
 		/// </returns>
@@ -305,12 +303,12 @@ public static MozuClient<List<string>> GetAvailablePaymentActionsForReturnClient
 		}
 
 		/// <summary>
-		/// Updates a refund payment associated with a customer return by performing the specified action.
+		/// 
 		/// </summary>
-		/// <param name="paymentId">Unique identifier of the payment for which to perform the action.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
-		/// <param name="action">Properties of the payment action performed for an order.</param>
+		/// <param name="paymentId">Unique identifier of the return payment to update.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="returnId">Unique identifier of the return associated with the refund payment.</param>
+		/// <param name="action">The payment action to perform for the refund payment.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Returns.Return"/>}
 		/// </returns>
@@ -332,11 +330,11 @@ public static MozuClient<List<string>> GetAvailablePaymentActionsForReturnClient
 		}
 
 		/// <summary>
-		/// Creates a new payment for a return that results in a refund to the customer.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
-		/// <param name="action">Properties of the payment action performed for an order.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="returnId">Unique identifier of the return associated with the payment action.</param>
+		/// <param name="action">The payment action to perform for the customer return.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Returns.Return"/>}
 		/// </returns>
@@ -358,10 +356,10 @@ public static MozuClient<List<string>> GetAvailablePaymentActionsForReturnClient
 		}
 
 		/// <summary>
-		/// Creates a replacement order for the return.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="returnId"></param>
 		/// <param name="itemQuantities"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>}
@@ -384,10 +382,10 @@ public static MozuClient<List<string>> GetAvailablePaymentActionsForReturnClient
 		}
 
 		/// <summary>
-		/// Updates the return by performing the action specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="action">Properties of an action a user can perform for a return.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="action">The name of the return action to perform, such as "Reject" or "Authorize".</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Returns.ReturnCollection"/>}
 		/// </returns>
@@ -409,11 +407,11 @@ public static MozuClient<List<string>> GetAvailablePaymentActionsForReturnClient
 		}
 
 		/// <summary>
-		/// Updates one or more properties of a return for items previously shipped in a completed order.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
-		/// <param name="ret">Properties of a return of one or more previously fulfilled items.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="returnId">Unique identifier of the return.</param>
+		/// <param name="ret">Wrapper for the array of properties to update for the return.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Returns.Return"/>}
 		/// </returns>
@@ -435,9 +433,9 @@ public static MozuClient<List<string>> GetAvailablePaymentActionsForReturnClient
 		}
 
 		/// <summary>
-		/// Resend the email notification to a shopper that a return has been created.
+		/// 
 		/// </summary>
-		/// <param name="action">Properties of an action a user can perform for a return.</param>
+		/// <param name="action"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
@@ -459,10 +457,10 @@ public static MozuClient ResendReturnEmailClient(Mozu.Api.Contracts.CommerceRunt
 		}
 
 		/// <summary>
-		/// Removes a particular order item from the order of the current shopper.
+		/// 
 		/// </summary>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
-		/// <param name="returnItemId">Unique identifier of the return item whose details you want to get.</param>
+		/// <param name="returnId"></param>
+		/// <param name="returnItemId"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Returns.Return"/>}
 		/// </returns>
@@ -484,9 +482,9 @@ public static MozuClient ResendReturnEmailClient(Mozu.Api.Contracts.CommerceRunt
 		}
 
 		/// <summary>
-		/// Deletes the return specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
+		/// <param name="returnId">Unique identifier of the return to delete.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Returns/OrderNoteClient.cs b/Mozu.Api/Clients/Commerce/Returns/OrderNoteClient.cs
old mode 100644
new mode 100755
index bf4afca1..67a91c59
--- a/Mozu.Api/Clients/Commerce/Returns/OrderNoteClient.cs
+++ b/Mozu.Api/Clients/Commerce/Returns/OrderNoteClient.cs
@@ -13,18 +13,19 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Returns
 {
 	/// <summary>
-	/// Use the Return Notes resource to access and modify internal notes associated with returns. These notes can be useful to customer service representatives viewing them in .
+	/// 
 	/// </summary>
 	public partial class OrderNoteClient 	{
 		
 		/// <summary>
-		/// Retrieves all internal notes associated with a return.
+		/// 
 		/// </summary>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
+		/// <param name="returnId"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote"/>}}
 		/// </returns>
@@ -46,11 +47,11 @@ public partial class OrderNoteClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves a specific internal note from a return.
+		/// 
 		/// </summary>
-		/// <param name="noteId">Unique identifier of a particular note to retrieve.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
+		/// <param name="noteId"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="returnId"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote"/>}
 		/// </returns>
@@ -72,10 +73,10 @@ public partial class OrderNoteClient 	{
 		}
 
 		/// <summary>
-		/// Creates an internal note on a given return. This note is visible in  for customer service representatives to see.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="returnId"></param>
 		/// <param name="returnNote"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote"/>}
@@ -98,11 +99,11 @@ public partial class OrderNoteClient 	{
 		}
 
 		/// <summary>
-		/// Updates an internal note on a given return. This note is visible in  for customer service representatives to see.
+		/// 
 		/// </summary>
-		/// <param name="noteId">Unique identifier of a particular note to retrieve.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
+		/// <param name="noteId"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="returnId"></param>
 		/// <param name="returnNote"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote"/>}
@@ -125,10 +126,10 @@ public partial class OrderNoteClient 	{
 		}
 
 		/// <summary>
-		/// Deletes an internal note from a given return.
+		/// 
 		/// </summary>
-		/// <param name="noteId">Unique identifier of a particular note to retrieve.</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
+		/// <param name="noteId"></param>
+		/// <param name="returnId"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Returns/PackageClient.cs b/Mozu.Api/Clients/Commerce/Returns/PackageClient.cs
old mode 100644
new mode 100755
index 10d58ec3..7d059161
--- a/Mozu.Api/Clients/Commerce/Returns/PackageClient.cs
+++ b/Mozu.Api/Clients/Commerce/Returns/PackageClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Returns
 {
@@ -22,11 +23,11 @@ namespace Mozu.Api.Clients.Commerce.Returns
 	public partial class PackageClient 	{
 		
 		/// <summary>
-		/// Retrieves the package label image supplied by the carrier for a return replacement.
+		/// 
 		/// </summary>
-		/// <param name="packageId">Unique identifier of the package for which to retrieve the label.</param>
-		/// <param name="returnAsBase64Png">Specifies whether to return the RMA label image as Base64-encoded PNG image instead of as a byte array encoded in the original image format. The default is .</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
+		/// <param name="packageId">Unique identifier of the return replacement package for which to retrieve the label.</param>
+		/// <param name="returnAsBase64Png"></param>
+		/// <param name="returnId">Unique identifier of the return associated with the replacement package label to retrieve.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="System.IO.Stream"/>}
 		/// </returns>
@@ -48,11 +49,11 @@ public partial class PackageClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the details of a package of return replacement items.
+		/// 
 		/// </summary>
-		/// <param name="packageId">Unique identifier of the package for which to retrieve the label.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
+		/// <param name="packageId">Unique identifier of the return replacement package to retrieve.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="returnId">Unique identifier of the return associated with the replacement package to retrieve.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package"/>}
 		/// </returns>
@@ -74,11 +75,11 @@ public partial class PackageClient 	{
 		}
 
 		/// <summary>
-		/// Creates a new physical package of return replacement items.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
-		/// <param name="package">Properties of a physical package shipped for an order.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="returnId">Unique identifier of the return for which to create a replacement package.</param>
+		/// <param name="package">Properties of the physical package for a return replacement.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package"/>}
 		/// </returns>
@@ -100,12 +101,12 @@ public partial class PackageClient 	{
 		}
 
 		/// <summary>
-		/// Updates one or more properties of a package associated with a return replacement.
+		/// 
 		/// </summary>
-		/// <param name="packageId">Unique identifier of the package for which to retrieve the label.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
-		/// <param name="package">Properties of a physical package shipped for an order.</param>
+		/// <param name="packageId">Unique identifier of the return replacement package to update.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="returnId">Unique identifier of the return associated with the replacement package to update.</param>
+		/// <param name="package">Properties of the return replacement package to update.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package"/>}
 		/// </returns>
@@ -127,10 +128,10 @@ public partial class PackageClient 	{
 		}
 
 		/// <summary>
-		/// Deletes a package associated with a return replacement.
+		/// 
 		/// </summary>
-		/// <param name="packageId">Unique identifier of the package for which to retrieve the label.</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
+		/// <param name="packageId">Unique identifier of the return replacement package to delete.</param>
+		/// <param name="returnId">Unique identifier of the return associated with the replacement package to delete.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Returns/ShipmentClient.cs b/Mozu.Api/Clients/Commerce/Returns/ShipmentClient.cs
old mode 100644
new mode 100755
index 9456e8d7..81e5db57
--- a/Mozu.Api/Clients/Commerce/Returns/ShipmentClient.cs
+++ b/Mozu.Api/Clients/Commerce/Returns/ShipmentClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Returns
 {
@@ -22,11 +23,11 @@ namespace Mozu.Api.Clients.Commerce.Returns
 	public partial class ShipmentClient 	{
 		
 		/// <summary>
-		/// Retrieves the details of the specified return replacement shipment.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
-		/// <param name="shipmentId">Unique identifier of the shipment to retrieve.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="returnId">Unique identifier of the return associated with the replacement shipment to retrieve.</param>
+		/// <param name="shipmentId">Unique identifier of the return replacement shipment to retrieve.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Shipment"/>}
 		/// </returns>
@@ -48,10 +49,10 @@ public partial class ShipmentClient 	{
 		}
 
 		/// <summary>
-		/// Creates a shipment from one or more packages associated with a return replacement.
+		/// 
 		/// </summary>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
-		/// <param name="packageIds">List of unique identifiers for each package associated with this shipment. Not all packages must belong to the same shipment.</param>
+		/// <param name="returnId">Unique identifier of the return for which to create replacement package shipments.</param>
+		/// <param name="packageIds">List of packages in the return replacement shipment.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package"/>}}
 		/// </returns>
@@ -73,10 +74,10 @@ public partial class ShipmentClient 	{
 		}
 
 		/// <summary>
-		/// Deletes a shipment for a return replacement.
+		/// 
 		/// </summary>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
-		/// <param name="shipmentId">Unique identifier of the shipment to retrieve.</param>
+		/// <param name="returnId">Unique identifier of the return associated with the replacement shipment to delete.</param>
+		/// <param name="shipmentId">Unique identifier of the return replacement shipment to delete.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Settings/ApplicationClient.cs b/Mozu.Api/Clients/Commerce/Settings/ApplicationClient.cs
old mode 100644
new mode 100755
index 7530a299..f28cf0c9
--- a/Mozu.Api/Clients/Commerce/Settings/ApplicationClient.cs
+++ b/Mozu.Api/Clients/Commerce/Settings/ApplicationClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Settings
 {
@@ -22,9 +23,9 @@ namespace Mozu.Api.Clients.Commerce.Settings
 	public partial class ApplicationClient 	{
 		
 		/// <summary>
-		/// Retrieve the settings of a third-party application.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.SiteSettings.Application.Application"/>}
 		/// </returns>
@@ -46,10 +47,10 @@ public partial class ApplicationClient 	{
 		}
 
 		/// <summary>
-		/// Initializes an application with the necessary configured settings.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="application">Properties of an application installed in a tenant.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="application">Properties of the application to update.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.SiteSettings.Application.Application"/>}
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Settings/CartSettingsClient.cs b/Mozu.Api/Clients/Commerce/Settings/CartSettingsClient.cs
old mode 100644
new mode 100755
index f8bcddd2..2c7a99dc
--- a/Mozu.Api/Clients/Commerce/Settings/CartSettingsClient.cs
+++ b/Mozu.Api/Clients/Commerce/Settings/CartSettingsClient.cs
@@ -13,18 +13,19 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Settings
 {
 	/// <summary>
-	/// Use the cart subresource to manage settings for the cart, such as whether to include handling fees in the cost calculations.
+	/// 
 	/// </summary>
 	public partial class CartSettingsClient 	{
 		
 		/// <summary>
-		/// Retrieves cart settings.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.SiteSettings.Order.CartSettings"/>}
 		/// </returns>
@@ -46,9 +47,9 @@ public partial class CartSettingsClient 	{
 		}
 
 		/// <summary>
-		/// Creates cart settings.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="cartSettings"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.SiteSettings.Order.CartSettings"/>}
@@ -71,9 +72,9 @@ public partial class CartSettingsClient 	{
 		}
 
 		/// <summary>
-		/// Updates cart settings.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="cartSettings"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.SiteSettings.Order.CartSettings"/>}
diff --git a/Mozu.Api/Clients/Commerce/Settings/Checkout/CustomerCheckoutSettingsClient.cs b/Mozu.Api/Clients/Commerce/Settings/Checkout/CustomerCheckoutSettingsClient.cs
old mode 100644
new mode 100755
index e6cdd249..68619256
--- a/Mozu.Api/Clients/Commerce/Settings/Checkout/CustomerCheckoutSettingsClient.cs
+++ b/Mozu.Api/Clients/Commerce/Settings/Checkout/CustomerCheckoutSettingsClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Settings.Checkout
 {
@@ -22,9 +23,9 @@ namespace Mozu.Api.Clients.Commerce.Settings.Checkout
 	public partial class CustomerCheckoutSettingsClient 	{
 		
 		/// <summary>
-		/// Retrieves all checkout settings defined for the site: Payment settings, such as the payment gateway ID and credentials, supported credit cards, and more; Customer Checkout settings, such as whether login is required, and any custom attributes; and Order Processing settings, such as when payment is authorized and captured, and any custom attributes.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.SiteSettings.Order.CustomerCheckoutSettings"/>}
 		/// </returns>
@@ -46,10 +47,10 @@ public partial class CustomerCheckoutSettingsClient 	{
 		}
 
 		/// <summary>
-		/// Modifies existing site checkout settings. Modify Payment, Customer Checkout, and Order Processing settings in one PUT.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="customerCheckoutSettings">The properties of the customer checkout settings such as whether shoppers must be logged in.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="customerCheckoutSettings">All the properties to update in the checkout settings.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.SiteSettings.Order.CustomerCheckoutSettings"/>}
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Settings/Checkout/PaymentSettingsClient.cs b/Mozu.Api/Clients/Commerce/Settings/Checkout/PaymentSettingsClient.cs
old mode 100644
new mode 100755
index 24b0e138..514ac049
--- a/Mozu.Api/Clients/Commerce/Settings/Checkout/PaymentSettingsClient.cs
+++ b/Mozu.Api/Clients/Commerce/Settings/Checkout/PaymentSettingsClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Settings.Checkout
 {
@@ -22,10 +23,10 @@ namespace Mozu.Api.Clients.Commerce.Settings.Checkout
 	public partial class PaymentSettingsClient 	{
 		
 		/// <summary>
-		/// Retrieves the schema and definition along with the actual instance values of the third-party payment service workflow configured for the corresponding fully qualified name.
+		/// 
 		/// </summary>
-		/// <param name="fullyQualifiedName">Fully qualified name of the attribute for the third-party payment workflow.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="fullyQualifiedName"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.SiteSettings.Order.ExternalPaymentWorkflowDefinition"/>}
 		/// </returns>
@@ -47,7 +48,7 @@ public partial class PaymentSettingsClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the schema and definition of all third-party payment service workflows configured for the site.
+		/// 
 		/// </summary>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.SiteSettings.Order.ExternalPaymentWorkflowDefinition"/>}}
@@ -70,9 +71,9 @@ public partial class PaymentSettingsClient 	{
 		}
 
 		/// <summary>
-		/// Adds a third-party payment workflow to the site. A third-party payment workflow is a definition of a process by which a third-party payment provider (such as Amazon Payments or PayPal Express) interacts with the  platform.
+		/// 
 		/// </summary>
-		/// <param name="definition">Properties of an external payment processing workflow defined for the site. At this time, only PayPal Express is supported.</param>
+		/// <param name="definition"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
@@ -94,9 +95,9 @@ public static MozuClient AddThirdPartyPaymentWorkflowClient(Mozu.Api.Contracts.S
 		}
 
 		/// <summary>
-		/// Deletes a third-party payment workflow. A third-party payment workflow is a definition of a process by which a third-party payment provider (such as Amazon Payments or PayPal Express) interacts with the  platform. 
+		/// 
 		/// </summary>
-		/// <param name="fullyQualifiedName">Fully qualified name of the attribute for the third-party payment workflow.</param>
+		/// <param name="fullyQualifiedName"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Settings/CheckoutSettingsClient.cs b/Mozu.Api/Clients/Commerce/Settings/CheckoutSettingsClient.cs
old mode 100644
new mode 100755
index 110e5e53..52e800ea
--- a/Mozu.Api/Clients/Commerce/Settings/CheckoutSettingsClient.cs
+++ b/Mozu.Api/Clients/Commerce/Settings/CheckoutSettingsClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Settings
 {
@@ -22,9 +23,9 @@ namespace Mozu.Api.Clients.Commerce.Settings
 	public partial class CheckoutSettingsClient 	{
 		
 		/// <summary>
-		/// Retrieves all checkout settings defined for the site including payment settings (payment gateway ID and credentials), shopper checkout settings (login requirement or guest mode and custom attributes), and order processing settings (when payment is authorized and captured plus any custom attributes).
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.SiteSettings.Order.CheckoutSettings"/>}
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Settings/General/CustomRouteSettingsClient.cs b/Mozu.Api/Clients/Commerce/Settings/General/CustomRouteSettingsClient.cs
old mode 100644
new mode 100755
index 9dbc8371..7ae8f0c9
--- a/Mozu.Api/Clients/Commerce/Settings/General/CustomRouteSettingsClient.cs
+++ b/Mozu.Api/Clients/Commerce/Settings/General/CustomRouteSettingsClient.cs
@@ -13,18 +13,19 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Settings.General
 {
 	/// <summary>
-	/// Use the Custom Routes resource to manage your custom route settings. Custom routing allows you to display SEO-friendly URLs on your site that map behind-the-scenes to conventional  resources such as a product page or a search results page. With custom routing, you gain advanced control over the URL structures on your site and can more visibly highlight the products or categories your shoppers are interested in purchasing.To learn more about custom routing, refer to the [Custom Route Settings](../../../guides/settings/custom-routes.htm) topic.
+	/// 
 	/// </summary>
 	public partial class CustomRouteSettingsClient 	{
 		
 		/// <summary>
-		/// Retrieves the custom route settings configured for a site. These are the same settings configured through  in the Custom Routing JSON Editor.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.SiteSettings.General.General.Routing.CustomRouteSettings"/>}
 		/// </returns>
@@ -46,10 +47,10 @@ public partial class CustomRouteSettingsClient 	{
 		}
 
 		/// <summary>
-		/// Create new custom route settings.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="settings">The details of the new custom route setting.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="settings"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.SiteSettings.General.General.Routing.CustomRouteSettings"/>}
 		/// </returns>
@@ -71,10 +72,10 @@ public partial class CustomRouteSettingsClient 	{
 		}
 
 		/// <summary>
-		/// Updates custom route settings.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="settings">The updated details of the custom route settings.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="settings"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.SiteSettings.General.General.Routing.CustomRouteSettings"/>}
 		/// </returns>
@@ -96,7 +97,7 @@ public partial class CustomRouteSettingsClient 	{
 		}
 
 		/// <summary>
-		/// Deletes all the custom route settings for a site, returning all routes to their  defaults.
+		/// 
 		/// </summary>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
diff --git a/Mozu.Api/Clients/Commerce/Settings/General/TaxableTerritoryClient.cs b/Mozu.Api/Clients/Commerce/Settings/General/TaxableTerritoryClient.cs
old mode 100644
new mode 100755
index 54b58aa9..9dc5c0d9
--- a/Mozu.Api/Clients/Commerce/Settings/General/TaxableTerritoryClient.cs
+++ b/Mozu.Api/Clients/Commerce/Settings/General/TaxableTerritoryClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Settings.General
 {
@@ -22,7 +23,7 @@ namespace Mozu.Api.Clients.Commerce.Settings.General
 	public partial class TaxableTerritoryClient 	{
 		
 		/// <summary>
-		/// Retrieves a list of the taxable territories configured for the site.
+		/// 
 		/// </summary>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.SiteSettings.General.TaxableTerritory"/>}}
@@ -45,10 +46,10 @@ public partial class TaxableTerritoryClient 	{
 		}
 
 		/// <summary>
-		/// Creates a new territory for which to calculate sales tax.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="taxableTerritory">Properties of the territory which is subject to sales tax.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="taxableTerritory">Properties of the taxable territory to create.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.SiteSettings.General.TaxableTerritory"/>}
 		/// </returns>
@@ -70,9 +71,9 @@ public partial class TaxableTerritoryClient 	{
 		}
 
 		/// <summary>
-		/// Updates one or more taxable territories configured for a site.
+		/// 
 		/// </summary>
-		/// <param name="taxableterritories">Properties of the territory which is subject to sales tax.</param>
+		/// <param name="taxableterritories">Properties of the taxable territories to update.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.SiteSettings.General.TaxableTerritory"/>}}
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Settings/GeneralSettingsClient.cs b/Mozu.Api/Clients/Commerce/Settings/GeneralSettingsClient.cs
old mode 100644
new mode 100755
index 981f8562..040f0130
--- a/Mozu.Api/Clients/Commerce/Settings/GeneralSettingsClient.cs
+++ b/Mozu.Api/Clients/Commerce/Settings/GeneralSettingsClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Settings
 {
@@ -22,9 +23,9 @@ namespace Mozu.Api.Clients.Commerce.Settings
 	public partial class GeneralSettingsClient 	{
 		
 		/// <summary>
-		/// Retrieve a site's general global settings.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.SiteSettings.General.GeneralSettings"/>}
 		/// </returns>
@@ -46,10 +47,10 @@ public partial class GeneralSettingsClient 	{
 		}
 
 		/// <summary>
-		/// Updates a site's general global settings.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="generalSettings">General settings used on the storefront site.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="generalSettings">The properties of the site's general settings to update.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.SiteSettings.General.GeneralSettings"/>}
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Settings/LocationUsageClient.cs b/Mozu.Api/Clients/Commerce/Settings/LocationUsageClient.cs
old mode 100644
new mode 100755
index 89ec4f41..86419a8c
--- a/Mozu.Api/Clients/Commerce/Settings/LocationUsageClient.cs
+++ b/Mozu.Api/Clients/Commerce/Settings/LocationUsageClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Settings
 {
@@ -22,9 +23,9 @@ namespace Mozu.Api.Clients.Commerce.Settings
 	public partial class LocationUsageClient 	{
 		
 		/// <summary>
-		/// Retrieves the configured site location usages for the location usage code specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Location.LocationUsageCollection"/>}
 		/// </returns>
@@ -46,10 +47,10 @@ public partial class LocationUsageClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the location usages for the site specified in the request header.
+		/// 
 		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="code">Code that identifies the location usage type, which is "DS" for direct ship, "SP" for in-store pickup, or "storeFinder" for store finder.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Location.LocationUsage"/>}
 		/// </returns>
@@ -71,11 +72,11 @@ public partial class LocationUsageClient 	{
 		}
 
 		/// <summary>
-		/// Updates the location usage for the site based on the location usage code specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="usage">Configuration properties of a location usage type for a specified site. The direct ship location usage type consists of a single location that represents location that supports direct ship (DS) fulfillment. The in-store pickup location usage type consists of a list of location types that represent locations that support in-store pickup (SP) fulfillment. The store finder location usage type consists of a list of location codes, location types, or both.</param>
+		/// <param name="code">Code that identifies the location usage type, which is "DS" for direct ship, "SP" for in-store pickup, or "storeFinder" for store finder.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="usage">Properties of the location usage type to update.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Location.LocationUsage"/>}
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Settings/Shipping/SiteShippingHandlingFeeClient.cs b/Mozu.Api/Clients/Commerce/Settings/Shipping/SiteShippingHandlingFeeClient.cs
old mode 100644
new mode 100755
index 4c8ea0b2..3a21725f
--- a/Mozu.Api/Clients/Commerce/Settings/Shipping/SiteShippingHandlingFeeClient.cs
+++ b/Mozu.Api/Clients/Commerce/Settings/Shipping/SiteShippingHandlingFeeClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Settings.Shipping
 {
@@ -22,9 +23,9 @@ namespace Mozu.Api.Clients.Commerce.Settings.Shipping
 	public partial class SiteShippingHandlingFeeClient 	{
 		
 		/// <summary>
-		/// Retrieves the details of the order handling fee configured for the site.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.SiteSettings.Shipping.SiteShippingHandlingFee"/>}
 		/// </returns>
@@ -46,10 +47,10 @@ public partial class SiteShippingHandlingFeeClient 	{
 		}
 
 		/// <summary>
-		/// Creates a new order handling fee for the site.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="orderHandlingFee">Properties of the handling fee to apply to order shipments for the site.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="orderHandlingFee">Properties of the order handling fee to assess for order shipment.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.SiteSettings.Shipping.SiteShippingHandlingFee"/>}
 		/// </returns>
@@ -71,10 +72,10 @@ public partial class SiteShippingHandlingFeeClient 	{
 		}
 
 		/// <summary>
-		/// Updates the order handling fee amount for the site.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="orderHandlingFee">Properties of the handling fee to apply to order shipments for the site.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="orderHandlingFee">The combined price for all items in the order, including all selected options but excluding any discounts.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.SiteSettings.Shipping.SiteShippingHandlingFee"/>}
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Settings/SiteShippingSettingsClient.cs b/Mozu.Api/Clients/Commerce/Settings/SiteShippingSettingsClient.cs
old mode 100644
new mode 100755
index eb53b550..af319b6d
--- a/Mozu.Api/Clients/Commerce/Settings/SiteShippingSettingsClient.cs
+++ b/Mozu.Api/Clients/Commerce/Settings/SiteShippingSettingsClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Settings
 {
@@ -22,9 +23,9 @@ namespace Mozu.Api.Clients.Commerce.Settings
 	public partial class SiteShippingSettingsClient 	{
 		
 		/// <summary>
-		/// Retrieves a list of the shipping settings configured for a site.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.SiteSettings.Shipping.SiteShippingSettings"/>}
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Shipping/Admin/CarrierConfigurationClient.cs b/Mozu.Api/Clients/Commerce/Shipping/Admin/CarrierConfigurationClient.cs
old mode 100644
new mode 100755
index b5fec333..70744978
--- a/Mozu.Api/Clients/Commerce/Shipping/Admin/CarrierConfigurationClient.cs
+++ b/Mozu.Api/Clients/Commerce/Shipping/Admin/CarrierConfigurationClient.cs
@@ -13,22 +13,23 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Shipping.Admin
 {
 	/// <summary>
-	/// Use the Carriers resource to configure and manage your supported shipping carrier configurations.
+	/// 
 	/// </summary>
 	public partial class CarrierConfigurationClient 	{
 		
 		/// <summary>
-		/// Retrieves a list of carrier configurations and their details according to any specified facets, filter criteria, and sort options.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ShippingAdmin.CarrierConfigurationCollection"/>}
 		/// </returns>
@@ -50,10 +51,10 @@ public partial class CarrierConfigurationClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the details of the specified carrier configuration.
+		/// 
 		/// </summary>
-		/// <param name="carrierId">The unique identifier of the carrier.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="carrierId"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ShippingAdmin.CarrierConfiguration"/>}
 		/// </returns>
@@ -75,11 +76,11 @@ public partial class CarrierConfigurationClient 	{
 		}
 
 		/// <summary>
-		/// Creates a new carrier configuration.
+		/// 
 		/// </summary>
-		/// <param name="carrierId">The unique identifier of the carrier.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="carrierConfiguration">Properties of a carrier configured in the shipping admin.</param>
+		/// <param name="carrierId"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="carrierConfiguration"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ShippingAdmin.CarrierConfiguration"/>}
 		/// </returns>
@@ -101,11 +102,11 @@ public partial class CarrierConfigurationClient 	{
 		}
 
 		/// <summary>
-		/// Updates the details of the specified carrier configuration.
+		/// 
 		/// </summary>
-		/// <param name="carrierId">The unique identifier of the carrier.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="carrierConfiguration">Properties of a carrier configured in the shipping admin.</param>
+		/// <param name="carrierId"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="carrierConfiguration"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ShippingAdmin.CarrierConfiguration"/>}
 		/// </returns>
@@ -127,9 +128,9 @@ public partial class CarrierConfigurationClient 	{
 		}
 
 		/// <summary>
-		/// Deletes the specified carrier configuration.
+		/// 
 		/// </summary>
-		/// <param name="carrierId">The unique identifier of the carrier configuration.</param>
+		/// <param name="carrierId"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Shipping/Admin/Profiles/OrderHandlingFeeRulesClient.cs b/Mozu.Api/Clients/Commerce/Shipping/Admin/Profiles/OrderHandlingFeeRulesClient.cs
new file mode 100755
index 00000000..b1e2b3a5
--- /dev/null
+++ b/Mozu.Api/Clients/Commerce/Shipping/Admin/Profiles/OrderHandlingFeeRulesClient.cs
@@ -0,0 +1,164 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using Mozu.Api.Security;
+using System.Threading.Tasks;
+using Newtonsoft.Json.Linq;
+using System.Threading;
+
+namespace Mozu.Api.Clients.Commerce.Shipping.Admin.Profiles
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	public partial class OrderHandlingFeeRulesClient 	{
+		
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="id"></param>
+		/// <param name="profilecode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
+		/// <returns>
+		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule"/>}
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var mozuClient=GetOrderHandlingFeeRule( profilecode,  id,  responseFields);
+		///   var handlingFeeRuleClient = mozuClient.WithBaseAddress(url).Execute().Result();
+		/// </code>
+		/// </example>
+		public static MozuClient<Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule> GetOrderHandlingFeeRuleClient(string profilecode, string id, string responseFields =  null)
+		{
+			var url = Mozu.Api.Urls.Commerce.Shipping.Admin.Profiles.OrderHandlingFeeRulesUrl.GetOrderHandlingFeeRuleUrl(profilecode, id, responseFields);
+			const string verb = "GET";
+			var mozuClient = new MozuClient<Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule>()
+									.WithVerb(verb).WithResourceUrl(url)
+;
+			return mozuClient;
+
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="profilecode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
+		/// <returns>
+		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRuleCollection"/>}
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var mozuClient=GetOrderHandlingFeeRules( profilecode,  responseFields);
+		///   var handlingFeeRuleCollectionClient = mozuClient.WithBaseAddress(url).Execute().Result();
+		/// </code>
+		/// </example>
+		public static MozuClient<Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRuleCollection> GetOrderHandlingFeeRulesClient(string profilecode, string responseFields =  null)
+		{
+			var url = Mozu.Api.Urls.Commerce.Shipping.Admin.Profiles.OrderHandlingFeeRulesUrl.GetOrderHandlingFeeRulesUrl(profilecode, responseFields);
+			const string verb = "GET";
+			var mozuClient = new MozuClient<Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRuleCollection>()
+									.WithVerb(verb).WithResourceUrl(url)
+;
+			return mozuClient;
+
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="profilecode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
+		/// <param name="rule"></param>
+		/// <returns>
+		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule"/>}
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var mozuClient=CreateOrderHandlingFeeRule( rule,  profilecode,  responseFields);
+		///   var handlingFeeRuleClient = mozuClient.WithBaseAddress(url).Execute().Result();
+		/// </code>
+		/// </example>
+		public static MozuClient<Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule> CreateOrderHandlingFeeRuleClient(Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule rule, string profilecode, string responseFields =  null)
+		{
+			var url = Mozu.Api.Urls.Commerce.Shipping.Admin.Profiles.OrderHandlingFeeRulesUrl.CreateOrderHandlingFeeRuleUrl(profilecode, responseFields);
+			const string verb = "POST";
+			var mozuClient = new MozuClient<Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule>()
+									.WithVerb(verb).WithResourceUrl(url)
+									.WithBody<Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule>(rule);
+			return mozuClient;
+
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="id"></param>
+		/// <param name="profilecode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
+		/// <param name="rule"></param>
+		/// <returns>
+		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule"/>}
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var mozuClient=UpdateOrderHandlingFeeRule( rule,  profilecode,  id,  responseFields);
+		///   var handlingFeeRuleClient = mozuClient.WithBaseAddress(url).Execute().Result();
+		/// </code>
+		/// </example>
+		public static MozuClient<Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule> UpdateOrderHandlingFeeRuleClient(Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule rule, string profilecode, string id, string responseFields =  null)
+		{
+			var url = Mozu.Api.Urls.Commerce.Shipping.Admin.Profiles.OrderHandlingFeeRulesUrl.UpdateOrderHandlingFeeRuleUrl(profilecode, id, responseFields);
+			const string verb = "PUT";
+			var mozuClient = new MozuClient<Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule>()
+									.WithVerb(verb).WithResourceUrl(url)
+									.WithBody<Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule>(rule);
+			return mozuClient;
+
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="id"></param>
+		/// <param name="profilecode"></param>
+		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
+		/// <returns>
+		///  <see cref="Mozu.Api.MozuClient" />
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var mozuClient=DeleteOrderHandlingFeeRule( profilecode,  id);
+		///mozuClient.WithBaseAddress(url).Execute();
+		/// </code>
+		/// </example>
+		public static MozuClient DeleteOrderHandlingFeeRuleClient(string profilecode, string id)
+		{
+			var url = Mozu.Api.Urls.Commerce.Shipping.Admin.Profiles.OrderHandlingFeeRulesUrl.DeleteOrderHandlingFeeRuleUrl(profilecode, id);
+			const string verb = "DELETE";
+			var mozuClient = new MozuClient()
+									.WithVerb(verb).WithResourceUrl(url)
+;
+			return mozuClient;
+
+		}
+
+
+	}
+
+}
+
+
diff --git a/Mozu.Api/Clients/Commerce/Shipping/Admin/Profiles/HandlingFeeRuleClient.cs b/Mozu.Api/Clients/Commerce/Shipping/Admin/Profiles/ProductHandlingFeeRulesClient.cs
old mode 100644
new mode 100755
similarity index 61%
rename from Mozu.Api/Clients/Commerce/Shipping/Admin/Profiles/HandlingFeeRuleClient.cs
rename to Mozu.Api/Clients/Commerce/Shipping/Admin/Profiles/ProductHandlingFeeRulesClient.cs
index aad2ee90..6de77339
--- a/Mozu.Api/Clients/Commerce/Shipping/Admin/Profiles/HandlingFeeRuleClient.cs
+++ b/Mozu.Api/Clients/Commerce/Shipping/Admin/Profiles/ProductHandlingFeeRulesClient.cs
@@ -13,20 +13,21 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Shipping.Admin.Profiles
 {
 	/// <summary>
-	/// Use the ProductHandlingFeeRules sub-resource to manage your product handling fee rules that are associated with a specific shipping profile.
+	/// 
 	/// </summary>
-	public partial class HandlingFeeRuleClient 	{
+	public partial class ProductHandlingFeeRulesClient 	{
 		
 		/// <summary>
-		/// Retrieves the details of the specified product handling fee rule.
+		/// 
 		/// </summary>
-		/// <param name="id">Unique identifier of the customer segment to retrieve.</param>
-		/// <param name="profilecode">The unique, user-defined code of the profile with which the product handling fee rule is associated.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="id"></param>
+		/// <param name="profilecode"></param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule"/>}
@@ -39,7 +40,7 @@ public partial class HandlingFeeRuleClient 	{
 		/// </example>
 		public static MozuClient<Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule> GetProductHandlingFeeRuleClient(DataViewMode dataViewMode, string profilecode, string id, string responseFields =  null)
 		{
-			var url = Mozu.Api.Urls.Commerce.Shipping.Admin.Profiles.HandlingFeeRuleUrl.GetProductHandlingFeeRuleUrl(profilecode, id, responseFields);
+			var url = Mozu.Api.Urls.Commerce.Shipping.Admin.Profiles.ProductHandlingFeeRulesUrl.GetProductHandlingFeeRuleUrl(profilecode, id, responseFields);
 			const string verb = "GET";
 			var mozuClient = new MozuClient<Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule>()
 									.WithVerb(verb).WithResourceUrl(url)
@@ -50,10 +51,10 @@ public partial class HandlingFeeRuleClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves a list of product handling fee rules and their details.
+		/// 
 		/// </summary>
-		/// <param name="profilecode">The unique, user-defined code of the profile with which the product handling fee rule is associated.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="profilecode"></param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRuleCollection"/>}
@@ -66,7 +67,7 @@ public partial class HandlingFeeRuleClient 	{
 		/// </example>
 		public static MozuClient<Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRuleCollection> GetProductHandlingFeeRulesClient(DataViewMode dataViewMode, string profilecode, string responseFields =  null)
 		{
-			var url = Mozu.Api.Urls.Commerce.Shipping.Admin.Profiles.HandlingFeeRuleUrl.GetProductHandlingFeeRulesUrl(profilecode, responseFields);
+			var url = Mozu.Api.Urls.Commerce.Shipping.Admin.Profiles.ProductHandlingFeeRulesUrl.GetProductHandlingFeeRulesUrl(profilecode, responseFields);
 			const string verb = "GET";
 			var mozuClient = new MozuClient<Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRuleCollection>()
 									.WithVerb(verb).WithResourceUrl(url)
@@ -77,12 +78,12 @@ public partial class HandlingFeeRuleClient 	{
 		}
 
 		/// <summary>
-		/// Creates a new product handling fee rule.
+		/// 
 		/// </summary>
-		/// <param name="profilecode">The unique, user-defined code of the profile with which the product handling fee rule is associated.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="profilecode"></param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="rule">The details of the new product handling fee rule.</param>
+		/// <param name="rule"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule"/>}
 		/// </returns>
@@ -94,7 +95,7 @@ public partial class HandlingFeeRuleClient 	{
 		/// </example>
 		public static MozuClient<Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule> CreateProductHandlingFeeRuleClient(Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule rule, string profilecode, string responseFields =  null)
 		{
-			var url = Mozu.Api.Urls.Commerce.Shipping.Admin.Profiles.HandlingFeeRuleUrl.CreateProductHandlingFeeRuleUrl(profilecode, responseFields);
+			var url = Mozu.Api.Urls.Commerce.Shipping.Admin.Profiles.ProductHandlingFeeRulesUrl.CreateProductHandlingFeeRuleUrl(profilecode, responseFields);
 			const string verb = "POST";
 			var mozuClient = new MozuClient<Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule>()
 									.WithVerb(verb).WithResourceUrl(url)
@@ -104,13 +105,13 @@ public partial class HandlingFeeRuleClient 	{
 		}
 
 		/// <summary>
-		/// Updates the details of the specified product handling fee rule.
+		/// 
 		/// </summary>
-		/// <param name="id">Unique identifier of the customer segment to retrieve.</param>
-		/// <param name="profilecode">The unique, user-defined code of the profile with which the product handling fee rule is associated.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="id"></param>
+		/// <param name="profilecode"></param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="rule">The updated details of the product handling fee rule.</param>
+		/// <param name="rule"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule"/>}
 		/// </returns>
@@ -122,7 +123,7 @@ public partial class HandlingFeeRuleClient 	{
 		/// </example>
 		public static MozuClient<Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule> UpdateProductHandlingFeeRuleClient(DataViewMode dataViewMode, Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule rule, string profilecode, string id, string responseFields =  null)
 		{
-			var url = Mozu.Api.Urls.Commerce.Shipping.Admin.Profiles.HandlingFeeRuleUrl.UpdateProductHandlingFeeRuleUrl(profilecode, id, responseFields);
+			var url = Mozu.Api.Urls.Commerce.Shipping.Admin.Profiles.ProductHandlingFeeRulesUrl.UpdateProductHandlingFeeRuleUrl(profilecode, id, responseFields);
 			const string verb = "PUT";
 			var mozuClient = new MozuClient<Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule>()
 									.WithVerb(verb).WithResourceUrl(url)
@@ -133,10 +134,10 @@ public partial class HandlingFeeRuleClient 	{
 		}
 
 		/// <summary>
-		/// Deletes the specified product handling fee rule.
+		/// 
 		/// </summary>
-		/// <param name="id">Unique identifier of the customer segment to retrieve.</param>
-		/// <param name="profilecode">The unique, user-defined code of the profile with which the product handling fee rule is associated.</param>
+		/// <param name="id"></param>
+		/// <param name="profilecode"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
@@ -149,7 +150,7 @@ public partial class HandlingFeeRuleClient 	{
 		/// </example>
 		public static MozuClient DeleteProductHandlingFeeRuleClient(DataViewMode dataViewMode, string profilecode, string id)
 		{
-			var url = Mozu.Api.Urls.Commerce.Shipping.Admin.Profiles.HandlingFeeRuleUrl.DeleteProductHandlingFeeRuleUrl(profilecode, id);
+			var url = Mozu.Api.Urls.Commerce.Shipping.Admin.Profiles.ProductHandlingFeeRulesUrl.DeleteProductHandlingFeeRuleUrl(profilecode, id);
 			const string verb = "DELETE";
 			var mozuClient = new MozuClient()
 									.WithVerb(verb).WithResourceUrl(url)
diff --git a/Mozu.Api/Clients/Commerce/Shipping/Admin/Profiles/ShippingInclusionRuleClient.cs b/Mozu.Api/Clients/Commerce/Shipping/Admin/Profiles/ShippingInclusionRuleClient.cs
old mode 100644
new mode 100755
index 2f0849cc..c8330e2b
--- a/Mozu.Api/Clients/Commerce/Shipping/Admin/Profiles/ShippingInclusionRuleClient.cs
+++ b/Mozu.Api/Clients/Commerce/Shipping/Admin/Profiles/ShippingInclusionRuleClient.cs
@@ -13,20 +13,21 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Shipping.Admin.Profiles
 {
 	/// <summary>
-	/// Use the ShippingInclusionRules sub-resource to manage your shipping inclusion rules that are associated with a specific shipping profile.
+	/// 
 	/// </summary>
 	public partial class ShippingInclusionRuleClient 	{
 		
 		/// <summary>
-		/// Retrieves the details of the specified shipping inclusion rule.
+		/// 
 		/// </summary>
-		/// <param name="id">Unique identifier of the customer segment to retrieve.</param>
-		/// <param name="profilecode">The unique, user-defined code of the profile with which the shipping inclusion rule is associated.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="id"></param>
+		/// <param name="profilecode"></param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingInclusionRule"/>}
@@ -49,10 +50,10 @@ public partial class ShippingInclusionRuleClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves a list of shipping inclusion rules and their details.
+		/// 
 		/// </summary>
-		/// <param name="profilecode">The unique, user-defined code of the profile with which the shipping inclusion rule is associated.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="profilecode"></param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingInclusionRuleCollection"/>}
@@ -75,12 +76,12 @@ public partial class ShippingInclusionRuleClient 	{
 		}
 
 		/// <summary>
-		/// Creates a new shipping inclusion rule.
+		/// 
 		/// </summary>
-		/// <param name="profilecode">The unique, user-defined code of the profile with which the shipping inclusion rule is associated.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="profilecode"></param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="rule">The details of the new shipping inclusion rule.</param>
+		/// <param name="rule"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingInclusionRule"/>}
 		/// </returns>
@@ -102,13 +103,13 @@ public partial class ShippingInclusionRuleClient 	{
 		}
 
 		/// <summary>
-		/// Updates the details of the specified shipping inclusion rule.
+		/// 
 		/// </summary>
-		/// <param name="id">Unique identifier of the customer segment to retrieve.</param>
-		/// <param name="profilecode">The unique, user-defined code of the profile with which the shipping inclusion rule is associated.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="id"></param>
+		/// <param name="profilecode"></param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="rule">The updated details of the shipping inclusion rule.</param>
+		/// <param name="rule"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingInclusionRule"/>}
 		/// </returns>
@@ -130,10 +131,10 @@ public partial class ShippingInclusionRuleClient 	{
 		}
 
 		/// <summary>
-		/// Deletes the specified shipping inclusion rule.
+		/// 
 		/// </summary>
-		/// <param name="id">Unique identifier of the customer segment to retrieve.</param>
-		/// <param name="profilecode">The unique, user-defined code of the profile with which the shipping inclusion rule is associated.</param>
+		/// <param name="id"></param>
+		/// <param name="profilecode"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
diff --git a/Mozu.Api/Clients/Commerce/Shipping/Admin/Profiles/ShippingStatesClient.cs b/Mozu.Api/Clients/Commerce/Shipping/Admin/Profiles/ShippingStatesClient.cs
old mode 100644
new mode 100755
index 06f1367f..b17dfecc
--- a/Mozu.Api/Clients/Commerce/Shipping/Admin/Profiles/ShippingStatesClient.cs
+++ b/Mozu.Api/Clients/Commerce/Shipping/Admin/Profiles/ShippingStatesClient.cs
@@ -13,18 +13,19 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Shipping.Admin.Profiles
 {
 	/// <summary>
-	/// Use the ShippingStates sub-resource to manage the states your shipping profile supports. For example, you can specify one of your shipping profiles to only support Texas, Oklahoma, Arkansas, Louisiana, and New Mexico.Each shipping state is composed of a user-definied code and name.
+	/// 
 	/// </summary>
 	public partial class ShippingStatesClient 	{
 		
 		/// <summary>
-		/// Retrieves a list of shipping states and their details.
+		/// 
 		/// </summary>
-		/// <param name="profileCode">The unique, user-defined code of the profile with which the shipping state is associated.</param>
+		/// <param name="profileCode"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingStates"/>}}
@@ -47,11 +48,11 @@ public partial class ShippingStatesClient 	{
 		}
 
 		/// <summary>
-		/// Updates the details of the shipping states.
+		/// 
 		/// </summary>
-		/// <param name="profilecode">The unique, user-defined code of the profile with which the shipping state is associated.</param>
+		/// <param name="profilecode"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="states">The updated details of the shipping states associated with the specified profilecode.</param>
+		/// <param name="states"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingStates"/>}}
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Shipping/Admin/ShippingProfileClient.cs b/Mozu.Api/Clients/Commerce/Shipping/Admin/ShippingProfileClient.cs
old mode 100644
new mode 100755
index 0f706f44..d3ac1ae9
--- a/Mozu.Api/Clients/Commerce/Shipping/Admin/ShippingProfileClient.cs
+++ b/Mozu.Api/Clients/Commerce/Shipping/Admin/ShippingProfileClient.cs
@@ -13,18 +13,19 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Shipping.Admin
 {
 	/// <summary>
-	/// Use the Profiles resource to manage your shipping profiles.
+	/// 
 	/// </summary>
 	public partial class ShippingProfileClient 	{
 		
 		/// <summary>
-		/// Retrieves a list of shipping profiles.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingProfileCollection"/>}
diff --git a/Mozu.Api/Clients/Commerce/TargetRuleClient.cs b/Mozu.Api/Clients/Commerce/TargetRuleClient.cs
old mode 100644
new mode 100755
index b80f10da..40abeb03
--- a/Mozu.Api/Clients/Commerce/TargetRuleClient.cs
+++ b/Mozu.Api/Clients/Commerce/TargetRuleClient.cs
@@ -13,22 +13,23 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce
 {
 	/// <summary>
-	/// Use the TargetRules resource to manage your target rules for products and zones. For example, you can set specific rules that dictate shipping options for specific products.
+	/// 
 	/// </summary>
 	public partial class TargetRuleClient 	{
 		
 		/// <summary>
-		/// Retrieves a list of target rules and their details according to any specified facets, filter criteria, and sort options.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ShippingAdmin.TargetRuleCollection"/>}
@@ -51,10 +52,10 @@ public partial class TargetRuleClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the details of the specified target rule.
+		/// 
 		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="code"></param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ShippingAdmin.TargetRule"/>}
@@ -77,11 +78,11 @@ public partial class TargetRuleClient 	{
 		}
 
 		/// <summary>
-		/// Creates a new target rule.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="targetRule">The details of the new target rule.</param>
+		/// <param name="targetRule"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ShippingAdmin.TargetRule"/>}
 		/// </returns>
@@ -103,10 +104,10 @@ public partial class TargetRuleClient 	{
 		}
 
 		/// <summary>
-		/// Validates the details of a target rule.
+		/// 
 		/// </summary>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="targetRule">The details of the target rule you want to validate.</param>
+		/// <param name="targetRule"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
@@ -128,12 +129,12 @@ public static MozuClient ValidateTargetRuleClient(Mozu.Api.Contracts.ShippingAdm
 		}
 
 		/// <summary>
-		/// Updates the details of the specified target rule.
+		/// 
 		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="code"></param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="targetRule">The details of the updated target rule.</param>
+		/// <param name="targetRule"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.ShippingAdmin.TargetRule"/>}
 		/// </returns>
@@ -155,9 +156,9 @@ public static MozuClient ValidateTargetRuleClient(Mozu.Api.Contracts.ShippingAdm
 		}
 
 		/// <summary>
-		/// Deletes the specified target rule.
+		/// 
 		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
+		/// <param name="code"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
diff --git a/Mozu.Api/Clients/Commerce/WishlistClient.cs b/Mozu.Api/Clients/Commerce/WishlistClient.cs
old mode 100644
new mode 100755
index 59baab1c..0c0852ca
--- a/Mozu.Api/Clients/Commerce/WishlistClient.cs
+++ b/Mozu.Api/Clients/Commerce/WishlistClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce
 {
@@ -22,15 +23,15 @@ namespace Mozu.Api.Clients.Commerce
 	public partial class WishlistClient 	{
 		
 		/// <summary>
-		/// Retrieves a list of shopper wish lists according to any filter and sort criteria.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="q">A list of order search terms (not phrases) to use in the query when searching across order number and the name or email of the billing contact. When entering, separate multiple search terms with a space character.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="q">A list of search terms to use in the query when searching across wish list name. Separate multiple search terms with a space character.</param>
 		/// <param name="qLimit">The maximum number of search results to return in the response. You can limit any range between 1-100.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistCollection"/>}
 		/// </returns>
@@ -52,10 +53,10 @@ public partial class WishlistClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the details of the shopper wish list specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="wishlistId">Unique identifier of the wish list.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="wishlistId">Unique identifier of the shopper wish list to retrieve.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist"/>}
 		/// </returns>
@@ -77,10 +78,10 @@ public partial class WishlistClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the details of a wish list by supplying the wish list name.
+		/// 
 		/// </summary>
 		/// <param name="customerAccountId">The unique identifier of the customer account for which to retrieve wish lists.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="wishlistName">The name of the wish list to retrieve.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist"/>}
@@ -103,10 +104,10 @@ public partial class WishlistClient 	{
 		}
 
 		/// <summary>
-		/// Creates a new shopper wish list for the associated customer account. Although customer accounts are maintained at the tenant level, the system stores wish lists at the site level. Newly created wish lists do not have any items.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="wishlist">Properties of a shopper wish list defined for a site, associated with a customer account.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="wishlist">Properties of the wish list to create.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist"/>}
 		/// </returns>
@@ -128,11 +129,11 @@ public partial class WishlistClient 	{
 		}
 
 		/// <summary>
-		/// Updates one or more properties of a shopper wish list defined for a customer account.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="wishlistId">Unique identifier of the wish list.</param>
-		/// <param name="wishlist">Properties of a shopper wish list defined for a site, associated with a customer account.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="wishlistId">Unique identifier of the shopper wish list to update.</param>
+		/// <param name="wishlist">Properties of the shopper wish list to update.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist"/>}
 		/// </returns>
@@ -154,9 +155,9 @@ public partial class WishlistClient 	{
 		}
 
 		/// <summary>
-		/// Deletes the shopper wish list specified in the request and all items associated with it.
+		/// 
 		/// </summary>
-		/// <param name="wishlistId">Unique identifier of the wish list.</param>
+		/// <param name="wishlistId">Unique identifier of the wish list to delete.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
diff --git a/Mozu.Api/Clients/Commerce/Wishlists/WishlistItemClient.cs b/Mozu.Api/Clients/Commerce/Wishlists/WishlistItemClient.cs
old mode 100644
new mode 100755
index c6db1f55..756ff5a0
--- a/Mozu.Api/Clients/Commerce/Wishlists/WishlistItemClient.cs
+++ b/Mozu.Api/Clients/Commerce/Wishlists/WishlistItemClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Commerce.Wishlists
 {
@@ -22,11 +23,11 @@ namespace Mozu.Api.Clients.Commerce.Wishlists
 	public partial class WishlistItemClient 	{
 		
 		/// <summary>
-		/// Retrieves the details of an item in a shopper wish list.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="wishlistId">Unique identifier of the wish list.</param>
-		/// <param name="wishlistItemId">Unique identifier of the item to remove from the shopper wish list.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="wishlistId">Unique identifier of the wish list item to retrieve.</param>
+		/// <param name="wishlistItemId">Unique identifier of the wish list associated with the item to retrieve.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItem"/>}
 		/// </returns>
@@ -48,14 +49,14 @@ public partial class WishlistItemClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves a list of items in a shopper wish list according to any specified filter and sort criteria.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
-		/// <param name="wishlistId">Unique identifier of the wish list.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
+		/// <param name="wishlistId">Unique identifier of the wish list associated with the items to retrieve.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItemCollection"/>}
 		/// </returns>
@@ -77,15 +78,15 @@ public partial class WishlistItemClient 	{
 		}
 
 		/// <summary>
-		/// Retrieve a list of items in a customer wish list by supplying the wish list name.
+		/// 
 		/// </summary>
-		/// <param name="customerAccountId">The unique identifier of the customer account for which to retrieve wish lists.</param>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
-		/// <param name="wishlistName">The name of the wish list to retrieve.</param>
+		/// <param name="customerAccountId">The unique identifier of the customer account associated with the wish list.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
+		/// <param name="wishlistName">The name of the wish list that contains the items to retrieve.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItemCollection"/>}
 		/// </returns>
@@ -107,11 +108,11 @@ public partial class WishlistItemClient 	{
 		}
 
 		/// <summary>
-		/// Adds a product in a site's catalog as an item in a shopper wish list.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="wishlistId">Unique identifier of the wish list.</param>
-		/// <param name="wishlistItem">Properties of an item in a shopper wish list.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="wishlistId">Unique identifier of the wish list associated with the item to add.</param>
+		/// <param name="wishlistItem">Properties of the item to add to the wish list.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItem"/>}
 		/// </returns>
@@ -133,12 +134,12 @@ public partial class WishlistItemClient 	{
 		}
 
 		/// <summary>
-		/// Updates the quantity of an item in a shopper wish list.
+		/// 
 		/// </summary>
-		/// <param name="quantity">The number of cart items in the shopper's active cart.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="wishlistId">Unique identifier of the wish list.</param>
-		/// <param name="wishlistItemId">Unique identifier of the item to remove from the shopper wish list.</param>
+		/// <param name="quantity">The quantity of the item in the wish list.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="wishlistId">Unique identifier of the wish list associated with the item quantity to update.</param>
+		/// <param name="wishlistItemId">Unique identifier of the item in the wish list to update quantity.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItem"/>}
 		/// </returns>
@@ -160,12 +161,12 @@ public partial class WishlistItemClient 	{
 		}
 
 		/// <summary>
-		/// Updates the details of an item in a shopper wish list.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="wishlistId">Unique identifier of the wish list.</param>
-		/// <param name="wishlistItemId">Unique identifier of the item to remove from the shopper wish list.</param>
-		/// <param name="wishlistItem">Properties of an item in a shopper wish list.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="wishlistId">Unique identifier of the wish list associated with the item to update.</param>
+		/// <param name="wishlistItemId">Unique identifier of the item in the shopper wish list to update.</param>
+		/// <param name="wishlistItem">Properties of the shopper wish list item to update.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItem"/>}
 		/// </returns>
@@ -187,9 +188,9 @@ public partial class WishlistItemClient 	{
 		}
 
 		/// <summary>
-		/// Removes all items associated with a shopper wish list.
+		/// 
 		/// </summary>
-		/// <param name="wishlistId">Unique identifier of the wish list.</param>
+		/// <param name="wishlistId">Unique identifier of the wish list associated with the items to remove.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist"/>}
 		/// </returns>
@@ -211,9 +212,9 @@ public partial class WishlistItemClient 	{
 		}
 
 		/// <summary>
-		/// Removes an item from the wish list specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="wishlistId">Unique identifier of the wish list.</param>
+		/// <param name="wishlistId">Unique identifier of the wish list associated with the item to remove.</param>
 		/// <param name="wishlistItemId">Unique identifier of the item to remove from the shopper wish list.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
diff --git a/Mozu.Api/Clients/Content/DocumentDraftSummaryClient.cs b/Mozu.Api/Clients/Content/DocumentDraftSummaryClient.cs
old mode 100644
new mode 100755
index 586fdd78..fce706b6
--- a/Mozu.Api/Clients/Content/DocumentDraftSummaryClient.cs
+++ b/Mozu.Api/Clients/Content/DocumentDraftSummaryClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Content
 {
@@ -22,12 +23,12 @@ namespace Mozu.Api.Clients.Content
 	public partial class DocumentDraftSummaryClient 	{
 		
 		/// <summary>
-		/// Retrieves a list of the documents currently in draft state, according to any defined filter and sort criteria.
+		/// 
 		/// </summary>
-		/// <param name="documentLists">List of document lists that contain documents to delete.</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+		/// <param name="documentLists">Lists that contain the document drafts.</param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Content.DocumentDraftSummaryPagedCollection"/>}
 		/// </returns>
@@ -49,7 +50,7 @@ public partial class DocumentDraftSummaryClient 	{
 		}
 
 		/// <summary>
-		/// Deletes the drafts of the specified documents. Published documents cannot be deleted.
+		/// 
 		/// </summary>
 		/// <param name="documentLists">List of document lists that contain documents to delete.</param>
 		/// <param name="documentIds">Unique identifiers of the documents to delete.</param>
@@ -74,10 +75,10 @@ public static MozuClient DeleteDocumentDraftsClient(List<string> documentIds, st
 		}
 
 		/// <summary>
-		/// Publish one or more document drafts to live content on the site.
+		/// 
 		/// </summary>
-		/// <param name="documentLists">List of document lists that contain documents to delete.</param>
-		/// <param name="documentIds">Unique identifiers of the documents to delete.</param>
+		/// <param name="documentLists">List of document lists that contain documents to publish.</param>
+		/// <param name="documentIds">List of unique identifiers of the document drafts to publish.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
diff --git a/Mozu.Api/Clients/Content/DocumentListClient.cs b/Mozu.Api/Clients/Content/DocumentListClient.cs
old mode 100644
new mode 100755
index 7176e66a..7376dc75
--- a/Mozu.Api/Clients/Content/DocumentListClient.cs
+++ b/Mozu.Api/Clients/Content/DocumentListClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Content
 {
@@ -22,10 +23,10 @@ namespace Mozu.Api.Clients.Content
 	public partial class DocumentListClient 	{
 		
 		/// <summary>
-		/// Retrieves a collection of document lists.
+		/// 
 		/// </summary>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
 		/// <param name="startIndex"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Content.DocumentListCollection"/>}
@@ -49,10 +50,10 @@ public partial class DocumentListClient 	{
 		}
 
 		/// <summary>
-		/// Retrieve the details of a document list by providing the list name.
+		/// 
 		/// </summary>
-		/// <param name="documentListName">Name of content documentListName to delete</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="documentListName">The name of the document list.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Content.DocumentList"/>}
 		/// </returns>
@@ -75,10 +76,10 @@ public partial class DocumentListClient 	{
 		}
 
 		/// <summary>
-		/// Creates a new documentList
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="list">The list of document types and related properties that define content used by the content management system (CMS).</param>
+		/// <param name="responseFields"></param>
+		/// <param name="list"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Content.DocumentList"/>}
 		/// </returns>
@@ -101,11 +102,11 @@ public partial class DocumentListClient 	{
 		}
 
 		/// <summary>
-		/// Updates a `DocumentListName`.
+		/// 
 		/// </summary>
-		/// <param name="documentListName">Name of content documentListName to delete</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="list">The list of document types and related properties that define content used by the content management system (CMS).</param>
+		/// <param name="documentListName"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="list"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Content.DocumentList"/>}
 		/// </returns>
@@ -127,9 +128,9 @@ public partial class DocumentListClient 	{
 		}
 
 		/// <summary>
-		/// Deletes the specified `DocumentListName`.
+		/// 
 		/// </summary>
-		/// <param name="documentListName">Name of content documentListName to delete</param>
+		/// <param name="documentListName"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
diff --git a/Mozu.Api/Clients/Content/DocumentListTypeClient.cs b/Mozu.Api/Clients/Content/DocumentListTypeClient.cs
old mode 100644
new mode 100755
index 25662f57..de0b75b3
--- a/Mozu.Api/Clients/Content/DocumentListTypeClient.cs
+++ b/Mozu.Api/Clients/Content/DocumentListTypeClient.cs
@@ -13,20 +13,21 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Content
 {
 	/// <summary>
-	/// Use the Document List Types resource to manage the types of document lists in your site's document hierarchy. The type denotes a content type for that list of folders, sub-folders, and documents such as `web_pages`.
+	/// 
 	/// </summary>
 	public partial class DocumentListTypeClient 	{
 		
 		/// <summary>
-		/// Gets all the available documentListTypes.
+		/// 
 		/// </summary>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Content.DocumentListTypeCollection"/>}
 		/// </returns>
@@ -49,10 +50,10 @@ public partial class DocumentListTypeClient 	{
 		}
 
 		/// <summary>
-		/// Gets a documentListType.
+		/// 
 		/// </summary>
 		/// <param name="documentListTypeFQN"></param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Content.DocumentListType"/>}
 		/// </returns>
@@ -75,10 +76,10 @@ public partial class DocumentListTypeClient 	{
 		}
 
 		/// <summary>
-		/// Creates a new documentListType.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="list">Properties for the document list type. Document lists contain documents with an associated document type, such as web pages.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="list"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Content.DocumentListType"/>}
 		/// </returns>
@@ -101,11 +102,11 @@ public partial class DocumentListTypeClient 	{
 		}
 
 		/// <summary>
-		/// Updates a DocumentListType
+		/// 
 		/// </summary>
 		/// <param name="documentListTypeFQN"></param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="list">Properties for the document list type. Document lists contain documents with an associated document type, such as web pages.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="list"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Content.DocumentListType"/>}
 		/// </returns>
diff --git a/Mozu.Api/Clients/Content/DocumentTypeClient.cs b/Mozu.Api/Clients/Content/DocumentTypeClient.cs
old mode 100644
new mode 100755
index 19bf4fa9..314f6791
--- a/Mozu.Api/Clients/Content/DocumentTypeClient.cs
+++ b/Mozu.Api/Clients/Content/DocumentTypeClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Content
 {
@@ -22,11 +23,11 @@ namespace Mozu.Api.Clients.Content
 	public partial class DocumentTypeClient 	{
 		
 		/// <summary>
-		/// Retrieves a paged list of the system-defined document types.
+		/// 
 		/// </summary>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Content.DocumentTypeCollection"/>}
 		/// </returns>
@@ -49,10 +50,10 @@ public partial class DocumentTypeClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves a system-defined document type.
+		/// 
 		/// </summary>
 		/// <param name="documentTypeName">The name of the document type to retrieve.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Content.DocumentType"/>}
 		/// </returns>
@@ -75,10 +76,10 @@ public partial class DocumentTypeClient 	{
 		}
 
 		/// <summary>
-		/// Creates a new DocumentType
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="documentType">The type of documents used in the CMS such as "web_page" or "template" or "image_url".</param>
+		/// <param name="responseFields"></param>
+		/// <param name="documentType"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Content.DocumentType"/>}
 		/// </returns>
@@ -101,11 +102,11 @@ public partial class DocumentTypeClient 	{
 		}
 
 		/// <summary>
-		/// Updates a DocumentType
+		/// 
 		/// </summary>
-		/// <param name="documentTypeName">The name of the document type to retrieve.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="documentType">The type of documents used in the CMS such as "web_page" or "template" or "image_url".</param>
+		/// <param name="documentTypeName"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="documentType"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Content.DocumentType"/>}
 		/// </returns>
diff --git a/Mozu.Api/Clients/Content/Documentlists/DocumentClient.cs b/Mozu.Api/Clients/Content/Documentlists/DocumentClient.cs
old mode 100644
new mode 100755
index 3d3a6261..52a4ebae
--- a/Mozu.Api/Clients/Content/Documentlists/DocumentClient.cs
+++ b/Mozu.Api/Clients/Content/Documentlists/DocumentClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Content.Documentlists
 {
@@ -22,10 +23,10 @@ namespace Mozu.Api.Clients.Content.Documentlists
 	public partial class DocumentClient 	{
 		
 		/// <summary>
-		/// Retrieve the content associated with a document, such as a product image or PDF specifications file, by supplying the document ID.
+		/// 
 		/// </summary>
-		/// <param name="documentId">Unique identifier for a document, used by content and document calls. Document IDs are associated with document types, document type lists, sites, and tenants.</param>
-		/// <param name="documentListName">Name of content documentListName to delete</param>
+		/// <param name="documentId">Unique identifier of the document.</param>
+		/// <param name="documentListName">The name of the document list associated with the document.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="System.IO.Stream"/>}
 		/// </returns>
@@ -48,17 +49,17 @@ public partial class DocumentClient 	{
 		}
 
 		/// <summary>
-		/// Performs transformations on a document. For example, resizing an image.
+		/// 
 		/// </summary>
-		/// <param name="crop">Crops the image based on the specified coordinates. The reference point for positive coordinates is the top-left corner of the image, and the reference point for negative coordinates is the bottom-right corner of the image.Usage: Example:  removes 10 pixels from all edges of the image.  leaves the image uncropped.</param>
-		/// <param name="documentId">Unique identifier for a document, used by content and document calls. Document IDs are associated with document types, document type lists, sites, and tenants.</param>
-		/// <param name="documentListName">Name of content documentListName to delete</param>
-		/// <param name="height">Specifies an exact height dimension for the image, in pixels.</param>
-		/// <param name="max">Specifies a pixel limitation for the largest side of an image.</param>
-		/// <param name="maxHeight">Specifies a pixel limitation for the height of the image, preserving the aspect ratio if the image needs resizing.</param>
-		/// <param name="maxWidth">Specifies a pixel limitation for the width of the image, preserving the aspect ratio if the image needs resizing.</param>
-		/// <param name="quality">Adjusts the image compression. Accepts values from 0-100, where 100 = highest quality, least compression.</param>
-		/// <param name="width">Specifies an exact width dimension for the image, in pixels.</param>
+		/// <param name="crop"></param>
+		/// <param name="documentId"></param>
+		/// <param name="documentListName"></param>
+		/// <param name="height"></param>
+		/// <param name="max"></param>
+		/// <param name="maxHeight"></param>
+		/// <param name="maxWidth"></param>
+		/// <param name="quality"></param>
+		/// <param name="width"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="System.IO.Stream"/>}
 		/// </returns>
@@ -80,12 +81,12 @@ public partial class DocumentClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves a document within the specified document list.
+		/// 
 		/// </summary>
-		/// <param name="documentId">Unique identifier for a document, used by content and document calls. Document IDs are associated with document types, document type lists, sites, and tenants.</param>
-		/// <param name="documentListName">Name of content documentListName to delete</param>
-		/// <param name="includeInactive">Include inactive content.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="documentId">Identifier of the document being retrieved.</param>
+		/// <param name="documentListName">The name of the document list associated with the document to retrieve.</param>
+		/// <param name="includeInactive"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Content.Document"/>}
 		/// </returns>
@@ -108,15 +109,15 @@ public partial class DocumentClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves a collection of documents according to any filter and sort criteria.
+		/// 
 		/// </summary>
-		/// <param name="documentListName">Name of content documentListName to delete</param>
-		/// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-		/// <param name="includeInactive">Include inactive content.</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+		/// <param name="documentListName">The name of the document list.</param>
+		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. You can filter a document's search results by any of its properties, including its name or folder path. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=Name+sw+Events"</param>
+		/// <param name="includeInactive"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Content.DocumentCollection"/>}
 		/// </returns>
@@ -139,11 +140,11 @@ public partial class DocumentClient 	{
 		}
 
 		/// <summary>
-		/// Creates a new document in an defined document list.
+		/// 
 		/// </summary>
-		/// <param name="documentListName">Name of content documentListName to delete</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="document">The document properties that define the content used by the content management system (CMS).</param>
+		/// <param name="documentListName">The descriptive alphanumeric document list name being created.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="document">The descriptive name of the newly created document.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Content.Document"/>}
 		/// </returns>
@@ -166,11 +167,11 @@ public partial class DocumentClient 	{
 		}
 
 		/// <summary>
-		/// Updates the binary data or content associated with a document, such as a product image or PDF specifications file, by supplying the document ID.
+		/// 
 		/// </summary>
-		/// <param name="documentId">Unique identifier for a document, used by content and document calls. Document IDs are associated with document types, document type lists, sites, and tenants.</param>
-		/// <param name="documentListName">Name of content documentListName to delete</param>
-		/// <param name="stream">Data stream that delivers information. Used to input and output data.</param>
+		/// <param name="documentId">Unique identifier of the document.</param>
+		/// <param name="documentListName">The name of the document list associated with the document.</param>
+		/// <param name="stream">Input output stream that delivers information.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
@@ -193,12 +194,12 @@ public static MozuClient UpdateDocumentContentClient(System.IO.Stream stream, st
 		}
 
 		/// <summary>
-		/// Updates a document in a document list.
+		/// 
 		/// </summary>
-		/// <param name="documentId">Unique identifier for a document, used by content and document calls. Document IDs are associated with document types, document type lists, sites, and tenants.</param>
-		/// <param name="documentListName">Name of content documentListName to delete</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="document">The document properties that define the content used by the content management system (CMS).</param>
+		/// <param name="documentId">Unique identifier of the document to update.</param>
+		/// <param name="documentListName">Name of the document list associated with the document.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="document">Properties of the document to update.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Content.Document"/>}
 		/// </returns>
@@ -220,10 +221,10 @@ public static MozuClient UpdateDocumentContentClient(System.IO.Stream stream, st
 		}
 
 		/// <summary>
-		/// Deletes a specific document based on the specified document ID.
+		/// 
 		/// </summary>
-		/// <param name="documentId">Unique identifier for a document, used by content and document calls. Document IDs are associated with document types, document type lists, sites, and tenants.</param>
-		/// <param name="documentListName">Name of content documentListName to delete</param>
+		/// <param name="documentId">Identifier of the document being deleted.</param>
+		/// <param name="documentListName">The name of the document list associated with the document list being deleted.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
@@ -245,10 +246,10 @@ public static MozuClient DeleteDocumentClient(string documentListName, string do
 		}
 
 		/// <summary>
-		/// Deletes the content associated with a document, such as a product image or PDF specification, by supplying the document ID.
+		/// 
 		/// </summary>
-		/// <param name="documentId">Unique identifier for a document, used by content and document calls. Document IDs are associated with document types, document type lists, sites, and tenants.</param>
-		/// <param name="documentListName">Name of content documentListName to delete</param>
+		/// <param name="documentId">Unique identifier of the document.</param>
+		/// <param name="documentListName">The name of the document list associated with the document.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
diff --git a/Mozu.Api/Clients/Content/Documentlists/DocumentTreeClient.cs b/Mozu.Api/Clients/Content/Documentlists/DocumentTreeClient.cs
old mode 100644
new mode 100755
index fb8f36ff..a067e612
--- a/Mozu.Api/Clients/Content/Documentlists/DocumentTreeClient.cs
+++ b/Mozu.Api/Clients/Content/Documentlists/DocumentTreeClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Content.Documentlists
 {
@@ -22,10 +23,10 @@ namespace Mozu.Api.Clients.Content.Documentlists
 	public partial class DocumentTreeClient 	{
 		
 		/// <summary>
-		/// Retrieve the content associated with the document, such as a product image or PDF specifications file.
+		/// 
 		/// </summary>
-		/// <param name="documentListName">Name of content documentListName to delete</param>
-		/// <param name="documentName">The name of the document in the site.</param>
+		/// <param name="documentListName">The name of the document list associated with the document.</param>
+		/// <param name="documentName">The name of the document, which is unique within its folder.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="System.IO.Stream"/>}
 		/// </returns>
@@ -48,17 +49,17 @@ public partial class DocumentTreeClient 	{
 		}
 
 		/// <summary>
-		/// Performs transformations on a document. For example, resizing an image.
+		/// 
 		/// </summary>
-		/// <param name="crop">Crops the image based on the specified coordinates. The reference point for positive coordinates is the top-left corner of the image, and the reference point for negative coordinates is the bottom-right corner of the image.Usage: Example:  removes 10 pixels from all edges of the image.  leaves the image uncropped.</param>
-		/// <param name="documentListName">Name of content documentListName to delete</param>
-		/// <param name="documentName">The name of the document in the site.</param>
-		/// <param name="height">Specifies an exact height dimension for the image, in pixels.</param>
-		/// <param name="max">Specifies a pixel limitation for the largest side of an image.</param>
-		/// <param name="maxHeight">Specifies a pixel limitation for the height of the image, preserving the aspect ratio if the image needs resizing.</param>
-		/// <param name="maxWidth">Specifies a pixel limitation for the width of the image, preserving the aspect ratio if the image needs resizing.</param>
-		/// <param name="quality">Adjusts the image compression. Accepts values from 0-100, where 100 = highest quality, least compression.</param>
-		/// <param name="width">Specifies an exact width dimension for the image, in pixels.</param>
+		/// <param name="crop"></param>
+		/// <param name="documentListName"></param>
+		/// <param name="documentName"></param>
+		/// <param name="height"></param>
+		/// <param name="max"></param>
+		/// <param name="maxHeight"></param>
+		/// <param name="maxWidth"></param>
+		/// <param name="quality"></param>
+		/// <param name="width"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="System.IO.Stream"/>}
 		/// </returns>
@@ -80,12 +81,12 @@ public partial class DocumentTreeClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves a document based on its document list and folder path in the document hierarchy.
+		/// 
 		/// </summary>
-		/// <param name="documentListName">Name of content documentListName to delete</param>
-		/// <param name="documentName">The name of the document in the site.</param>
-		/// <param name="includeInactive">Include inactive content.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="documentListName">The name of the document list associated with the document.</param>
+		/// <param name="documentName">The name of the document, which is unique within its folder.</param>
+		/// <param name="includeInactive"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Content.Document"/>}
 		/// </returns>
@@ -108,11 +109,11 @@ public partial class DocumentTreeClient 	{
 		}
 
 		/// <summary>
-		/// Updates the binary data or content associated with a document, such as a product image or PDF specifications file, by supplying the document name.
+		/// 
 		/// </summary>
-		/// <param name="documentListName">Name of content documentListName to delete</param>
-		/// <param name="documentName">The name of the document in the site.</param>
-		/// <param name="stream">Data stream that delivers information. Used to input and output data.</param>
+		/// <param name="documentListName">The name of the document list associated with the document.</param>
+		/// <param name="documentName">The name of the document, which is unique within its folder.</param>
+		/// <param name="stream">Input output stream that delivers information.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
@@ -135,11 +136,11 @@ public static MozuClient UpdateTreeDocumentContentClient(System.IO.Stream stream
 		}
 
 		/// <summary>
-		/// Deletes the content associated with a document, such as a product image or PDF specifications file.
+		/// 
 		/// </summary>
-		/// <param name="documentListName">Name of content documentListName to delete</param>
-		/// <param name="documentName">The name of the document in the site.</param>
-		/// <param name="stream">Data stream that delivers information. Used to input and output data.</param>
+		/// <param name="documentListName">The name of the document list associated with the document.</param>
+		/// <param name="documentName">The name of the document, which is unique within its folder.</param>
+		/// <param name="stream">Input output stream that delivers information.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
diff --git a/Mozu.Api/Clients/Content/Documentlists/FacetClient.cs b/Mozu.Api/Clients/Content/Documentlists/FacetClient.cs
old mode 100644
new mode 100755
index bf991e7d..b1532020
--- a/Mozu.Api/Clients/Content/Documentlists/FacetClient.cs
+++ b/Mozu.Api/Clients/Content/Documentlists/FacetClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Content.Documentlists
 {
@@ -22,9 +23,9 @@ namespace Mozu.Api.Clients.Content.Documentlists
 	public partial class FacetClient 	{
 		
 		/// <summary>
-		/// Retrieves the properties of facets that aid in indexing and searching.
+		/// 
 		/// </summary>
-		/// <param name="documentListName">Name of content documentListName to delete</param>
+		/// <param name="documentListName">The document list associated with the facets to retrieve.</param>
 		/// <param name="propertyName">The property name associated with the facets to retrieve.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.Content.Facet"/>}}
diff --git a/Mozu.Api/Clients/Content/Documentlists/ViewClient.cs b/Mozu.Api/Clients/Content/Documentlists/ViewClient.cs
old mode 100644
new mode 100755
index a8205bc1..e2854743
--- a/Mozu.Api/Clients/Content/Documentlists/ViewClient.cs
+++ b/Mozu.Api/Clients/Content/Documentlists/ViewClient.cs
@@ -13,25 +13,26 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Content.Documentlists
 {
 	/// <summary>
-	/// Properties and content for views within a site/tenant. Views provide the schema, formatting, and associated content and entities for displaying content within a site/tenant.
+	/// 
 	/// </summary>
 	public partial class ViewClient 	{
 		
 		/// <summary>
-		/// Retrieves a collection of documents associated with a view.
+		/// 
 		/// </summary>
-		/// <param name="documentListName">Name of content documentListName to delete</param>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="includeInactive">Include inactive content.</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
-		/// <param name="viewName">The name for a view. Views are used to render data in , such as document and entity lists. Each view includes a schema, format, name, ID, and associated data types to render.</param>
+		/// <param name="documentListName"></param>
+		/// <param name="filter"></param>
+		/// <param name="includeInactive"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
+		/// <param name="viewName"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Content.DocumentCollection"/>}
 		/// </returns>
diff --git a/Mozu.Api/Clients/Content/PropertyTypeClient.cs b/Mozu.Api/Clients/Content/PropertyTypeClient.cs
old mode 100644
new mode 100755
index fa5f1940..0477ec00
--- a/Mozu.Api/Clients/Content/PropertyTypeClient.cs
+++ b/Mozu.Api/Clients/Content/PropertyTypeClient.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Content
 {
@@ -22,11 +23,11 @@ namespace Mozu.Api.Clients.Content
 	public partial class PropertyTypeClient 	{
 		
 		/// <summary>
-		/// Retrieves a list of the content property types.
+		/// 
 		/// </summary>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Content.PropertyTypeCollection"/>}
 		/// </returns>
@@ -49,10 +50,10 @@ public partial class PropertyTypeClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the details of the content property type.
+		/// 
 		/// </summary>
-		/// <param name="propertyTypeName">The name of the property type.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="propertyTypeName">The name of the content property type.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Content.PropertyType"/>}
 		/// </returns>
@@ -75,10 +76,10 @@ public partial class PropertyTypeClient 	{
 		}
 
 		/// <summary>
-		/// Creates a new
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="propertyType">Property type available for content. Property types are like templates that can be reused.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="propertyType"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Content.PropertyType"/>}
 		/// </returns>
@@ -100,11 +101,11 @@ public partial class PropertyTypeClient 	{
 		}
 
 		/// <summary>
-		/// Updates a
+		/// 
 		/// </summary>
-		/// <param name="propertyTypeName">The name of the property type.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="propertyType">Property type available for content. Property types are like templates that can be reused.</param>
+		/// <param name="propertyTypeName"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="propertyType"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Content.PropertyType"/>}
 		/// </returns>
@@ -127,9 +128,9 @@ public partial class PropertyTypeClient 	{
 		}
 
 		/// <summary>
-		/// Delete a specific
+		/// 
 		/// </summary>
-		/// <param name="propertyTypeName">The name of the property type.</param>
+		/// <param name="propertyTypeName"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
diff --git a/Mozu.Api/Clients/Content/PublishSetSummaryClient.cs b/Mozu.Api/Clients/Content/PublishSetSummaryClient.cs
old mode 100644
new mode 100755
index 06dfe0f7..b6170b13
--- a/Mozu.Api/Clients/Content/PublishSetSummaryClient.cs
+++ b/Mozu.Api/Clients/Content/PublishSetSummaryClient.cs
@@ -13,20 +13,21 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Content
 {
 	/// <summary>
-	/// Use the Content Publish Set resource to manage content publish sets and the pending content drafts.You can use content publish sets to group pending content changes together and publish them all at the same time.
+	/// 
 	/// </summary>
 	public partial class PublishSetSummaryClient 	{
 		
 		/// <summary>
-		/// Returns a list of content publish sets.
+		/// 
 		/// </summary>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Content.PublishSetSummaryPagedCollection"/>}
 		/// </returns>
@@ -48,14 +49,14 @@ public partial class PublishSetSummaryClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves a list of content publish sets and their properties.
+		/// 
 		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
+		/// <param name="code"></param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Content.DocumentDraftSummaryPagedCollection"/>}
 		/// </returns>
@@ -77,11 +78,11 @@ public partial class PublishSetSummaryClient 	{
 		}
 
 		/// <summary>
-		/// Deletes the specified content publish set. You can use the shouldDiscard parameter to specify whether to discard the content drafts assigned to the content publish set.
+		/// 
 		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="shouldDiscard">Specifies whether to discard the pending content changes assigned to the content publish set when the publish set is deleted.</param>
+		/// <param name="code"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="shouldDiscard"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{object}
 		/// </returns>
@@ -103,11 +104,11 @@ public static MozuClient<object> DeletePublishSetClient(string code, bool? shoul
 		}
 
 		/// <summary>
-		/// Adds a set of documents by id to a specified publish set.
+		/// 
 		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="itemsToPublish">The details of the items that you want to add to a specified publish set.</param>
+		/// <param name="code"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="itemsToPublish"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{object}
 		/// </returns>
diff --git a/Mozu.Api/Clients/Event/EventNotificationClient.cs b/Mozu.Api/Clients/Event/EventNotificationClient.cs
old mode 100644
new mode 100755
index 04b34275..90f8379b
--- a/Mozu.Api/Clients/Event/EventNotificationClient.cs
+++ b/Mozu.Api/Clients/Event/EventNotificationClient.cs
@@ -13,20 +13,21 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Event
 {
 	/// <summary>
-	/// Events are notifications  publishes to the application when a create, read, update, or delete operation is performed. If the application subscribes to the event, you can use the Events resource to query for recent events  published to your application or events that were not published successfully.
+	/// Events are notifications Mozu publishes to the application when a create, read, update, or delete operation is performed. If the application subscribes to the event, you can use the Events resource to query for recent events Mozu published to your application or events that were not published successfully.
 	/// </summary>
 	public partial class EventNotificationClient 	{
 		
 		/// <summary>
-		/// Retrieves a list of events.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
 		/// <param name="sortBy"></param>
 		/// <param name="startIndex"></param>
 		/// <returns>
@@ -50,10 +51,10 @@ public partial class EventNotificationClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves an event by providing the event ID.
+		/// 
 		/// </summary>
 		/// <param name="eventId">The unique identifier of the event being retrieved. An event is a notification about a create, read, update, or delete on an order, product, discount or category.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Event.Event"/>}
 		/// </returns>
diff --git a/Mozu.Api/Clients/Event/Push/SubscriptionClient.cs b/Mozu.Api/Clients/Event/Push/SubscriptionClient.cs
old mode 100644
new mode 100755
index 8b4fcc19..b8bf4e30
--- a/Mozu.Api/Clients/Event/Push/SubscriptionClient.cs
+++ b/Mozu.Api/Clients/Event/Push/SubscriptionClient.cs
@@ -13,22 +13,23 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Event.Push
 {
 	/// <summary>
-	/// The Subscriptions resource triggers a push service to sent immediate notifications to the subscribed tenants and applications when triggers. The resource sends messages regarding a subscription event tha occurs in the tenant or site.
+	/// 
 	/// </summary>
 	public partial class SubscriptionClient 	{
 		
 		/// <summary>
-		/// Retrieves a list of events according to any specified filter criteria and sort options.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Event.SubscriptionCollection"/>}
 		/// </returns>
diff --git a/Mozu.Api/Clients/Event/Push/Subscriptions/EventDeliverySummaryClient.cs b/Mozu.Api/Clients/Event/Push/Subscriptions/EventDeliverySummaryClient.cs
old mode 100644
new mode 100755
index 0cd37643..0542f53e
--- a/Mozu.Api/Clients/Event/Push/Subscriptions/EventDeliverySummaryClient.cs
+++ b/Mozu.Api/Clients/Event/Push/Subscriptions/EventDeliverySummaryClient.cs
@@ -13,32 +13,33 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Event.Push.Subscriptions
 {
 	/// <summary>
-	/// Provides details for each attempted delivery of the event to the endpoint.
+	/// 
 	/// </summary>
 	public partial class EventDeliverySummaryClient 	{
 		
 		/// <summary>
-		/// This operation method is the external/public event entity used specifically in pull/poll event scenarios.
+		/// 
 		/// </summary>
-		/// <param name="id">Unique identifier of the customer segment to retrieve.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="subscriptionId">Unique identifier for a subscription, such as subscribing tenants for an event or to receive a notification.</param>
+		/// <param name="processId"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="subscriptionId">This operation paramenter is the unique identifer for a subscription.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Event.EventDeliverySummary"/>}
 		/// </returns>
 		/// <example>
 		/// <code>
-		///   var mozuClient=GetDeliveryAttemptSummary( subscriptionId,  id,  responseFields);
+		///   var mozuClient=GetDeliveryAttemptSummary( subscriptionId,  processId,  responseFields);
 		///   var eventDeliverySummaryClient = mozuClient.WithBaseAddress(url).Execute().Result();
 		/// </code>
 		/// </example>
-		public static MozuClient<Mozu.Api.Contracts.Event.EventDeliverySummary> GetDeliveryAttemptSummaryClient(string subscriptionId, int? id =  null, string responseFields =  null)
+		public static MozuClient<Mozu.Api.Contracts.Event.EventDeliverySummary> GetDeliveryAttemptSummaryClient(string subscriptionId, int? processId =  null, string responseFields =  null)
 		{
-			var url = Mozu.Api.Urls.Event.Push.Subscriptions.EventDeliverySummaryUrl.GetDeliveryAttemptSummaryUrl(subscriptionId, id, responseFields);
+			var url = Mozu.Api.Urls.Event.Push.Subscriptions.EventDeliverySummaryUrl.GetDeliveryAttemptSummaryUrl(subscriptionId, processId, responseFields);
 			const string verb = "GET";
 			var mozuClient = new MozuClient<Mozu.Api.Contracts.Event.EventDeliverySummary>()
 									.WithVerb(verb).WithResourceUrl(url)
@@ -48,14 +49,14 @@ public partial class EventDeliverySummaryClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves a collection of data for delivery attempts of events and notifications. These are notifications sent to subscribing sites and tenants. A paged list is returned sorted and filtered per the entered parameters.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
-		/// <param name="subscriptionId">Unique identifier for a subscription, such as subscribing tenants for an event or to receive a notification.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
+		/// <param name="subscriptionId"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Event.EventDeliverySummaryCollection"/>}
 		/// </returns>
diff --git a/Mozu.Api/Clients/Platform/Adminuser/AdminUserClient.cs b/Mozu.Api/Clients/Platform/Adminuser/AdminUserClient.cs
old mode 100644
new mode 100755
index 56229156..b24318b7
--- a/Mozu.Api/Clients/Platform/Adminuser/AdminUserClient.cs
+++ b/Mozu.Api/Clients/Platform/Adminuser/AdminUserClient.cs
@@ -13,18 +13,19 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Platform.Adminuser
 {
 	/// <summary>
-	/// The Accounts resource displays the user accounts and account details associated with a developer or  tenant administrator. Email addresses uniquely identify admin user accounts.
+	/// Displays the user accounts and account details associated with a developer or Mozu tenant administrator. Email addresses uniquely identify admin user accounts.
 	/// </summary>
 	public partial class AdminUserClient 	{
 		
 		/// <summary>
-		/// Retrieves a list of the  tenants or development stores for which the specified user has an assigned role.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="userId">Unique identifier of the user whose tenant scopes you want to retrieve.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Tenant.TenantCollection"/>}
@@ -47,10 +48,10 @@ public partial class AdminUserClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the details of the specified administrator user account.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="userId">Unique identifier of the user whose tenant scopes you want to retrieve.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="userId">Unique identifier of the administrator account to retrieve.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Core.User"/>}
 		/// </returns>
diff --git a/Mozu.Api/Clients/Platform/Adminuser/TenantAdminUserAuthTicketClient.cs b/Mozu.Api/Clients/Platform/Adminuser/TenantAdminUserAuthTicketClient.cs
old mode 100644
new mode 100755
index 17845459..40bec1d4
--- a/Mozu.Api/Clients/Platform/Adminuser/TenantAdminUserAuthTicketClient.cs
+++ b/Mozu.Api/Clients/Platform/Adminuser/TenantAdminUserAuthTicketClient.cs
@@ -13,20 +13,21 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Platform.Adminuser
 {
 	/// <summary>
-	/// Use the Admin User authentication tickets resource to generate and refresh authentication tickets that enable  administrator or developer account users to access development or production tenants.
+	/// Use the Admin User authentication tickets resource to generate and refresh authentication tickets that enable Mozu administrator or developer account users to access development or production tenants.
 	/// </summary>
 	public partial class TenantAdminUserAuthTicketClient 	{
 		
 		/// <summary>
-		/// Creates an authentication ticket for the supplied user to specify in API requests associated with the supplied tenant.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="tenantId">Unique identifier of the development or production tenant for which to generate the user authentication ticket.</param>
-		/// <param name="userAuthInfo">Information required to authenticate a user.</param>
+		/// <param name="userAuthInfo">The user authentication information required to generate the user authentication ticket, which consists of a user name and password.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.AdminUser.TenantAdminUserAuthTicket"/>}
 		/// </returns>
@@ -48,11 +49,11 @@ public partial class TenantAdminUserAuthTicketClient 	{
 		}
 
 		/// <summary>
-		/// Generates a new user authentication ticket for the specified tenant by supplying the user's existing refresh token information.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="tenantId"></param>
-		/// <param name="existingAuthTicket">Properties of the authentication ticket to be used in user claims with the  API.</param>
+		/// <param name="existingAuthTicket">Properties of the authentication ticket to refresh. The refresh token is required to complete this request.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.AdminUser.TenantAdminUserAuthTicket"/>}
 		/// </returns>
@@ -74,9 +75,9 @@ public partial class TenantAdminUserAuthTicketClient 	{
 		}
 
 		/// <summary>
-		/// Deletes the authentication ticket for the user by supplying the refresh token.
+		/// 
 		/// </summary>
-		/// <param name="refreshToken">Alphanumeric string used for access tokens. This token refreshes access for accounts by generating a new developer or application account authentication ticket after an access token expires.</param>
+		/// <param name="refreshToken">Refresh token string associated with the user authentication ticket.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
diff --git a/Mozu.Api/Clients/Platform/Appdev/AppPackageClient.cs b/Mozu.Api/Clients/Platform/Appdev/AppPackageClient.cs
new file mode 100755
index 00000000..63c6324a
--- /dev/null
+++ b/Mozu.Api/Clients/Platform/Appdev/AppPackageClient.cs
@@ -0,0 +1,293 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using Mozu.Api.Security;
+using System.Threading.Tasks;
+using Newtonsoft.Json.Linq;
+using System.Threading;
+
+namespace Mozu.Api.Clients.Platform.Appdev
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	public partial class AppPackageClient 	{
+		
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
+		/// <returns>
+		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.AppDev.PackageSummaryCollection"/>}
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var mozuClient=GetAllPackages( startIndex,  pageSize,  sortBy,  filter,  responseFields);
+		///   var packageSummaryCollectionClient = mozuClient.WithBaseAddress(url).Execute().Result();
+		/// </code>
+		/// </example>
+		public static MozuClient<Mozu.Api.Contracts.AppDev.PackageSummaryCollection> GetAllPackagesClient(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
+		{
+			var url = Mozu.Api.Urls.Platform.Appdev.AppPackageUrl.GetAllPackagesUrl(startIndex, pageSize, sortBy, filter, responseFields);
+			const string verb = "GET";
+			var mozuClient = new MozuClient<Mozu.Api.Contracts.AppDev.PackageSummaryCollection>()
+									.WithVerb(verb).WithResourceUrl(url)
+;
+			return mozuClient;
+
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="applicationKey"></param>
+		/// <param name="includeChildren"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="skipDevAccountCheck"></param>
+		/// <returns>
+		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.AppDev.Package"/>}
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var mozuClient=GetPackage( applicationKey,  includeChildren,  skipDevAccountCheck,  responseFields);
+		///   var packageClient = mozuClient.WithBaseAddress(url).Execute().Result();
+		/// </code>
+		/// </example>
+		public static MozuClient<Mozu.Api.Contracts.AppDev.Package> GetPackageClient(string applicationKey, bool? includeChildren =  null, bool? skipDevAccountCheck =  null, string responseFields =  null)
+		{
+			var url = Mozu.Api.Urls.Platform.Appdev.AppPackageUrl.GetPackageUrl(applicationKey, includeChildren, skipDevAccountCheck, responseFields);
+			const string verb = "GET";
+			var mozuClient = new MozuClient<Mozu.Api.Contracts.AppDev.Package>()
+									.WithVerb(verb).WithResourceUrl(url)
+;
+			return mozuClient;
+
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="applicationKey"></param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
+		/// <returns>
+		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.AppDev.PackageCollection"/>}
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var mozuClient=GetPackages( applicationKey,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
+		///   var packageCollectionClient = mozuClient.WithBaseAddress(url).Execute().Result();
+		/// </code>
+		/// </example>
+		public static MozuClient<Mozu.Api.Contracts.AppDev.PackageCollection> GetPackagesClient(string applicationKey, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
+		{
+			var url = Mozu.Api.Urls.Platform.Appdev.AppPackageUrl.GetPackagesUrl(applicationKey, startIndex, pageSize, sortBy, filter, responseFields);
+			const string verb = "GET";
+			var mozuClient = new MozuClient<Mozu.Api.Contracts.AppDev.PackageCollection>()
+									.WithVerb(verb).WithResourceUrl(url)
+;
+			return mozuClient;
+
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="appId"></param>
+		/// <returns>
+		///  <see cref="Mozu.Api.MozuClient" />{List{<see cref="Mozu.Api.Contracts.AppDev.ApplicationSummary"/>}}
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var mozuClient=GetApplicationSummaryChildren( appId);
+		///   var applicationSummaryClient = mozuClient.WithBaseAddress(url).Execute().Result();
+		/// </code>
+		/// </example>
+		public static MozuClient<List<Mozu.Api.Contracts.AppDev.ApplicationSummary>> GetApplicationSummaryChildrenClient(string appId)
+		{
+			var url = Mozu.Api.Urls.Platform.Appdev.AppPackageUrl.GetApplicationSummaryChildrenUrl(appId);
+			const string verb = "GET";
+			var mozuClient = new MozuClient<List<Mozu.Api.Contracts.AppDev.ApplicationSummary>>()
+									.WithVerb(verb).WithResourceUrl(url)
+;
+			return mozuClient;
+
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
+		/// <returns>
+		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.AppDev.ApplicationSummaryCollection"/>}
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var mozuClient=GetApplicationSummaryParents( startIndex,  pageSize,  sortBy,  filter,  responseFields);
+		///   var applicationSummaryCollectionClient = mozuClient.WithBaseAddress(url).Execute().Result();
+		/// </code>
+		/// </example>
+		public static MozuClient<Mozu.Api.Contracts.AppDev.ApplicationSummaryCollection> GetApplicationSummaryParentsClient(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
+		{
+			var url = Mozu.Api.Urls.Platform.Appdev.AppPackageUrl.GetApplicationSummaryParentsUrl(startIndex, pageSize, sortBy, filter, responseFields);
+			const string verb = "GET";
+			var mozuClient = new MozuClient<Mozu.Api.Contracts.AppDev.ApplicationSummaryCollection>()
+									.WithVerb(verb).WithResourceUrl(url)
+;
+			return mozuClient;
+
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="applicationKey"></param>
+		/// <param name="packageName"></param>
+		/// <param name="responseFields"></param>
+		/// <returns>
+		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.AppDev.Package"/>}
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var mozuClient=ClonePackage( applicationKey,  packageName,  responseFields);
+		///   var packageClient = mozuClient.WithBaseAddress(url).Execute().Result();
+		/// </code>
+		/// </example>
+		public static MozuClient<Mozu.Api.Contracts.AppDev.Package> ClonePackageClient(string applicationKey, string packageName, string responseFields =  null)
+		{
+			var url = Mozu.Api.Urls.Platform.Appdev.AppPackageUrl.ClonePackageUrl(applicationKey, packageName, responseFields);
+			const string verb = "POST";
+			var mozuClient = new MozuClient<Mozu.Api.Contracts.AppDev.Package>()
+									.WithVerb(verb).WithResourceUrl(url)
+;
+			return mozuClient;
+
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="responseFields"></param>
+		/// <param name="packageRequest"></param>
+		/// <returns>
+		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.AppDev.Package"/>}
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var mozuClient=CreateNewCorePackage( packageRequest,  responseFields);
+		///   var packageClient = mozuClient.WithBaseAddress(url).Execute().Result();
+		/// </code>
+		/// </example>
+		public static MozuClient<Mozu.Api.Contracts.AppDev.Package> CreateNewCorePackageClient(Mozu.Api.Contracts.AppDev.PackageRequest packageRequest, string responseFields =  null)
+		{
+			var url = Mozu.Api.Urls.Platform.Appdev.AppPackageUrl.CreateNewCorePackageUrl(responseFields);
+			const string verb = "POST";
+			var mozuClient = new MozuClient<Mozu.Api.Contracts.AppDev.Package>()
+									.WithVerb(verb).WithResourceUrl(url)
+									.WithBody<Mozu.Api.Contracts.AppDev.PackageRequest>(packageRequest);
+			return mozuClient;
+
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="projectId"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="package"></param>
+		/// <returns>
+		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.AppDev.Package"/>}
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var mozuClient=CreatePackage( pkg,  projectId,  responseFields);
+		///   var packageClient = mozuClient.WithBaseAddress(url).Execute().Result();
+		/// </code>
+		/// </example>
+		public static MozuClient<Mozu.Api.Contracts.AppDev.Package> CreatePackageClient(Mozu.Api.Contracts.AppDev.Package pkg, int? projectId =  null, string responseFields =  null)
+		{
+			var url = Mozu.Api.Urls.Platform.Appdev.AppPackageUrl.CreatePackageUrl(projectId, responseFields);
+			const string verb = "POST";
+			var mozuClient = new MozuClient<Mozu.Api.Contracts.AppDev.Package>()
+									.WithVerb(verb).WithResourceUrl(url)
+									.WithBody<Mozu.Api.Contracts.AppDev.Package>(pkg);
+			return mozuClient;
+
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="applicationKey"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="package"></param>
+		/// <returns>
+		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.AppDev.Package"/>}
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var mozuClient=UpdatePackage( pkg,  applicationKey,  responseFields);
+		///   var packageClient = mozuClient.WithBaseAddress(url).Execute().Result();
+		/// </code>
+		/// </example>
+		public static MozuClient<Mozu.Api.Contracts.AppDev.Package> UpdatePackageClient(Mozu.Api.Contracts.AppDev.Package pkg, string applicationKey, string responseFields =  null)
+		{
+			var url = Mozu.Api.Urls.Platform.Appdev.AppPackageUrl.UpdatePackageUrl(applicationKey, responseFields);
+			const string verb = "PUT";
+			var mozuClient = new MozuClient<Mozu.Api.Contracts.AppDev.Package>()
+									.WithVerb(verb).WithResourceUrl(url)
+									.WithBody<Mozu.Api.Contracts.AppDev.Package>(pkg);
+			return mozuClient;
+
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="applicationKey"></param>
+		/// <returns>
+		///  <see cref="Mozu.Api.MozuClient" />
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var mozuClient=DeletePackage( applicationKey);
+		///mozuClient.WithBaseAddress(url).Execute();
+		/// </code>
+		/// </example>
+		public static MozuClient DeletePackageClient(string applicationKey)
+		{
+			var url = Mozu.Api.Urls.Platform.Appdev.AppPackageUrl.DeletePackageUrl(applicationKey);
+			const string verb = "DELETE";
+			var mozuClient = new MozuClient()
+									.WithVerb(verb).WithResourceUrl(url)
+;
+			return mozuClient;
+
+		}
+
+
+	}
+
+}
+
+
diff --git a/Mozu.Api/Clients/Platform/Appdev/PackageClient.cs b/Mozu.Api/Clients/Platform/Appdev/PackageClient.cs
old mode 100644
new mode 100755
index 24e864b3..7d0a301c
--- a/Mozu.Api/Clients/Platform/Appdev/PackageClient.cs
+++ b/Mozu.Api/Clients/Platform/Appdev/PackageClient.cs
@@ -13,18 +13,19 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Platform.Appdev
 {
 	/// <summary>
-	/// This resource is not public.
+	/// 
 	/// </summary>
 	public partial class PackageClient 	{
 		
 		/// <summary>
-		/// This operation is not public.
+		/// 
 		/// </summary>
-		/// <param name="applicationKey">The application key uniquely identifies the developer namespace, application ID, version, and package in Dev Center. The format is {Dev Account namespace}.{Application ID}.{Application Version}.{Package name}. </param>
+		/// <param name="applicationKey"></param>
 		/// <param name="fileName"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="System.IO.Stream"/>}
diff --git a/Mozu.Api/Clients/Platform/ApplicationClient.cs b/Mozu.Api/Clients/Platform/ApplicationClient.cs
old mode 100644
new mode 100755
index c2e85862..4a094ab3
--- a/Mozu.Api/Clients/Platform/ApplicationClient.cs
+++ b/Mozu.Api/Clients/Platform/ApplicationClient.cs
@@ -13,19 +13,20 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Platform
 {
 	/// <summary>
-	/// Use the Developer resource to view and update information and files related to application packages.
+	/// 
 	/// </summary>
 	public partial class ApplicationClient 	{
 		
 		/// <summary>
-		/// Returns a collection of package names for the application specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="applicationKey">The application key uniquely identifies the developer namespace, application ID, version, and package in Dev Center. The format is {Dev Account namespace}.{Application ID}.{Application Version}.{Package name}.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="applicationKey"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.AppDev.PackageNamesCollection"/>}
 		/// </returns>
@@ -47,10 +48,10 @@ public partial class ApplicationClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the available versions for the application specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="nsAndAppId">The application key uniquely identifies the developer namespace, application ID, version, and package in Dev Center. The format is {Dev Account namespace}.{Application ID}.{Application Version}.{Package name}.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="nsAndAppId"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.AppDev.ApplicationVersionsCollection"/>}
 		/// </returns>
@@ -72,11 +73,11 @@ public partial class ApplicationClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the metadata for a file in an application package.
+		/// 
 		/// </summary>
-		/// <param name="applicationKey">The application key uniquely identifies the developer namespace, application ID, version, and package in Dev Center. The format is {Dev Account namespace}.{Application ID}.{Application Version}.{Package name}.</param>
-		/// <param name="filepath">Represents the file name and location.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="applicationKey"></param>
+		/// <param name="filepath"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.AppDev.FileMetadata"/>}
 		/// </returns>
@@ -98,10 +99,10 @@ public partial class ApplicationClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the metadata for a folder in an application package.
+		/// 
 		/// </summary>
-		/// <param name="applicationKey">The application key uniquely identifies the developer namespace, application ID, version, and package in Dev Center. The format is {Dev Account namespace}.{Application ID}.{Application Version}.{Package name}.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="applicationKey"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.AppDev.FolderMetadata"/>}
 		/// </returns>
@@ -123,13 +124,13 @@ public partial class ApplicationClient 	{
 		}
 
 		/// <summary>
-		/// Insert or update the specified file into the specified application package.
+		/// 
 		/// </summary>
-		/// <param name="applicationKey">The application key uniquely identifies the developer namespace, application ID, version, and package in Dev Center. The format is {Dev Account namespace}.{Application ID}.{Application Version}.{Package name}.</param>
-		/// <param name="filepath">The application key uniquely identifies the developer namespace, application ID, version, and package in Dev Center. The format is {Dev Account namespace}.{Application ID}.{Application Version}.{Package name}.</param>
-		/// <param name="lastModifiedTime">The date and time of the last file insert or update. This parameter is optional.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="stream">Data stream that delivers information. Used to input and output data.</param>
+		/// <param name="applicationKey"></param>
+		/// <param name="filepath"></param>
+		/// <param name="lastModifiedTime"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="stream"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.AppDev.FileMetadata"/>}
 		/// </returns>
@@ -152,11 +153,11 @@ public partial class ApplicationClient 	{
 		}
 
 		/// <summary>
-		/// Renames a file in an application package.
+		/// 
 		/// </summary>
-		/// <param name="applicationKey">The application key uniquely identifies the developer namespace, application ID, version, and package in Dev Center. The format is {Dev Account namespace}.{Application ID}.{Application Version}.{Package name}.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="renameInfo">Information required to update the name of a file in a package, which consists of the original name and the new name.</param>
+		/// <param name="applicationKey"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="renameInfo"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.AppDev.FileMetadata"/>}
 		/// </returns>
@@ -178,10 +179,10 @@ public partial class ApplicationClient 	{
 		}
 
 		/// <summary>
-		/// Deletes the specified file from the specified application package.
+		/// 
 		/// </summary>
-		/// <param name="applicationKey">The application key uniquely identifies the developer namespace, application ID, version, and package in Dev Center. The format is {Dev Account namespace}.{Application ID}.{Application Version}.{Package name}.</param>
-		/// <param name="filepath">Represents the file name and location.</param>
+		/// <param name="applicationKey"></param>
+		/// <param name="filepath"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
diff --git a/Mozu.Api/Clients/Platform/Applications/AuthTicketClient.cs b/Mozu.Api/Clients/Platform/Applications/AuthTicketClient.cs
old mode 100644
new mode 100755
index 15e95926..6cd1d71a
--- a/Mozu.Api/Clients/Platform/Applications/AuthTicketClient.cs
+++ b/Mozu.Api/Clients/Platform/Applications/AuthTicketClient.cs
@@ -13,19 +13,20 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Platform.Applications
 {
 	/// <summary>
-	/// Use the Authetickets for applications resource to manage authentication tickets for your apps.
+	/// Use this resource to manage authentication tickets for your applications.
 	/// </summary>
 	public partial class AuthTicketClient 	{
 		
 		/// <summary>
-		/// Generate an authentication ticket for an application.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="appAuthInfo">The information required to authenticate third party applications against the  API.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="appAuthInfo">Authentication information required to generate an authentication ticket includes the application id and the shared secret.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.AppDev.AuthTicket"/>}
 		/// </returns>
@@ -47,10 +48,10 @@ public partial class AuthTicketClient 	{
 		}
 
 		/// <summary>
-		/// Refreshes the application's authentication ticket and generates a new access token by providing the refresh token string.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="authTicketRequest">Properties of the authentication ticket refresh requests, which includes the refresh token string.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="authTicketRequest">The refresh token string required to update the application authentication ticket.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.AppDev.AuthTicket"/>}
 		/// </returns>
@@ -72,9 +73,9 @@ public partial class AuthTicketClient 	{
 		}
 
 		/// <summary>
-		/// Deletes an authentication for an application based on the specified refresh token.
+		/// 
 		/// </summary>
-		/// <param name="refreshToken">Alphanumeric string used for access tokens. This token refreshes access for accounts by generating a new developer or application account authentication ticket after an access token expires.</param>
+		/// <param name="refreshToken">The refresh token string from the application's authentication ticket.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
diff --git a/Mozu.Api/Clients/Platform/Developer/DeveloperAdminUserAuthTicketClient.cs b/Mozu.Api/Clients/Platform/Developer/DeveloperAdminUserAuthTicketClient.cs
old mode 100644
new mode 100755
index f1e16574..1c9aea5d
--- a/Mozu.Api/Clients/Platform/Developer/DeveloperAdminUserAuthTicketClient.cs
+++ b/Mozu.Api/Clients/Platform/Developer/DeveloperAdminUserAuthTicketClient.cs
@@ -13,20 +13,21 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Platform.Developer
 {
 	/// <summary>
-	/// Use the Authtickets resource to manage authentication tickets for your developer account.
+	/// Use this resource to manage authentication tickets for your developer account.
 	/// </summary>
 	public partial class DeveloperAdminUserAuthTicketClient 	{
 		
 		/// <summary>
-		/// Generate an authentication ticket for a developer account.
+		/// 
 		/// </summary>
 		/// <param name="developerAccountId">Unique identifier of the developer account.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="userAuthInfo">Information required to authenticate a user.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="userAuthInfo">The user authentication information required to generate the developer account user authentication ticket, which consists of a user name and password.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.AdminUser.DeveloperAdminUserAuthTicket"/>}
 		/// </returns>
@@ -48,11 +49,11 @@ public partial class DeveloperAdminUserAuthTicketClient 	{
 		}
 
 		/// <summary>
-		/// Generates a new developer account authentication ticket for the specified tenant by supplying the defined refresh token information.
+		/// 
 		/// </summary>
 		/// <param name="developerAccountId">Unique identifier of the developer account.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="existingAuthTicket">Properties of the authentication ticket to be used in developer account claims with the  API.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="existingAuthTicket">Properties of the authentication ticket to refresh. The refresh token is required to complete this request.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.AdminUser.DeveloperAdminUserAuthTicket"/>}
 		/// </returns>
@@ -74,9 +75,9 @@ public partial class DeveloperAdminUserAuthTicketClient 	{
 		}
 
 		/// <summary>
-		/// Deletes the authentication ticket for the developer account by supplying the refresh token.
+		/// 
 		/// </summary>
-		/// <param name="refreshToken">Alphanumeric string used for access tokens. This token refreshes access for accounts by generating a new developer or application account authentication ticket after an access token expires.</param>
+		/// <param name="refreshToken">Refresh token string associated with the developer account authentication ticket.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
diff --git a/Mozu.Api/Clients/Platform/EntityListClient.cs b/Mozu.Api/Clients/Platform/EntityListClient.cs
old mode 100644
new mode 100755
index 622e83de..1c7c9e64
--- a/Mozu.Api/Clients/Platform/EntityListClient.cs
+++ b/Mozu.Api/Clients/Platform/EntityListClient.cs
@@ -13,22 +13,23 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Platform
 {
 	/// <summary>
-	/// The Entity Lists resource manages all dynamic entities in your  document store of the  cloud. The content is JSON and can have up to five indexed properties (integer, decimal, string, date, and boolean) with support for additional customized elements as needed. Every document in the entity list has a validated unique ID.
+	/// 
 	/// </summary>
 	public partial class EntityListClient 	{
 		
 		/// <summary>
-		/// Get a filtered list of EntityLists for a specific tenant.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.MZDB.EntityListCollection"/>}
 		/// </returns>
@@ -50,10 +51,10 @@ public partial class EntityListClient 	{
 		}
 
 		/// <summary>
-		/// Get an existing EntityList definition for a specific tenant
+		/// 
 		/// </summary>
-		/// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="entityListFullName"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.MZDB.EntityList"/>}
 		/// </returns>
@@ -75,10 +76,10 @@ public partial class EntityListClient 	{
 		}
 
 		/// <summary>
-		/// Create a new EntityList for a specific tenant.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="entityList">The definition of an MZDB EntityList which describes the characteristics of the EntityList on a per tenant basis. EntityLists are created at the tenant level, but instances of the EntityLists are implicitly created at the appropriate context level as entities are added or removed from the EntityList.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="entityList"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.MZDB.EntityList"/>}
 		/// </returns>
@@ -100,11 +101,11 @@ public partial class EntityListClient 	{
 		}
 
 		/// <summary>
-		/// Update an existing Entitylist for a specific tenant.
+		/// 
 		/// </summary>
-		/// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="entityList">The definition of an MZDB EntityList which describes the characteristics of the EntityList on a per tenant basis. EntityLists are created at the tenant level, but instances of the EntityLists are implicitly created at the appropriate context level as entities are added or removed from the EntityList.</param>
+		/// <param name="entityListFullName"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="entityList"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.MZDB.EntityList"/>}
 		/// </returns>
@@ -126,9 +127,9 @@ public partial class EntityListClient 	{
 		}
 
 		/// <summary>
-		/// Delete an existing EntityList for a specific tenant. This will also delete all Entities in all instances of this EntityList for the tenant.
+		/// 
 		/// </summary>
-		/// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
+		/// <param name="entityListFullName"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
diff --git a/Mozu.Api/Clients/Platform/Entitylists/EntityClient.cs b/Mozu.Api/Clients/Platform/Entitylists/EntityClient.cs
old mode 100644
new mode 100755
index aa439ff5..ef33cd1a
--- a/Mozu.Api/Clients/Platform/Entitylists/EntityClient.cs
+++ b/Mozu.Api/Clients/Platform/Entitylists/EntityClient.cs
@@ -13,20 +13,21 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Platform.Entitylists
 {
 	/// <summary>
-	/// Entities are JSON entries within the MZDB ( Mongo DB) for handling large data sets to heavily filter (&gt;2,000 items). Each entity is associated to an EntityList with schema, rules, and formatting for storing the content. This content can be accessed via the  API and  Hypr tags.
+	/// 
 	/// </summary>
 	public partial class EntityClient 	{
 		
 		/// <summary>
-		/// Retrieves an entity with an associated entity list and context level at tenant, master catalog, catalog, or site. 
+		/// 
 		/// </summary>
-		/// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-		/// <param name="id">Unique identifier of the customer segment to retrieve.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="entityListFullName"></param>
+		/// <param name="id"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{JObject}
 		/// </returns>
@@ -48,14 +49,14 @@ public static MozuClient<JObject> GetEntityClient(string entityListFullName, str
 		}
 
 		/// <summary>
-		/// Retrieves a collection of entities with an associated entity list and context level at tenant, master catalog, catalog, or site. 
+		/// 
 		/// </summary>
-		/// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
+		/// <param name="entityListFullName"></param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.MZDB.EntityCollection"/>}
 		/// </returns>
@@ -77,11 +78,11 @@ public static MozuClient<JObject> GetEntityClient(string entityListFullName, str
 		}
 
 		/// <summary>
-		/// Inserts a new entity per the entered item, the entity list full name, and associated response fields. 
+		/// 
 		/// </summary>
-		/// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="item">JSON code for objects.</param>
+		/// <param name="entityListFullName"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="item"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{JObject}
 		/// </returns>
@@ -103,12 +104,12 @@ public static MozuClient<JObject> InsertEntityClient(JObject item, string entity
 		}
 
 		/// <summary>
-		/// Updates the content and associations for an existing entity.
+		/// 
 		/// </summary>
-		/// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-		/// <param name="id">Unique identifier of the customer segment to retrieve.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="item">JSON code for objects.</param>
+		/// <param name="entityListFullName"></param>
+		/// <param name="id"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="item"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{JObject}
 		/// </returns>
@@ -130,10 +131,10 @@ public static MozuClient<JObject> UpdateEntityClient(JObject item, string entity
 		}
 
 		/// <summary>
-		/// Deletes an entity depending on the context of tenant, master catalog, catalog, or site level. Entities are associated to an entity list (schema and formatting) for displaying within a namespace and context level.
+		/// 
 		/// </summary>
-		/// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-		/// <param name="id">Unique identifier of the customer segment to retrieve.</param>
+		/// <param name="entityListFullName"></param>
+		/// <param name="id"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
diff --git a/Mozu.Api/Clients/Platform/Entitylists/EntityContainerClient.cs b/Mozu.Api/Clients/Platform/Entitylists/EntityContainerClient.cs
old mode 100644
new mode 100755
index f94d9206..10e81748
--- a/Mozu.Api/Clients/Platform/Entitylists/EntityContainerClient.cs
+++ b/Mozu.Api/Clients/Platform/Entitylists/EntityContainerClient.cs
@@ -13,20 +13,21 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Platform.Entitylists
 {
 	/// <summary>
-	/// Entity containers provide all properties and data for entities within a site/tenant. This data encapsulates all associated IDs including entity lists, entity views, site, tenant, entities, and more.
+	/// 
 	/// </summary>
 	public partial class EntityContainerClient 	{
 		
 		/// <summary>
-		/// Retrieves an entity container, providing all schema and rules and associated IDs for entities.
+		/// 
 		/// </summary>
-		/// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-		/// <param name="id">Unique identifier of the customer segment to retrieve.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="entityListFullName"></param>
+		/// <param name="id"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.MZDB.EntityContainer"/>}
 		/// </returns>
@@ -48,14 +49,14 @@ public partial class EntityContainerClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves a collection of entity containers. Each container holds a set of entities per ID. 
+		/// 
 		/// </summary>
-		/// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
+		/// <param name="entityListFullName"></param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.MZDB.EntityContainerCollection"/>}
 		/// </returns>
diff --git a/Mozu.Api/Clients/Platform/Entitylists/ListViewClient.cs b/Mozu.Api/Clients/Platform/Entitylists/ListViewClient.cs
old mode 100644
new mode 100755
index 181d46f6..5279fde2
--- a/Mozu.Api/Clients/Platform/Entitylists/ListViewClient.cs
+++ b/Mozu.Api/Clients/Platform/Entitylists/ListViewClient.cs
@@ -13,21 +13,22 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Platform.Entitylists
 {
 	/// <summary>
-	/// Provides settings and options for displaying associated content within a context level of site, tenant, catalog, or master catalog. ListViews can be associated with entity lists and entities.
+	/// 
 	/// </summary>
 	public partial class ListViewClient 	{
 		
 		/// <summary>
-		/// Retrieves a view for associated entities. A view provides display context levels (site, tenant, catalog, master catalog) and settings.
+		/// 
 		/// </summary>
-		/// <param name="entityId">Unique identifier for an entity, which defines the schema, rules, and formats for JSON entities within the MZDB ( Mongo DB).</param>
-		/// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="viewName">The name for a view. Views are used to render data in , such as document and entity lists. Each view includes a schema, format, name, ID, and associated data types to render.</param>
+		/// <param name="entityId"></param>
+		/// <param name="entityListFullName"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="viewName"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{JObject}
 		/// </returns>
@@ -49,14 +50,14 @@ public static MozuClient<JObject> GetViewEntityClient(string entityListFullName,
 		}
 
 		/// <summary>
-		/// Retrieves a collection of views for associated entities. Each view provides display context levels (site, tenant, catalog, master catalog) and settings.
+		/// 
 		/// </summary>
-		/// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
-		/// <param name="viewName">The name for a view. Views are used to render data in , such as document and entity lists. Each view includes a schema, format, name, ID, and associated data types to render.</param>
+		/// <param name="entityListFullName"></param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="startIndex"></param>
+		/// <param name="viewName"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.MZDB.EntityCollection"/>}
 		/// </returns>
@@ -78,12 +79,12 @@ public static MozuClient<JObject> GetViewEntityClient(string entityListFullName,
 		}
 
 		/// <summary>
-		/// Retrieves a collection of container data for creating and displaying a view of entities. 
+		/// 
 		/// </summary>
-		/// <param name="entityId">Unique identifier for an entity, which defines the schema, rules, and formats for JSON entities within the MZDB ( Mongo DB).</param>
-		/// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="viewName">The name for a view. Views are used to render data in , such as document and entity lists. Each view includes a schema, format, name, ID, and associated data types to render.</param>
+		/// <param name="entityId"></param>
+		/// <param name="entityListFullName"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="viewName"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.MZDB.EntityContainer"/>}
 		/// </returns>
@@ -105,14 +106,14 @@ public static MozuClient<JObject> GetViewEntityClient(string entityListFullName,
 		}
 
 		/// <summary>
-		/// Retrieves a collection of container data for creating and displaying a view of entities. 
+		/// 
 		/// </summary>
-		/// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
-		/// <param name="viewName">The name for a view. Views are used to render data in , such as document and entity lists. Each view includes a schema, format, name, ID, and associated data types to render.</param>
+		/// <param name="entityListFullName"></param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="startIndex"></param>
+		/// <param name="viewName"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.MZDB.EntityContainerCollection"/>}
 		/// </returns>
@@ -134,11 +135,11 @@ public static MozuClient<JObject> GetViewEntityClient(string entityListFullName,
 		}
 
 		/// <summary>
-		/// Retrieves a specific `EntityListView`. These views provide schema, rules, and formatting for all associated entities. 
+		/// 
 		/// </summary>
-		/// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="viewName">The name for a view. Views are used to render data in , such as document and entity lists. Each view includes a schema, format, name, ID, and associated data types to render.</param>
+		/// <param name="entityListFullName"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="viewName"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.MZDB.ListView"/>}
 		/// </returns>
@@ -160,10 +161,10 @@ public static MozuClient<JObject> GetViewEntityClient(string entityListFullName,
 		}
 
 		/// <summary>
-		/// Retrieves a collection of `EntityListViews`. These views provide schema, rules, and formatting for all associated entities. 
+		/// 
 		/// </summary>
-		/// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="entityListFullName"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.MZDB.ListViewCollection"/>}
 		/// </returns>
@@ -185,11 +186,11 @@ public static MozuClient<JObject> GetViewEntityClient(string entityListFullName,
 		}
 
 		/// <summary>
-		/// Creates an entity list view. Each view provides display context levels (site, tenant, catalog, master catalog) and settings for the list of entities.
+		/// 
 		/// </summary>
-		/// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="listView">Properties for the list view that specifies what fields and content display per page load. All associated fields in the list view correspond with object data.</param>
+		/// <param name="entityListFullName"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="listView"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.MZDB.ListView"/>}
 		/// </returns>
@@ -211,12 +212,12 @@ public static MozuClient<JObject> GetViewEntityClient(string entityListFullName,
 		}
 
 		/// <summary>
-		/// Updates an existing entity list view. Each view provides display context levels (site, tenant, catalog, master catalog) and settings for the list of entities.
+		/// 
 		/// </summary>
-		/// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="viewName">The name for a view. Views are used to render data in , such as document and entity lists. Each view includes a schema, format, name, ID, and associated data types to render.</param>
-		/// <param name="listView">Properties for the list view that specifies what fields and content display per page load. All associated fields in the list view correspond with object data.</param>
+		/// <param name="entityListFullName"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="viewName"></param>
+		/// <param name="listView"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.MZDB.ListView"/>}
 		/// </returns>
@@ -238,10 +239,10 @@ public static MozuClient<JObject> GetViewEntityClient(string entityListFullName,
 		}
 
 		/// <summary>
-		/// Deletes an entity list view. Any associated entities have the association removed.
+		/// 
 		/// </summary>
-		/// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-		/// <param name="viewName">The name for a view. Views are used to render data in , such as document and entity lists. Each view includes a schema, format, name, ID, and associated data types to render.</param>
+		/// <param name="entityListFullName"></param>
+		/// <param name="viewName"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
diff --git a/Mozu.Api/Clients/Platform/Extensions/CredentialStoreEntryClient.cs b/Mozu.Api/Clients/Platform/Extensions/CredentialStoreEntryClient.cs
old mode 100644
new mode 100755
index 7eb47a22..93cf2293
--- a/Mozu.Api/Clients/Platform/Extensions/CredentialStoreEntryClient.cs
+++ b/Mozu.Api/Clients/Platform/Extensions/CredentialStoreEntryClient.cs
@@ -13,16 +13,17 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Platform.Extensions
 {
 	/// <summary>
-	/// The CredentialStore resource allows you to encrypt and store sensitive data on your tenant. You can then decrypt and access that data using an Arc.js application, as described in the Arc.js [Programming Patterns](https://www.mozu.com/docs/developer/arcjs-guides/programming-patterns.htm#securely_store_and_access_sensitive_data) topic.
+	/// 
 	/// </summary>
 	public partial class CredentialStoreEntryClient 	{
 		
 		/// <summary>
-		/// Encrypts and stores data contained in the  JSON object. You can decrypt and access the secured data using an Arc.js application, as described in the Arc.js [Programming Patterns](https://www.mozu.com/docs/developer/arcjs-guides/programming-patterns.htm#securely_store_and_access_sensitive_data) topic.
+		/// 
 		/// </summary>
 		/// <param name="credentials"></param>
 		/// <returns>
diff --git a/Mozu.Api/Clients/Platform/InstalledApplicationsClient.cs b/Mozu.Api/Clients/Platform/InstalledApplicationsClient.cs
new file mode 100755
index 00000000..855d8d93
--- /dev/null
+++ b/Mozu.Api/Clients/Platform/InstalledApplicationsClient.cs
@@ -0,0 +1,81 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using Mozu.Api.Security;
+using System.Threading.Tasks;
+using Newtonsoft.Json.Linq;
+using System.Threading;
+
+namespace Mozu.Api.Clients.Platform
+{
+	/// <summary>
+	/// Use the Applications resource to update and retrieve details about the applications installed for your tenant.
+	/// </summary>
+	public partial class InstalledApplicationsClient 	{
+		
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="appId">The application ID that represents the application to retrieve.</param>
+		/// <param name="responseFields"></param>
+		/// <returns>
+		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.InstalledApplications.Application"/>}
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var mozuClient=GetApplication( appId,  responseFields);
+		///   var applicationClient = mozuClient.WithBaseAddress(url).Execute().Result();
+		/// </code>
+		/// </example>
+		public static MozuClient<Mozu.Api.Contracts.InstalledApplications.Application> GetApplicationClient(string appId, string responseFields =  null)
+		{
+			var url = Mozu.Api.Urls.Platform.InstalledApplicationsUrl.GetApplicationUrl(appId, responseFields);
+			const string verb = "GET";
+			var mozuClient = new MozuClient<Mozu.Api.Contracts.InstalledApplications.Application>()
+									.WithVerb(verb).WithResourceUrl(url)
+;
+			return mozuClient;
+
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="appId">The application ID that represents the application to update.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="application">Properties of the application to update.</param>
+		/// <returns>
+		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.InstalledApplications.Application"/>}
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var mozuClient=UpdateApplication( application,  appId,  responseFields);
+		///   var applicationClient = mozuClient.WithBaseAddress(url).Execute().Result();
+		/// </code>
+		/// </example>
+		public static MozuClient<Mozu.Api.Contracts.InstalledApplications.Application> UpdateApplicationClient(Mozu.Api.Contracts.InstalledApplications.Application application, string appId, string responseFields =  null)
+		{
+			var url = Mozu.Api.Urls.Platform.InstalledApplicationsUrl.UpdateApplicationUrl(appId, responseFields);
+			const string verb = "PUT";
+			var mozuClient = new MozuClient<Mozu.Api.Contracts.InstalledApplications.Application>()
+									.WithVerb(verb).WithResourceUrl(url)
+									.WithBody<Mozu.Api.Contracts.InstalledApplications.Application>(application);
+			return mozuClient;
+
+		}
+
+
+	}
+
+}
+
+
diff --git a/Mozu.Api/Clients/Platform/ReferenceDataClient.cs b/Mozu.Api/Clients/Platform/ReferenceDataClient.cs
old mode 100644
new mode 100755
index 4dd50be5..41f5061d
--- a/Mozu.Api/Clients/Platform/ReferenceDataClient.cs
+++ b/Mozu.Api/Clients/Platform/ReferenceDataClient.cs
@@ -13,19 +13,20 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Platform
 {
 	/// <summary>
-	/// The Reference resource retrieves collections of standards the  system currently supports. This includes content locales, top-level domains, units of measure, countries, currencies, time zones, and shipping or billing address schemas.
+	/// The Reference resource retrieves collections of standards the Mozu system currently supports. This includes content locales, top-level domains, units of measure, countries, currencies, time zones, and shipping or billing address schemas.
 	/// </summary>
 	public partial class ReferenceDataClient 	{
 		
 		/// <summary>
-		/// Retrieves a specific address schema based on the country code provided. This operation allows the creation of custom shipping and billing address fields.
+		/// 
 		/// </summary>
-		/// <param name="countryCode">The 2-letter geographic code representing the country for the physical or mailing address. Currently limited to the US.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="countryCode">The 2-letter country code used to retrieve a specified address schema.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Reference.AddressSchema"/>}
 		/// </returns>
@@ -47,9 +48,9 @@ public partial class ReferenceDataClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the entire list of address schemas that the system supports.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Reference.AddressSchemaCollection"/>}
 		/// </returns>
@@ -71,10 +72,10 @@ public partial class ReferenceDataClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the details of a behavior based on the behavior ID specified in the request.
+		/// 
 		/// </summary>
 		/// <param name="behaviorId">Unique identifier of the behavior.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Core.Behavior"/>}
 		/// </returns>
@@ -96,10 +97,10 @@ public partial class ReferenceDataClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the details of the behavior category specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="categoryId">Unique identifier of the category to modify.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="categoryId">Unique identifier of the behavior category.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Core.BehaviorCategory"/>}
 		/// </returns>
@@ -121,9 +122,9 @@ public partial class ReferenceDataClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the list of behavior categories.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Core.BehaviorCategoryCollection"/>}
 		/// </returns>
@@ -145,9 +146,9 @@ public partial class ReferenceDataClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves a list of application behaviors.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="userType">The user type associated with the behaviors to retrieve.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Core.BehaviorCollection"/>}
@@ -170,9 +171,9 @@ public partial class ReferenceDataClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the list of content locales the system supports. Content locales indicate the language used and the country where the language is used.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Reference.ContentLocaleCollection"/>}
 		/// </returns>
@@ -194,9 +195,9 @@ public partial class ReferenceDataClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the entire list of countries that the system supports.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Reference.CountryCollection"/>}
 		/// </returns>
@@ -218,9 +219,9 @@ public partial class ReferenceDataClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the entire list of countries that the system supports.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Reference.CountryWithStatesCollection"/>}
 		/// </returns>
@@ -242,9 +243,9 @@ public partial class ReferenceDataClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the entire list of currencies that the system supports.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Reference.CurrencyCollection"/>}
 		/// </returns>
@@ -266,9 +267,9 @@ public partial class ReferenceDataClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the entire list of time zones that the system supports.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Reference.TimeZoneCollection"/>}
 		/// </returns>
@@ -290,9 +291,9 @@ public partial class ReferenceDataClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves the entire list of top-level internet domains that the system supports.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Reference.TopLevelDomainCollection"/>}
 		/// </returns>
@@ -314,10 +315,10 @@ public partial class ReferenceDataClient 	{
 		}
 
 		/// <summary>
-		/// Retrieves an array list of all units of measure the system supports.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="filter"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Reference.UnitOfMeasureCollection"/>}
 		/// </returns>
diff --git a/Mozu.Api/Clients/Platform/SecureAppDataClient.cs b/Mozu.Api/Clients/Platform/SecureAppDataClient.cs
old mode 100644
new mode 100755
index 01dd55c9..1d80bf1a
--- a/Mozu.Api/Clients/Platform/SecureAppDataClient.cs
+++ b/Mozu.Api/Clients/Platform/SecureAppDataClient.cs
@@ -13,20 +13,21 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Platform
 {
 	/// <summary>
-	/// Manage Secure App Settings. Expose via arc.js so that arc apps can securely access secrets. Third-party extensions can also access their data. Secured via AppKey.AppId
+	/// 
 	/// </summary>
 	public partial class SecureAppDataClient 	{
 		
 		/// <summary>
-		/// platform-secureappdata Get GetDBValue description DOCUMENT_HERE 
+		/// 
 		/// </summary>
 		/// <param name="appKeyId"></param>
-		/// <param name="dbEntryQuery">The database entry string to create.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="dbEntryQuery"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{JObject}
 		/// </returns>
@@ -48,11 +49,11 @@ public static MozuClient<JObject> GetDBValueClient(string appKeyId, string dbEnt
 		}
 
 		/// <summary>
-		/// platform-secureappdata Post CreateDBValue description DOCUMENT_HERE 
+		/// 
 		/// </summary>
 		/// <param name="appKeyId"></param>
-		/// <param name="dbEntryQuery">The database entry string to create.</param>
-		/// <param name="value">The value string to create.</param>
+		/// <param name="dbEntryQuery"></param>
+		/// <param name="value"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
@@ -74,11 +75,11 @@ public static MozuClient CreateDBValueClient(JObject value, string appKeyId, str
 		}
 
 		/// <summary>
-		/// platform-secureappdata Put UpdateDBValue description DOCUMENT_HERE 
+		/// 
 		/// </summary>
 		/// <param name="appKeyId"></param>
-		/// <param name="dbEntryQuery">The database entry string to create.</param>
-		/// <param name="value">The value string to create.</param>
+		/// <param name="dbEntryQuery"></param>
+		/// <param name="value"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
@@ -100,10 +101,10 @@ public static MozuClient UpdateDBValueClient(JObject value, string appKeyId, str
 		}
 
 		/// <summary>
-		/// platform-secureappdata Delete DeleteDBValue description DOCUMENT_HERE 
+		/// 
 		/// </summary>
 		/// <param name="appKeyId"></param>
-		/// <param name="dbEntryQuery">The database entry string to create.</param>
+		/// <param name="dbEntryQuery"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
diff --git a/Mozu.Api/Clients/Platform/SiteDataClient.cs b/Mozu.Api/Clients/Platform/SiteDataClient.cs
old mode 100644
new mode 100755
index 090618e1..5c702c85
--- a/Mozu.Api/Clients/Platform/SiteDataClient.cs
+++ b/Mozu.Api/Clients/Platform/SiteDataClient.cs
@@ -13,19 +13,20 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Platform
 {
 	/// <summary>
-	/// Use the site data resource to store site-level information required for a third-party application in the  database.
+	/// Use the site data resource to store site-level information required for a third-party application in the Mozu database.
 	/// </summary>
 	public partial class SiteDataClient 	{
 		
 		/// <summary>
-		/// Retrieves the value of a record in the  database.
+		/// 
 		/// </summary>
-		/// <param name="dbEntryQuery">The database entry string to create.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="dbEntryQuery">The database entry query string used to retrieve the record information.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{string}
 		/// </returns>
@@ -47,7 +48,7 @@ public static MozuClient<string> GetDBValueClient(string dbEntryQuery, string re
 		}
 
 		/// <summary>
-		/// Creates a new record in the  database based on the information supplied in the request.
+		/// 
 		/// </summary>
 		/// <param name="dbEntryQuery">The database entry string to create.</param>
 		/// <param name="value">The value string to create.</param>
@@ -72,10 +73,10 @@ public static MozuClient CreateDBValueClient(string value, string dbEntryQuery)
 		}
 
 		/// <summary>
-		/// Updates a record in the  database based on the information supplied in the request.
+		/// 
 		/// </summary>
-		/// <param name="dbEntryQuery">The database entry string to create.</param>
-		/// <param name="value">The value string to create.</param>
+		/// <param name="dbEntryQuery">The database entry query string used to update the record information.</param>
+		/// <param name="value">The database value to update.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
@@ -97,9 +98,9 @@ public static MozuClient UpdateDBValueClient(string value, string dbEntryQuery)
 		}
 
 		/// <summary>
-		/// Removes a previously defined record in the  database.
+		/// 
 		/// </summary>
-		/// <param name="dbEntryQuery">The database entry string to create.</param>
+		/// <param name="dbEntryQuery">The database entry string to delete.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
diff --git a/Mozu.Api/Clients/Platform/TenantClient.cs b/Mozu.Api/Clients/Platform/TenantClient.cs
old mode 100644
new mode 100755
index 625a1545..bd4dd60a
--- a/Mozu.Api/Clients/Platform/TenantClient.cs
+++ b/Mozu.Api/Clients/Platform/TenantClient.cs
@@ -13,19 +13,20 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Platform
 {
 	/// <summary>
-	/// Use the tenants resource to manage information about a  tenant.
+	/// Use the tenants resource to manage information about a Mozu tenant.
 	/// </summary>
 	public partial class TenantClient 	{
 		
 		/// <summary>
-		/// Retrieve details about a specific tenant by providing the tenant ID.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="tenantId">Unique identifier of the Mozu tenant.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="tenantId"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.Tenant.Tenant"/>}
 		/// </returns>
diff --git a/Mozu.Api/Clients/Platform/TenantDataClient.cs b/Mozu.Api/Clients/Platform/TenantDataClient.cs
old mode 100644
new mode 100755
index f008877c..4aa0123e
--- a/Mozu.Api/Clients/Platform/TenantDataClient.cs
+++ b/Mozu.Api/Clients/Platform/TenantDataClient.cs
@@ -13,19 +13,20 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Platform
 {
 	/// <summary>
-	/// Use the tenant data resource to store tenant-level information required for a third-party application in the  database.
+	/// Use the tenant data resource to store tenant-level information required for a third-party application in the Mozu database.
 	/// </summary>
 	public partial class TenantDataClient 	{
 		
 		/// <summary>
-		/// Retrieves the value of a record in the  database.
+		/// 
 		/// </summary>
-		/// <param name="dbEntryQuery">The database entry string to create.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="dbEntryQuery">The database entry query string used to retrieve the record information.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{string}
 		/// </returns>
@@ -47,7 +48,7 @@ public static MozuClient<string> GetDBValueClient(string dbEntryQuery, string re
 		}
 
 		/// <summary>
-		/// Creates a new record in the  database based on the information supplied in the request.
+		/// 
 		/// </summary>
 		/// <param name="dbEntryQuery">The database entry string to create.</param>
 		/// <param name="value">The value string to create.</param>
@@ -72,10 +73,10 @@ public static MozuClient CreateDBValueClient(string value, string dbEntryQuery)
 		}
 
 		/// <summary>
-		/// Updates a record in the  database based on the information supplied in the request.
+		/// 
 		/// </summary>
-		/// <param name="dbEntryQuery">The database entry string to create.</param>
-		/// <param name="value">The value string to create.</param>
+		/// <param name="dbEntryQuery">The database entry query string used to update the record information.</param>
+		/// <param name="value">The database value to update.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
@@ -97,9 +98,9 @@ public static MozuClient UpdateDBValueClient(string value, string dbEntryQuery)
 		}
 
 		/// <summary>
-		/// Removes a previously defined record in the  database.
+		/// 
 		/// </summary>
-		/// <param name="dbEntryQuery">The database entry string to create.</param>
+		/// <param name="dbEntryQuery">The database entry string to delete.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
diff --git a/Mozu.Api/Clients/Platform/TenantExtensionsClient.cs b/Mozu.Api/Clients/Platform/TenantExtensionsClient.cs
old mode 100644
new mode 100755
index 987b46f2..3650765f
--- a/Mozu.Api/Clients/Platform/TenantExtensionsClient.cs
+++ b/Mozu.Api/Clients/Platform/TenantExtensionsClient.cs
@@ -13,18 +13,19 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Platform
 {
 	/// <summary>
-	/// Use the Extensions resource to manage Arc.js configuration settings. These are the same settings you can configure through  in the Action Management JSON Editor.
+	/// 
 	/// </summary>
 	public partial class TenantExtensionsClient 	{
 		
 		/// <summary>
-		/// Retrieves the Arc.js configuration settings for a site.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.InstalledApplications.TenantExtensions"/>}
 		/// </returns>
@@ -46,10 +47,10 @@ public partial class TenantExtensionsClient 	{
 		}
 
 		/// <summary>
-		/// Updates the Arc.js configuration settings for a site.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="extensions">The updated details of the Arc.js configuration settings.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="extensions"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{<see cref="Mozu.Api.Contracts.InstalledApplications.TenantExtensions"/>}
 		/// </returns>
diff --git a/Mozu.Api/Clients/Platform/UserDataClient.cs b/Mozu.Api/Clients/Platform/UserDataClient.cs
old mode 100644
new mode 100755
index cd5fa07e..d36105a4
--- a/Mozu.Api/Clients/Platform/UserDataClient.cs
+++ b/Mozu.Api/Clients/Platform/UserDataClient.cs
@@ -13,19 +13,20 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Clients.Platform
 {
 	/// <summary>
-	/// Use the user data subresource to store user-level data required for a third-party application in the  database.
+	/// Use the user data subresource to store user-level data required for a third-party application in the Mozu database.
 	/// </summary>
 	public partial class UserDataClient 	{
 		
 		/// <summary>
-		/// Retrieves the value of a record in the  database.
+		/// 
 		/// </summary>
-		/// <param name="dbEntryQuery">The database entry string to create.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="dbEntryQuery">The database entry query string used to retrieve the record information.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />{string}
 		/// </returns>
@@ -47,7 +48,7 @@ public static MozuClient<string> GetDBValueClient(string dbEntryQuery, string re
 		}
 
 		/// <summary>
-		/// Creates a new record in the  database based on the information supplied in the request.
+		/// 
 		/// </summary>
 		/// <param name="dbEntryQuery">The database entry string to create.</param>
 		/// <param name="value">The value string to create.</param>
@@ -72,10 +73,10 @@ public static MozuClient CreateDBValueClient(string value, string dbEntryQuery)
 		}
 
 		/// <summary>
-		/// Updates a record in the  database based on the information supplied in the request.
+		/// 
 		/// </summary>
-		/// <param name="dbEntryQuery">The database entry string to create.</param>
-		/// <param name="value">The value string to create.</param>
+		/// <param name="dbEntryQuery">The database entry query string used to update the record information.</param>
+		/// <param name="value">The database value to update.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
@@ -97,9 +98,9 @@ public static MozuClient UpdateDBValueClient(string value, string dbEntryQuery)
 		}
 
 		/// <summary>
-		/// Removes a previously defined record in the  database.
+		/// 
 		/// </summary>
-		/// <param name="dbEntryQuery">The database entry string to create.</param>
+		/// <param name="dbEntryQuery">The database entry string to delete.</param>
 		/// <returns>
 		///  <see cref="Mozu.Api.MozuClient" />
 		/// </returns>
diff --git a/Mozu.Api/Contracts/AdminUser/DeveloperAccount.cs b/Mozu.Api/Contracts/AdminUser/DeveloperAccount.cs
old mode 100644
new mode 100755
index 7c07d036..5dcebb3c
--- a/Mozu.Api/Contracts/AdminUser/DeveloperAccount.cs
+++ b/Mozu.Api/Contracts/AdminUser/DeveloperAccount.cs
@@ -18,14 +18,8 @@ namespace Mozu.Api.Contracts.AdminUser
 		///
 		public class DeveloperAccount
 		{
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public int Id { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/AdminUser/DeveloperAdminUserAuthTicket.cs b/Mozu.Api/Contracts/AdminUser/DeveloperAdminUserAuthTicket.cs
old mode 100644
new mode 100755
index 21e19d77..6f571981
--- a/Mozu.Api/Contracts/AdminUser/DeveloperAdminUserAuthTicket.cs
+++ b/Mozu.Api/Contracts/AdminUser/DeveloperAdminUserAuthTicket.cs
@@ -16,53 +16,26 @@
 namespace Mozu.Api.Contracts.AdminUser
 {
 		///
-		///	Properties of the authentication ticket to be used in developer account claims with the  API.
+		///	Properties of the authentication ticket to be used in developer account claims with the Mozu API.
 		///
 		public class DeveloperAdminUserAuthTicket
 		{
-			///
-			///Alphanumeric string used to authenticate the user in API request headers. The token stores an encrypted list of the application's configured behaviors and authenticates the application.
-			///
 			public string AccessToken { get; set; }
 
-			///
-			///The date and time the user access token expires. If the token will expire, a new token will need to be generated and assigned to the account to continue and restore access to the store, data, and account.
-			///
 			public DateTime AccessTokenExpiration { get; set; }
 
-			///
-			///Properties of the developer account for which the user authentication ticket grants access.
-			///
 			public DeveloperAccount Account { get; set; }
 
-			///
-			///Collection of developer accounts for which the user authentication ticket grants access.
-			///
 			public List<DeveloperAccount> AvailableAccounts { get; set; }
 
-			///
-			///Date and time when the entity was created, represented in UTC Date/Time.
-			///
 			public DateTime CreatedOn { get; set; }
 
-			///
-			///Collection of behaviors encrypted in the developer account authentication ticket. Behaviors are granted to users as part of the role assigned for the given developer account.
-			///
 			public List<int> GrantedBehaviors { get; set; }
 
-			///
-			///Alphanumeric string used for access tokens. This token refreshes access for accounts by generating a new developer or application account authentication ticket after an access token expires.
-			///
 			public string RefreshToken { get; set; }
 
-			///
-			///The date and time the developer account or application refresh token expires.
-			///
 			public DateTime RefreshTokenExpiration { get; set; }
 
-			///
-			///Properties of the user. Users include customers and  users.
-			///
 			public UserProfile User { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/AdminUser/TenantAdminUserAuthTicket.cs b/Mozu.Api/Contracts/AdminUser/TenantAdminUserAuthTicket.cs
old mode 100644
new mode 100755
index 53a332c9..8bc09997
--- a/Mozu.Api/Contracts/AdminUser/TenantAdminUserAuthTicket.cs
+++ b/Mozu.Api/Contracts/AdminUser/TenantAdminUserAuthTicket.cs
@@ -17,53 +17,26 @@
 namespace Mozu.Api.Contracts.AdminUser
 {
 		///
-		///	Properties of the authentication ticket to be used in user claims with the  API.
+		///	Properties of the authentication ticket to be used in user claims with the Mozu API.
 		///
 		public class TenantAdminUserAuthTicket
 		{
-			///
-			///Alphanumeric string used to authenticate the user in API request headers. The token stores an encrypted list of the application's configured behaviors and authenticates the application.
-			///
 			public string AccessToken { get; set; }
 
-			///
-			///The date and time the user access token expires. If the token will expire, a new token will need to be generated and assigned to the account to continue and restore access to the store, data, and account.
-			///
 			public DateTime AccessTokenExpiration { get; set; }
 
-			///
-			///Collection of tenants for which the user authentication ticket grants access.
-			///
 			public List<Tenant.Tenant> AvailableTenants { get; set; }
 
-			///
-			///Date and time when the entity was created, represented in UTC Date/Time.
-			///
 			public DateTime CreatedOn { get; set; }
 
-			///
-			///Collection of behaviors encrypted in the developer account authentication ticket. Behaviors are granted to users as part of the role assigned for the given developer account.
-			///
 			public List<int> GrantedBehaviors { get; set; }
 
-			///
-			///Alphanumeric string used for access tokens. This token refreshes access for accounts by generating a new developer or application account authentication ticket after an access token expires.
-			///
 			public string RefreshToken { get; set; }
 
-			///
-			///The date and time the developer account or application refresh token expires.
-			///
 			public DateTime RefreshTokenExpiration { get; set; }
 
-			///
-			///Tenant information associated with the user authentication ticket or domain lookup service result.
-			///
 			public Tenant.Tenant Tenant { get; set; }
 
-			///
-			///Properties of the user. Users include customers and  users.
-			///
 			public UserProfile User { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/AppDev/AppAuthInfo.cs b/Mozu.Api/Contracts/AppDev/AppAuthInfo.cs
old mode 100644
new mode 100755
index 8a148843..9068f1fe
--- a/Mozu.Api/Contracts/AppDev/AppAuthInfo.cs
+++ b/Mozu.Api/Contracts/AppDev/AppAuthInfo.cs
@@ -14,18 +14,12 @@
 namespace Mozu.Api.Contracts.AppDev
 {
 		///
-		///	The information required to authenticate third party applications against the  API.
+		///	The information required to authenticate third party applications against the Mozu API.
 		///
 		public class AppAuthInfo
 		{
-			///
-			///Unique identifier of the application. System-supplied and read-only.
-			///
 			public string ApplicationId { get; set; }
 
-			///
-			///System-supplied alphanumeric code used to authenticate applications. This string is only available for viewing in  Dev Center.
-			///
 			public string SharedSecret { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/AppDev/AppVersion.cs b/Mozu.Api/Contracts/AppDev/AppVersion.cs
old mode 100644
new mode 100755
index b676f46c..5c552cec
--- a/Mozu.Api/Contracts/AppDev/AppVersion.cs
+++ b/Mozu.Api/Contracts/AppDev/AppVersion.cs
@@ -13,24 +13,12 @@
 
 namespace Mozu.Api.Contracts.AppDev
 {
-		///
-		///	Mozu.AppDev.Contracts.AppVersion ApiType DOCUMENT_HERE 
-		///
 		public class AppVersion
 		{
-			///
-			///Mozu.AppDev.Contracts.AppVersion majorVersion ApiTypeMember DOCUMENT_HERE 
-			///
 			public int MajorVersion { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.AppVersion minorVersion ApiTypeMember DOCUMENT_HERE 
-			///
 			public int MinorVersion { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.AppVersion revision ApiTypeMember DOCUMENT_HERE 
-			///
 			public int Revision { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/AppDev/ApplicationAttribute.cs b/Mozu.Api/Contracts/AppDev/ApplicationAttribute.cs
old mode 100644
new mode 100755
index 406a6788..061c7010
--- a/Mozu.Api/Contracts/AppDev/ApplicationAttribute.cs
+++ b/Mozu.Api/Contracts/AppDev/ApplicationAttribute.cs
@@ -14,54 +14,24 @@
 
 namespace Mozu.Api.Contracts.AppDev
 {
-		///
-		///	This property is not exposed in documentation.
-		///
 		public class ApplicationAttribute
 		{
-			///
-			///Comma delimited list of attribute codes.
-			///
 			public string AttributeCodes { get; set; }
 
-			///
-			///json representation of attribute definitions
-			///
 			public string AttributeJson { get; set; }
 
-			///
-			///Collection of attributes that may be paged list or a list, depending on the usage per object and API type. 
-			///
 			public List<Attribute> Attributes { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationAttribute isAppliedToBase ApiTypeMember DOCUMENT_HERE 
-			///
 			public bool IsAppliedToBase { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationAttribute packageId ApiTypeMember DOCUMENT_HERE 
-			///
 			public int PackageId { get; set; }
 
-			///
-			///Will contain ProductTypeCollection if Product, else AttributeSet
-			///
 			public string ProductTypeJson { get; set; }
 
-			///
-			///Source Tenant Id
-			///
 			public int SourceTenantId { get; set; }
 
-			///
-			///Source Tenant Name
-			///
 			public string SourceTenantName { get; set; }
 
-			///
-			///Customer, Order, or Product
-			///
 			public string Subsystem { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/AppDev/ApplicationBehavior.cs b/Mozu.Api/Contracts/AppDev/ApplicationBehavior.cs
old mode 100644
new mode 100755
index f7524c92..0235c75a
--- a/Mozu.Api/Contracts/AppDev/ApplicationBehavior.cs
+++ b/Mozu.Api/Contracts/AppDev/ApplicationBehavior.cs
@@ -13,19 +13,10 @@
 
 namespace Mozu.Api.Contracts.AppDev
 {
-		///
-		///	This property is not exposed in documentation.
-		///
 		public class ApplicationBehavior
 		{
-			///
-			///Mozu.AppDev.Contracts.ApplicationBehavior behaviorId ApiTypeMember DOCUMENT_HERE 
-			///
 			public int BehaviorId { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationBehavior packageId ApiTypeMember DOCUMENT_HERE 
-			///
 			public int PackageId { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/AppDev/ApplicationCapability.cs b/Mozu.Api/Contracts/AppDev/ApplicationCapability.cs
old mode 100644
new mode 100755
index 68f304d6..63ee84d5
--- a/Mozu.Api/Contracts/AppDev/ApplicationCapability.cs
+++ b/Mozu.Api/Contracts/AppDev/ApplicationCapability.cs
@@ -13,34 +13,16 @@
 
 namespace Mozu.Api.Contracts.AppDev
 {
-		///
-		///	This property is not exposed in documentation.
-		///
 		public class ApplicationCapability
 		{
-			///
-			///Mozu.AppDev.Contracts.ApplicationCapability applicationCapabilityId ApiTypeMember DOCUMENT_HERE 
-			///
 			public int ApplicationCapabilityId { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationCapability applicationCapabilityTypeId ApiTypeMember DOCUMENT_HERE 
-			///
 			public int? ApplicationCapabilityTypeId { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationCapability applicationEndPoint ApiTypeMember DOCUMENT_HERE 
-			///
 			public string ApplicationEndPoint { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationCapability capabilityTypeContractId ApiTypeMember DOCUMENT_HERE 
-			///
 			public int CapabilityTypeContractId { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationCapability packageId ApiTypeMember DOCUMENT_HERE 
-			///
 			public int PackageId { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/AppDev/ApplicationCapabilityDomain.cs b/Mozu.Api/Contracts/AppDev/ApplicationCapabilityDomain.cs
old mode 100644
new mode 100755
index 1f0c8e39..5f6108d7
--- a/Mozu.Api/Contracts/AppDev/ApplicationCapabilityDomain.cs
+++ b/Mozu.Api/Contracts/AppDev/ApplicationCapabilityDomain.cs
@@ -14,34 +14,16 @@
 
 namespace Mozu.Api.Contracts.AppDev
 {
-		///
-		///	This property is not exposed in documentation.
-		///
 		public class ApplicationCapabilityDomain
 		{
-			///
-			///Mozu.AppDev.Contracts.ApplicationCapabilityDomain applicationCapabilityDomainId ApiTypeMember DOCUMENT_HERE 
-			///
 			public int ApplicationCapabilityDomainId { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationCapabilityDomain applicationCapabilityDomainValues1 ApiTypeMember DOCUMENT_HERE 
-			///
 			public List<ApplicationCapabilityDomainValue> ApplicationCapabilityDomainValues1 { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationCapabilityDomain applicationCapabilityDomainValues2 ApiTypeMember DOCUMENT_HERE 
-			///
 			public List<ApplicationCapabilityDomainValue> ApplicationCapabilityDomainValues2 { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationCapabilityDomain applicationCapabilityTypeId ApiTypeMember DOCUMENT_HERE 
-			///
 			public int ApplicationCapabilityTypeId { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/AppDev/ApplicationCapabilityDomainValue.cs b/Mozu.Api/Contracts/AppDev/ApplicationCapabilityDomainValue.cs
old mode 100644
new mode 100755
index b2a455a3..6f19e85e
--- a/Mozu.Api/Contracts/AppDev/ApplicationCapabilityDomainValue.cs
+++ b/Mozu.Api/Contracts/AppDev/ApplicationCapabilityDomainValue.cs
@@ -13,34 +13,16 @@
 
 namespace Mozu.Api.Contracts.AppDev
 {
-		///
-		///	This property is not exposed in documentation.
-		///
 		public class ApplicationCapabilityDomainValue
 		{
-			///
-			///Mozu.AppDev.Contracts.ApplicationCapabilityDomainValue applicationCapabilityDomainId1 ApiTypeMember DOCUMENT_HERE 
-			///
 			public int? ApplicationCapabilityDomainId1 { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationCapabilityDomainValue applicationCapabilityDomainId2 ApiTypeMember DOCUMENT_HERE 
-			///
 			public int? ApplicationCapabilityDomainId2 { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationCapabilityDomainValue applicationCapabilityDomainValueId ApiTypeMember DOCUMENT_HERE 
-			///
 			public int ApplicationCapabilityDomainValueId { get; set; }
 
-			///
-			///The name that displays for the payment gateway or third-party credentials field. 
-			///
 			public string DisplayName { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationCapabilityDomainValue valueName ApiTypeMember DOCUMENT_HERE 
-			///
 			public string ValueName { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/AppDev/ApplicationCapabilityType.cs b/Mozu.Api/Contracts/AppDev/ApplicationCapabilityType.cs
old mode 100644
new mode 100755
index 3d0f1d87..a7b6a308
--- a/Mozu.Api/Contracts/AppDev/ApplicationCapabilityType.cs
+++ b/Mozu.Api/Contracts/AppDev/ApplicationCapabilityType.cs
@@ -14,54 +14,24 @@
 
 namespace Mozu.Api.Contracts.AppDev
 {
-		///
-		///	This property is not exposed in documentation.
-		///
 		public class ApplicationCapabilityType
 		{
-			///
-			///Mozu.AppDev.Contracts.ApplicationCapabilityType applicationCapabilities ApiTypeMember DOCUMENT_HERE 
-			///
 			public List<ApplicationCapability> ApplicationCapabilities { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationCapabilityType applicationCapabilityDomains ApiTypeMember DOCUMENT_HERE 
-			///
 			public List<ApplicationCapabilityDomain> ApplicationCapabilityDomains { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationCapabilityType applicationCapabilityTypeId ApiTypeMember DOCUMENT_HERE 
-			///
 			public int ApplicationCapabilityTypeId { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationCapabilityType applicationId ApiTypeMember DOCUMENT_HERE 
-			///
 			public int ApplicationId { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationCapabilityType capabilityTypeId ApiTypeMember DOCUMENT_HERE 
-			///
 			public int CapabilityTypeId { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationCapabilityType capabilityTypeName ApiTypeMember DOCUMENT_HERE 
-			///
 			public string CapabilityTypeName { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationCapabilityType isImplemented ApiTypeMember DOCUMENT_HERE 
-			///
 			public bool IsImplemented { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationCapabilityType isInitializedByDefault ApiTypeMember DOCUMENT_HERE 
-			///
 			public bool IsInitializedByDefault { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationCapabilityType packageId ApiTypeMember DOCUMENT_HERE 
-			///
 			public int PackageId { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/AppDev/ApplicationEntitlement.cs b/Mozu.Api/Contracts/AppDev/ApplicationEntitlement.cs
old mode 100644
new mode 100755
index d8f82ff5..8731797d
--- a/Mozu.Api/Contracts/AppDev/ApplicationEntitlement.cs
+++ b/Mozu.Api/Contracts/AppDev/ApplicationEntitlement.cs
@@ -14,119 +14,50 @@
 
 namespace Mozu.Api.Contracts.AppDev
 {
-		///
-		///	This property is not exposed in documentation.
-		///
 		public class ApplicationEntitlement
 		{
-			///
-			///Mozu.AppDev.Contracts.ApplicationEntitlement appKey ApiTypeMember DOCUMENT_HERE 
-			///
 			public string AppKey { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationEntitlement applicationEntitlementId ApiTypeMember DOCUMENT_HERE 
-			///
 			public int ApplicationEntitlementId { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationEntitlement applicationId ApiTypeMember DOCUMENT_HERE 
-			///
 			public int ApplicationId { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationEntitlement applicationLicenseType ApiTypeMember DOCUMENT_HERE 
-			///
 			public string ApplicationLicenseType { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationEntitlement applicationName ApiTypeMember DOCUMENT_HERE 
-			///
 			public string ApplicationName { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationEntitlement applicationStatusId ApiTypeMember DOCUMENT_HERE 
-			///
 			public string ApplicationStatusId { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationEntitlement applicationTransactions ApiTypeMember DOCUMENT_HERE 
-			///
 			public List<ApplicationTransaction> ApplicationTransactions { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationEntitlement applicationVersion ApiTypeMember DOCUMENT_HERE 
-			///
 			public string ApplicationVersion { get; set; }
 
-			///
-			///Denotes the application owner dev account id
-			///
 			public int AppOwnerDevAccountId { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationEntitlement devAccountId ApiTypeMember DOCUMENT_HERE 
-			///
 			public int DevAccountId { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationEntitlement effectiveEndDate ApiTypeMember DOCUMENT_HERE 
-			///
 			public DateTime? EffectiveEndDate { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationEntitlement effectiveStartDate ApiTypeMember DOCUMENT_HERE 
-			///
 			public DateTime? EffectiveStartDate { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationEntitlement entitlementStatus ApiTypeMember DOCUMENT_HERE 
-			///
 			public string EntitlementStatus { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationEntitlement installedAppsApplicationId ApiTypeMember DOCUMENT_HERE 
-			///
 			public string InstalledAppsApplicationId { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationEntitlement installedByFirstName ApiTypeMember DOCUMENT_HERE 
-			///
 			public string InstalledByFirstName { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationEntitlement installedByLastName ApiTypeMember DOCUMENT_HERE 
-			///
 			public string InstalledByLastName { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationEntitlement installedDate ApiTypeMember DOCUMENT_HERE 
-			///
 			public DateTime InstalledDate { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationEntitlement packageId ApiTypeMember DOCUMENT_HERE 
-			///
 			public int PackageId { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationEntitlement packageName ApiTypeMember DOCUMENT_HERE 
-			///
 			public string PackageName { get; set; }
 
-			///
-			///Unique identifier for the site. This ID is used at all levels of a store, catalog, and tenant to associate objects to a site.
-			///
 			public int? SiteId { get; set; }
 
-			///
-			///Unique identifier of the Mozu tenant.
-			///
 			public int TenantId { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationEntitlement tenantName ApiTypeMember DOCUMENT_HERE 
-			///
 			public string TenantName { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/AppDev/ApplicationSubscription.cs b/Mozu.Api/Contracts/AppDev/ApplicationSubscription.cs
old mode 100644
new mode 100755
index ca62ac03..025e5d4e
--- a/Mozu.Api/Contracts/AppDev/ApplicationSubscription.cs
+++ b/Mozu.Api/Contracts/AppDev/ApplicationSubscription.cs
@@ -14,34 +14,16 @@
 
 namespace Mozu.Api.Contracts.AppDev
 {
-		///
-		///	This property is not exposed in documentation.
-		///
 		public class ApplicationSubscription
 		{
-			///
-			///The End Point where the event information will be sent to when the event is fired.
-			///
 			public string ApplicationEndPoint { get; set; }
 
-			///
-			///The unique identifier of an ApplicationVersionEvent record.
-			///
 			public int ApplicationSubscriptionId { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationSubscription events ApiTypeMember DOCUMENT_HERE 
-			///
 			public List<Event> Events { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationSubscription noCallback ApiTypeMember DOCUMENT_HERE 
-			///
 			public bool NoCallback { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationSubscription packageId ApiTypeMember DOCUMENT_HERE 
-			///
 			public int PackageId { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/AppDev/ApplicationSummary.cs b/Mozu.Api/Contracts/AppDev/ApplicationSummary.cs
old mode 100644
new mode 100755
index 5b1d4ccf..322ee07e
--- a/Mozu.Api/Contracts/AppDev/ApplicationSummary.cs
+++ b/Mozu.Api/Contracts/AppDev/ApplicationSummary.cs
@@ -13,94 +13,40 @@
 
 namespace Mozu.Api.Contracts.AppDev
 {
-		///
-		///	This property is not exposed in documentation.
-		///
 		public class ApplicationSummary
 		{
-			///
-			///Unique identifier of an app available in your  tenant or within  Dev Center. This ID is unique across all apps installed, initialized, and enabled in the  and those in development through the Dev Center Console.
-			///
 			public string AppId { get; set; }
 
-			///
-			///The AppKey is a runtime type.
-			///
 			public string AppKey { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationSummary applicationId ApiTypeMember DOCUMENT_HERE 
-			///
 			public int ApplicationId { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationSummary applicationNamespace ApiTypeMember DOCUMENT_HERE 
-			///
 			public string ApplicationNamespace { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationSummary applicationStatusId ApiTypeMember DOCUMENT_HERE 
-			///
 			public int ApplicationStatusId { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationSummary applicationStatusName ApiTypeMember DOCUMENT_HERE 
-			///
 			public string ApplicationStatusName { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationSummary applicationTypeId ApiTypeMember DOCUMENT_HERE 
-			///
 			public int ApplicationTypeId { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationSummary applicationVersion ApiTypeMember DOCUMENT_HERE 
-			///
 			public AppVersion ApplicationVersion { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationSummary appSchemeVersion ApiTypeMember DOCUMENT_HERE 
-			///
 			public byte AppSchemeVersion { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationSummary hasVersions ApiTypeMember DOCUMENT_HERE 
-			///
 			public bool HasVersions { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
-			///
-			///The AppKey is a runtime type. This only applies for themes that inherit from another theme.
-			///
 			public string ParentAppKey { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationSummary parentName ApiTypeMember DOCUMENT_HERE 
-			///
 			public string ParentName { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationSummary releasePackageId ApiTypeMember DOCUMENT_HERE 
-			///
 			public int ReleasePackageId { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationSummary releasePackageName ApiTypeMember DOCUMENT_HERE 
-			///
 			public string ReleasePackageName { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationSummary updateAvailable ApiTypeMember DOCUMENT_HERE 
-			///
 			public bool UpdateAvailable { get; set; }
 
-			///
-			///The AppKey is a runtime type. This only applies for themes that inherit from another theme. It shows the most current update available.
-			///
 			public string UpdateParentAppKey { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/AppDev/ApplicationSummaryCollection.cs b/Mozu.Api/Contracts/AppDev/ApplicationSummaryCollection.cs
old mode 100644
new mode 100755
index a1f93eb1..a09319b5
--- a/Mozu.Api/Contracts/AppDev/ApplicationSummaryCollection.cs
+++ b/Mozu.Api/Contracts/AppDev/ApplicationSummaryCollection.cs
@@ -14,34 +14,16 @@
 
 namespace Mozu.Api.Contracts.AppDev
 {
-		///
-		///	This property is not exposed in documentation.
-		///
 		public class ApplicationSummaryCollection
 		{
-			///
-			///A list of requested items. All returned data is provided in an items array.For a failed request, the returned response may be success with an empty item array.
-			///
 			public List<ApplicationSummary> Items { get; set; }
 
-			///
-			///The total number of pages of the results divided per the `pageSize`.
-			///
 			public int PageCount { get; set; }
 
-			///
-			///The number of results to display on each page when creating paged results from a query. The amount is divided and displayed on the `pageCount `amount of pages. The default is 20 and maximum value is 200 per page.
-			///
 			public int PageSize { get; set; }
 
-			///
-			///When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a `pageSize `of 25, to get the 51st through the 75th items, use `startIndex=50`.
-			///
 			public int StartIndex { get; set; }
 
-			///
-			///The total number of items in the list.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/AppDev/ApplicationTransaction.cs b/Mozu.Api/Contracts/AppDev/ApplicationTransaction.cs
old mode 100644
new mode 100755
index b4fa5965..d20fd441
--- a/Mozu.Api/Contracts/AppDev/ApplicationTransaction.cs
+++ b/Mozu.Api/Contracts/AppDev/ApplicationTransaction.cs
@@ -13,69 +13,30 @@
 
 namespace Mozu.Api.Contracts.AppDev
 {
-		///
-		///	Mozu.AppDev.Contracts.ApplicationTransaction ApiType DOCUMENT_HERE 
-		///
 		public class ApplicationTransaction
 		{
-			///
-			///Mozu.AppDev.Contracts.ApplicationTransaction applicationEntitlementId ApiTypeMember DOCUMENT_HERE 
-			///
 			public int? ApplicationEntitlementId { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationTransaction applicationId ApiTypeMember DOCUMENT_HERE 
-			///
 			public int ApplicationId { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationTransaction applicationTransactionId ApiTypeMember DOCUMENT_HERE 
-			///
 			public int ApplicationTransactionId { get; set; }
 
-			///
-			///The three character ISO currency code for the monetary amount. For example, USD is used for US Dollars. 
-			///
 			public string IsoCurrencyCode { get; set; }
 
-			///
-			///Language used for the entity. Currently, only "en-US" is supported.
-			///
 			public int LocaleCode { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationTransaction orderNumber ApiTypeMember DOCUMENT_HERE 
-			///
 			public string OrderNumber { get; set; }
 
-			///
-			///Unique identifier for the site. This ID is used at all levels of a store, catalog, and tenant to associate objects to a site.
-			///
 			public int? SiteId { get; set; }
 
-			///
-			///Unique identifier of the Mozu tenant.
-			///
 			public int TenantId { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationTransaction transactionDate ApiTypeMember DOCUMENT_HERE 
-			///
 			public DateTime TransactionDate { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationTransaction transactionPrice ApiTypeMember DOCUMENT_HERE 
-			///
 			public decimal TransactionPrice { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationTransaction transactionTax ApiTypeMember DOCUMENT_HERE 
-			///
 			public decimal TransactionTax { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.ApplicationTransaction transactionTotal ApiTypeMember DOCUMENT_HERE 
-			///
 			public decimal TransactionTotal { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/AppDev/ApplicationVersionsCollection.cs b/Mozu.Api/Contracts/AppDev/ApplicationVersionsCollection.cs
old mode 100644
new mode 100755
index 6ffeba98..4fab3b86
--- a/Mozu.Api/Contracts/AppDev/ApplicationVersionsCollection.cs
+++ b/Mozu.Api/Contracts/AppDev/ApplicationVersionsCollection.cs
@@ -14,19 +14,10 @@
 
 namespace Mozu.Api.Contracts.AppDev
 {
-		///
-		///	Mozu.AppDev.Contracts.Public.ApplicationVersionsCollection ApiType DOCUMENT_HERE 
-		///
 		public class ApplicationVersionsCollection
 		{
-			///
-			///A list of requested items. All returned data is provided in an items array.For a failed request, the returned response may be success with an empty item array.
-			///
 			public List<string> Items { get; set; }
 
-			///
-			///The total number of items in the list.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/AppDev/Attribute.cs b/Mozu.Api/Contracts/AppDev/Attribute.cs
old mode 100644
new mode 100755
index a8b63c23..de2eeaaf
--- a/Mozu.Api/Contracts/AppDev/Attribute.cs
+++ b/Mozu.Api/Contracts/AppDev/Attribute.cs
@@ -13,64 +13,28 @@
 
 namespace Mozu.Api.Contracts.AppDev
 {
-		///
-		///	Properties of an attribute used to describe customers or orders.
-		///
 		public class Attribute
 		{
-			///
-			///The administrator name associated with the object/data.
-			///
 			public string AdminName { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.Attribute applicationAttributeId ApiTypeMember DOCUMENT_HERE 
-			///
 			public int ApplicationAttributeId { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.Attribute attributeId ApiTypeMember DOCUMENT_HERE 
-			///
 			public int AttributeId { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.Attribute code ApiTypeMember DOCUMENT_HERE 
-			///
 			public string Code { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.Attribute fqn ApiTypeMember DOCUMENT_HERE 
-			///
 			public string Fqn { get; set; }
 
-			///
-			///The type of input selection used to define a value for the attribute, including Yes/No, Date, DateTime, List, TextBox, or TextArea.
-			///
 			public string InputType { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
-			///
-			///The numeric order of objects, used by a vocabulary value defined for an extensible attribute, images, and categories.
-			///
 			public int Sequence { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.Attribute type ApiTypeMember DOCUMENT_HERE 
-			///
 			public string Type { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.Attribute vocabularyJson ApiTypeMember DOCUMENT_HERE 
-			///
 			public string VocabularyJson { get; set; }
 
-			///
-			///List of valid vocabulary values defined for an attribute.
-			///
 			public string VocabularyValues { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/AppDev/AuthTicket.cs b/Mozu.Api/Contracts/AppDev/AuthTicket.cs
old mode 100644
new mode 100755
index 93e183b1..a4d8145d
--- a/Mozu.Api/Contracts/AppDev/AuthTicket.cs
+++ b/Mozu.Api/Contracts/AppDev/AuthTicket.cs
@@ -18,24 +18,12 @@ namespace Mozu.Api.Contracts.AppDev
 		///
 		public class AuthTicket
 		{
-			///
-			///Alphanumeric string used to authenticate the user in API request headers. The token stores an encrypted list of the application's configured behaviors and authenticates the application.
-			///
 			public string AccessToken { get; set; }
 
-			///
-			///The date and time the user access token expires. If the token will expire, a new token will need to be generated and assigned to the account to continue and restore access to the store, data, and account.
-			///
 			public DateTime AccessTokenExpiration { get; set; }
 
-			///
-			///Alphanumeric string used for access tokens. This token refreshes access for accounts by generating a new developer or application account authentication ticket after an access token expires.
-			///
 			public string RefreshToken { get; set; }
 
-			///
-			///The date and time the developer account or application refresh token expires.
-			///
 			public DateTime RefreshTokenExpiration { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/AppDev/AuthTicketRequest.cs b/Mozu.Api/Contracts/AppDev/AuthTicketRequest.cs
old mode 100644
new mode 100755
index 1abbcf84..ff9964e0
--- a/Mozu.Api/Contracts/AppDev/AuthTicketRequest.cs
+++ b/Mozu.Api/Contracts/AppDev/AuthTicketRequest.cs
@@ -18,9 +18,6 @@ namespace Mozu.Api.Contracts.AppDev
 		///
 		public class AuthTicketRequest
 		{
-			///
-			///Alphanumeric string used for access tokens. This token refreshes access for accounts by generating a new developer or application account authentication ticket after an access token expires.
-			///
 			public string RefreshToken { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/AppDev/Event.cs b/Mozu.Api/Contracts/AppDev/Event.cs
old mode 100644
new mode 100755
index 069c27ec..ebf9bb6e
--- a/Mozu.Api/Contracts/AppDev/Event.cs
+++ b/Mozu.Api/Contracts/AppDev/Event.cs
@@ -13,29 +13,14 @@
 
 namespace Mozu.Api.Contracts.AppDev
 {
-		///
-		///	Mozu.AppDev.Contracts.Event ApiType DOCUMENT_HERE 
-		///
 		public class Event
 		{
-			///
-			///The Api Version Number which defines what events are available for a given API version.
-			///
 			public string ApiVersionNumber { get; set; }
 
-			///
-			///The category the event belongs to.
-			///
 			public string EventCategory { get; set; }
 
-			///
-			///Unique identifier for the event. 
-			///
 			public int EventId { get; set; }
 
-			///
-			///The name of the event.
-			///
 			public string EventName { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/AppDev/FileMetadata.cs b/Mozu.Api/Contracts/AppDev/FileMetadata.cs
old mode 100644
new mode 100755
index cee52277..4eeaaee0
--- a/Mozu.Api/Contracts/AppDev/FileMetadata.cs
+++ b/Mozu.Api/Contracts/AppDev/FileMetadata.cs
@@ -19,34 +19,16 @@ namespace Mozu.Api.Contracts.AppDev
 		///
 		public class FileMetadata
 		{
-			///
-			///Identifier and datetime stamp information recorded when a user or application creates, updates, or deletes a resource entity. This value is system-supplied and read-only.
-			///
 			public AuditInfo AuditInfo { get; set; }
 
-			///
-			///Checksum function used to validate the local version of the file against the version on the server.
-			///
 			public string CheckSum { get; set; }
 
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public string Id { get; set; }
 
-			///
-			///The path and file name that represents the file location.
-			///
 			public string Path { get; set; }
 
-			///
-			///The total size of the package file, in bytes.
-			///
 			public long SizeInBytes { get; set; }
 
-			///
-			///The type of file in the package.
-			///
 			public string Type { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/AppDev/FolderMetadata.cs b/Mozu.Api/Contracts/AppDev/FolderMetadata.cs
old mode 100644
new mode 100755
index 3b0bc9a3..3757c781
--- a/Mozu.Api/Contracts/AppDev/FolderMetadata.cs
+++ b/Mozu.Api/Contracts/AppDev/FolderMetadata.cs
@@ -19,24 +19,12 @@ namespace Mozu.Api.Contracts.AppDev
 		///
 		public class FolderMetadata
 		{
-			///
-			///Array list of files in the folder.
-			///
 			public List<FileMetadata> Files { get; set; }
 
-			///
-			///The directory of the file location of the folder in the package.
-			///
 			public string FullPath { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
-			///
-			///Array list of subfolders stored in this folder.
-			///
 			public List<FolderMetadata> SubFolders { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/AppDev/Package.cs b/Mozu.Api/Contracts/AppDev/Package.cs
old mode 100644
new mode 100755
index 0e8720bd..0ca2c078
--- a/Mozu.Api/Contracts/AppDev/Package.cs
+++ b/Mozu.Api/Contracts/AppDev/Package.cs
@@ -15,273 +15,114 @@
 namespace Mozu.Api.Contracts.AppDev
 {
 		///
-		///	Properties for a package for fulfillment and shipment. A package may include one to many products, or a bundle of products.
+		///	Properties of a development or release package of theme asset or application configuration files.
 		///
 		public class Package
 		{
-			///
-			///Mozu.AppDev.Contracts.Package apiVersion ApiTypeMember DOCUMENT_HERE 
-			///
 			public string ApiVersion { get; set; }
 
-			///
-			///This will be used by the 3rd party developers to set a URL the intalled applications can call from the Tenant installation/
-			///
 			public string AppConfigUrl { get; set; }
 
-			///
-			///Unique identifier of an app available in your  tenant or within  Dev Center. This ID is unique across all apps installed, initialized, and enabled in the  and those in development through the Dev Center Console.
-			///
 			public string AppId { get; set; }
 
-			///
-			///App Key for the package in question.
-			///
 			public string AppKey { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.Package applicationAttributes ApiTypeMember DOCUMENT_HERE 
-			///
 			public List<ApplicationAttribute> ApplicationAttributes { get; set; }
 
-			///
-			///List of Application Behaviors that apply to this version of the application.
-			///
 			public List<ApplicationBehavior> ApplicationBehaviors { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.Package applicationCapabilities ApiTypeMember DOCUMENT_HERE 
-			///
 			public List<ApplicationCapability> ApplicationCapabilities { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.Package applicationCapabilityTypes ApiTypeMember DOCUMENT_HERE 
-			///
 			public List<ApplicationCapabilityType> ApplicationCapabilityTypes { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.Package applicationDescription ApiTypeMember DOCUMENT_HERE 
-			///
 			public string ApplicationDescription { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.Package applicationDetailId ApiTypeMember DOCUMENT_HERE 
-			///
 			public int? ApplicationDetailId { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.Package applicationEntitlements ApiTypeMember DOCUMENT_HERE 
-			///
 			public List<ApplicationEntitlement> ApplicationEntitlements { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.Package applicationId ApiTypeMember DOCUMENT_HERE 
-			///
 			public int ApplicationId { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.Package applicationName ApiTypeMember DOCUMENT_HERE 
-			///
 			public string ApplicationName { get; set; }
 
-			///
-			///This is the DevAccountId that owns the application
-			///
 			public int ApplicationOwnerDevAccountId { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.Package applicationStatus ApiTypeMember DOCUMENT_HERE 
-			///
 			public string ApplicationStatus { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.Package applicationStatusId ApiTypeMember DOCUMENT_HERE 
-			///
 			public int ApplicationStatusId { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.Package applicationStatusName ApiTypeMember DOCUMENT_HERE 
-			///
 			public string ApplicationStatusName { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.Package applicationSubscriptions ApiTypeMember DOCUMENT_HERE 
-			///
 			public List<ApplicationSubscription> ApplicationSubscriptions { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.Package applicationTypeId ApiTypeMember DOCUMENT_HERE 
-			///
 			public int ApplicationTypeId { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.Package applicationTypeName ApiTypeMember DOCUMENT_HERE 
-			///
 			public string ApplicationTypeName { get; set; }
 
-			///
-			///The date and time in UTC format when the application was updated most recently.
-			///
 			public DateTime? ApplicationUpdateDate { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.Package appSchemeVersion ApiTypeMember DOCUMENT_HERE 
-			///
 			public byte AppSchemeVersion { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.Package assetFileCount ApiTypeMember DOCUMENT_HERE 
-			///
 			public int AssetFileCount { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.Package attributeNamespace ApiTypeMember DOCUMENT_HERE 
-			///
 			public string AttributeNamespace { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.Package dataNamespace ApiTypeMember DOCUMENT_HERE 
-			///
 			public string DataNamespace { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.Package hasApplicationVersions ApiTypeMember DOCUMENT_HERE 
-			///
 			public bool HasApplicationVersions { get; set; }
 
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public int Id { get; set; }
 
-			///
-			///Indicates if the object is deleted. If true, the object has been deleted. This may affect associated child members and objects. For example, a deleted master catalog affects all associated catalogs. 
-			///
 			public bool IsDeleted { get; set; }
 
-			///
-			///Indicates if a customer account and associated data is locked. If true, the user account is locked due to multiple failed authentication attempts. The user cannot login until the account is unlocked.
-			///
 			public bool IsLocked { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.Package isReleasePackage ApiTypeMember DOCUMENT_HERE 
-			///
 			public bool IsReleasePackage { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.Package legacyNamespace ApiTypeMember DOCUMENT_HERE 
-			///
 			public string LegacyNamespace { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.Package majorVersion ApiTypeMember DOCUMENT_HERE 
-			///
 			public int MajorVersion { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.Package minorVersion ApiTypeMember DOCUMENT_HERE 
-			///
 			public int MinorVersion { get; set; }
 
-			///
-			///The namespace for the accessible APIs and source capabilities in the core of  APIs.
-			///
 			public string Namespace { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.Package namespaceRegistryId ApiTypeMember DOCUMENT_HERE 
-			///
 			public string NamespaceRegistryId { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.Package packageDescription ApiTypeMember DOCUMENT_HERE 
-			///
 			public string PackageDescription { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.Package packageGuid ApiTypeMember DOCUMENT_HERE 
-			///
 			public string PackageGuid { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.Package packageName ApiTypeMember DOCUMENT_HERE 
-			///
 			public string PackageName { get; set; }
 
-			///
-			///The parent theme AppKey if this is a theme and the theme extends a valid, published theme.
-			///
 			public string ParentThemeAppKey { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.Package parentThemeName ApiTypeMember DOCUMENT_HERE 
-			///
 			public string ParentThemeName { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.Package publishedParentSemanticVersion ApiTypeMember DOCUMENT_HERE 
-			///
 			public string PublishedParentSemanticVersion { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.Package publishedParentThemeId ApiTypeMember DOCUMENT_HERE 
-			///
 			public int? PublishedParentThemeId { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.Package revision ApiTypeMember DOCUMENT_HERE 
-			///
 			public int Revision { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.Package semanticVersionRange ApiTypeMember DOCUMENT_HERE 
-			///
 			public string SemanticVersionRange { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.Package sharedSecret ApiTypeMember DOCUMENT_HERE 
-			///
 			public string SharedSecret { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.Package themeEngineVersion ApiTypeMember DOCUMENT_HERE 
-			///
 			public string ThemeEngineVersion { get; set; }
 
-			///
-			///Whether or not there's a theme update.
-			///
 			public bool UpdateAvailable { get; set; }
 
-			///
-			///The date and time in UTC format the object was updated most recently.
-			///
 			public DateTime UpdateDate { get; set; }
 
-			///
-			///The AppKey is a runtime type. This only applies for themes that inherit from another theme. It shows the most current update available.
-			///
 			public string UpdateParentAppKey { get; set; }
 
-			///
-			///updateParentThemeName ApiType DOCUMENT_HERE 
-			///
 			public string UpdateParentThemeName { get; set; }
 
-			///
-			///updateParentThemeVersion ApiType DOCUMENT_HERE 
-			///
 			public string UpdateParentThemeVersion { get; set; }
 
-			///
-			///Unique identifier of the customer account (shopper or system user). System-supplied and read-only. If the shopper user is anonymous, the user ID represents a system-generated user ID string.
-			///
 			public string UserId { get; set; }
 
-			///
-			///List of Statuses that the application can move to during the application lifecycle. This is based on what the current value of the ApplicatinStatusId is.
-			///
 			public List<int> ValidApplicationStatusIdList { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/AppDev/PackageCollection.cs b/Mozu.Api/Contracts/AppDev/PackageCollection.cs
old mode 100644
new mode 100755
index 921af044..b5980c20
--- a/Mozu.Api/Contracts/AppDev/PackageCollection.cs
+++ b/Mozu.Api/Contracts/AppDev/PackageCollection.cs
@@ -14,34 +14,16 @@
 
 namespace Mozu.Api.Contracts.AppDev
 {
-		///
-		///	Mozu.AppDev.Contracts.PackageCollection ApiType DOCUMENT_HERE 
-		///
 		public class PackageCollection
 		{
-			///
-			///A list of requested items. All returned data is provided in an items array.For a failed request, the returned response may be success with an empty item array.
-			///
 			public List<Package> Items { get; set; }
 
-			///
-			///The total number of pages of the results divided per the `pageSize`.
-			///
 			public int PageCount { get; set; }
 
-			///
-			///The number of results to display on each page when creating paged results from a query. The amount is divided and displayed on the `pageCount `amount of pages. The default is 20 and maximum value is 200 per page.
-			///
 			public int PageSize { get; set; }
 
-			///
-			///When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a `pageSize `of 25, to get the 51st through the 75th items, use `startIndex=50`.
-			///
 			public int StartIndex { get; set; }
 
-			///
-			///The total number of items in the list.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/AppDev/PackageNamesCollection.cs b/Mozu.Api/Contracts/AppDev/PackageNamesCollection.cs
old mode 100644
new mode 100755
index cec88bc2..610a0441
--- a/Mozu.Api/Contracts/AppDev/PackageNamesCollection.cs
+++ b/Mozu.Api/Contracts/AppDev/PackageNamesCollection.cs
@@ -14,19 +14,10 @@
 
 namespace Mozu.Api.Contracts.AppDev
 {
-		///
-		///	Mozu.AppDev.Contracts.Public.PackageNamesCollection ApiType DOCUMENT_HERE 
-		///
 		public class PackageNamesCollection
 		{
-			///
-			///A list of requested items. All returned data is provided in an items array.For a failed request, the returned response may be success with an empty item array.
-			///
 			public List<string> Items { get; set; }
 
-			///
-			///The total number of items in the list.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/AppDev/PackageRequest.cs b/Mozu.Api/Contracts/AppDev/PackageRequest.cs
old mode 100644
new mode 100755
index 6847535c..528c6f16
--- a/Mozu.Api/Contracts/AppDev/PackageRequest.cs
+++ b/Mozu.Api/Contracts/AppDev/PackageRequest.cs
@@ -13,19 +13,10 @@
 
 namespace Mozu.Api.Contracts.AppDev
 {
-		///
-		///	Mozu.AppDev.Contracts.PackageRequest ApiType DOCUMENT_HERE 
-		///
 		public class PackageRequest
 		{
-			///
-			///Mozu.AppDev.Contracts.PackageRequest appKey ApiTypeMember DOCUMENT_HERE 
-			///
 			public string AppKey { get; set; }
 
-			///
-			///Mozu.AppDev.Contracts.PackageRequest parentThemeAppKey ApiTypeMember DOCUMENT_HERE 
-			///
 			public string ParentThemeAppKey { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/AppDev/PackageSummary.cs b/Mozu.Api/Contracts/AppDev/PackageSummary.cs
old mode 100644
new mode 100755
index abc4261e..a8746ab0
--- a/Mozu.Api/Contracts/AppDev/PackageSummary.cs
+++ b/Mozu.Api/Contracts/AppDev/PackageSummary.cs
@@ -13,54 +13,24 @@
 
 namespace Mozu.Api.Contracts.AppDev
 {
-		///
-		///	Mozu.AppDev.Contracts.PackageSummary ApiType DOCUMENT_HERE 
-		///
 		public class PackageSummary
 		{
-			///
-			///The unique identifier of the application.
-			///
 			public int ApplicationId { get; set; }
 
-			///
-			///Application Name
-			///
 			public string ApplicationName { get; set; }
 
-			///
-			///Application Type Id
-			///
 			public int ApplicationTypeId { get; set; }
 
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public int Id { get; set; }
 
-			///
-			///Indicates if a customer account and associated data is locked. If true, the user account is locked due to multiple failed authentication attempts. The user cannot login until the account is unlocked.
-			///
 			public bool IsLocked { get; set; }
 
-			///
-			///Application Major Version
-			///
 			public int MajorVersion { get; set; }
 
-			///
-			///Application Minor Version
-			///
 			public int MinorVersion { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
-			///
-			///Application Revision
-			///
 			public int Revision { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/AppDev/PackageSummaryCollection.cs b/Mozu.Api/Contracts/AppDev/PackageSummaryCollection.cs
old mode 100644
new mode 100755
index 786783b9..35b9a2e1
--- a/Mozu.Api/Contracts/AppDev/PackageSummaryCollection.cs
+++ b/Mozu.Api/Contracts/AppDev/PackageSummaryCollection.cs
@@ -14,34 +14,16 @@
 
 namespace Mozu.Api.Contracts.AppDev
 {
-		///
-		///	Mozu.AppDev.Contracts.PackageSummaryCollection ApiType DOCUMENT_HERE 
-		///
 		public class PackageSummaryCollection
 		{
-			///
-			///A list of requested items. All returned data is provided in an items array.For a failed request, the returned response may be success with an empty item array.
-			///
 			public List<PackageSummary> Items { get; set; }
 
-			///
-			///The total number of pages of the results divided per the `pageSize`.
-			///
 			public int PageCount { get; set; }
 
-			///
-			///The number of results to display on each page when creating paged results from a query. The amount is divided and displayed on the `pageCount `amount of pages. The default is 20 and maximum value is 200 per page.
-			///
 			public int PageSize { get; set; }
 
-			///
-			///When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a `pageSize `of 25, to get the 51st through the 75th items, use `startIndex=50`.
-			///
 			public int StartIndex { get; set; }
 
-			///
-			///The total number of items in the list.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/AppDev/RenameInfo.cs b/Mozu.Api/Contracts/AppDev/RenameInfo.cs
old mode 100644
new mode 100755
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Carts/Cart.cs b/Mozu.Api/Contracts/CommerceRuntime/Carts/Cart.cs
old mode 100644
new mode 100755
index 8c36ced3..40d4a4eb
--- a/Mozu.Api/Contracts/CommerceRuntime/Carts/Cart.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Carts/Cart.cs
@@ -24,209 +24,94 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Carts
 		///
 		public class Cart
 		{
-			///
-			///Identifier and datetime stamp information recorded when a user or application creates, updates, or deletes a resource entity. This value is system-supplied and read-only.
-			///
 			public AuditInfo AuditInfo { get; set; }
 
-			///
-			///An array of message details associated with the cart.
-			///
 			public CartMessage CartMessage { get; set; }
 
-			///
-			///A list of cart messages associated with the cart.
-			///
 			public List<CartMessage> CartMessages { get; set; }
 
-			///
-			///Collection (list or paged) of change messages logged for each modification made by a shopper to their carts, wishlists, orders, package, payment, pickup, and returns. Change log messages are system-supplied based on shopper actions and read only.
-			///
 			public List<ChangeMessage> ChangeMessages { get; set; }
 
-			///
-			///Code that identifies the channel associated with the site for the shopper's created shopping cart, order, and return.
-			///
 			public string ChannelCode { get; set; }
 
 			///
-			///Array list of coupon codes associated with a shopping cart and the associated order. These codes are entered by a shopper when proceeding to checkout. 
+			///The coupon codes applied to the cart. When the customer proceeds to checkout, the coupons applied to the cart apply to the order.
 			///
 			public List<string> CouponCodes { get; set; }
 
-			///
-			///3-letter ISO 4217 standard global currency code. Currently, only "USD" (US Dollar) is supported.
-			///
 			public string CurrencyCode { get; set; }
 
-			///
-			///The type of customer interaction used to create this shopping cart. Possible values are Website, Call, Store, or Unknown.
-			///
 			public string CustomerInteractionType { get; set; }
 
-			///
-			///Custom data for a given vendor set within the commerce process.
-			///
 			public JObject Data { get; set; }
 
-			///
-			///The aggregate total for all items in the cart, including costs associated with shopper-defined options or extras and any applied discounts.
-			///
 			public decimal? DiscountedSubtotal { get; set; }
 
-			///
-			///The subtotal of the cart, order, and wishlist items, including any applied discount calculations. Wishlist subtotals may change depending on the length of time, available discounts, and stock amounts of products at the time of review by shoppers.
-			///
 			public decimal? DiscountedTotal { get; set; }
 
-			///
-			///Estimated amount of discounts applied to all items in the carts and orders. System-supplied and read-only. This value will be available at the wish list, cart item, order item, and wish list item level at a later time.
-			///
 			public decimal? DiscountTotal { get; set; }
 
-			///
-			///Date and time in UTC format when a discount, credit, wish list, or cart expires. An expired discount no longer can be redeemed. An expired wish list is no longer available. An expired credit can no longer be redeemed for a purchase. Acart becomes inactive and expired based on a system-calculated interval. For example, if an anonymous shopper has 14 days of inactivity, the cart is considered abandoned after that period of inactivity. System-supplied and read-only.
-			///
 			public DateTime? ExpirationDate { get; set; }
 
-			///
-			///Extra properties (key-value pairs) that extend the primary object. Think of this as a property bag of string keys and string values.
-			///
 			public List<ExtendedProperty> ExtendedProperties { get; set; }
 
-			///
-			///The monetary sum of all fees incurred in the cart, order, line item in a cart, or line item in an order. This value is not calculated for wish lists at this time.
-			///
 			public decimal? FeeTotal { get; set; }
 
-			///
-			///Properties of the information required to fulfill the cart, order, or wish list. Shoppers can fulfill ordered items by using in-store pickup or direct shipping.
-			///
 			public FulfillmentInfo FulfillmentInfo { get; set; }
 
-			///
-			///The combined price for all handling costs calculated together for shipped orders, not for digital or in-store pickup. This includes all handling costs per the product line items and options, excluding taxes and discounts.
-			///
 			public decimal? HandlingAmount { get; set; }
 
-			///
-			///The handling fee subtotal included in the cart calculation.
-			///
 			public decimal? HandlingSubTotal { get; set; }
 
-			///
-			///Calculated total tax amount for handling costs if the cart/order is subject to sales tax. 
-			///
 			public decimal? HandlingTaxTotal { get; set; }
 
-			///
-			///The handling fee total included in the cart calculation.
-			///
 			public decimal? HandlingTotal { get; set; }
 
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public string Id { get; set; }
 
 			///
-			///The list of invalid coupons the shopper attempted to enter for the cart or order. These coupons may no longer be valid or incorrectly entered.
+			///The list of invalid coupons the shopper attempted to enter for the cart.
 			///
 			public List<InvalidCoupon> InvalidCoupons { get; set; }
 
-			///
-			///An array list of objects in the returned collection.
-			///
 			public List<CartItem> Items { get; set; }
 
-			///
-			///The total amount of calculated tax for items, used by carts, orders, and wish lists.
-			///
 			public decimal? ItemTaxTotal { get; set; }
 
-			///
-			///The date in UTC Date/Time when the items in the cart were last validated against the site's product catalog. System-supplied and read-only.
-			///
 			public DateTime? LastValidationDate { get; set; }
 
-			///
-			///The total charge for the line item with all weighted order level manual adjustments.
-			///
 			public decimal? LineItemSubtotalWithOrderAdjustments { get; set; }
 
-			///
-			///List of order-level discounts projected to apply to the cart at checkout or order.
-			///
 			public List<AppliedDiscount> OrderDiscounts { get; set; }
 
-			///
-			///Pricelist code
-			///
 			public string PriceListCode { get; set; }
 
-			///
-			///The total shipping amount for the cart before discounts and adjustments.
-			///
 			public decimal? ShippingAmountBeforeDiscountsAndAdjustments { get; set; }
 
-			///
-			///The shipping subtotal amount calculated without any applied discounts for line item and entire amounts of carts and orders. This property is not calculated for wish lists at this time.
-			///
 			public decimal? ShippingSubTotal { get; set; }
 
-			///
-			///The total amount of tax incurred on the shipping charges in the cart and order. This property is not calculated at this time for wish lists.
-			///
 			public decimal? ShippingTaxTotal { get; set; }
 
-			///
-			///The calculated total shipping amount estimated for carts or orders, including tax. This amount is not calculated for wish lists at this time.
-			///
 			public decimal? ShippingTotal { get; set; }
 
-			///
-			///Unique identifier of the site.
-			///
 			public int? SiteId { get; set; }
 
-			///
-			///Estimated amount of the cart or order without sales tax, shipping costs, and other fees. This amount is not calculated for wish lists at this time.
-			///
 			public decimal? Subtotal { get; set; }
 
-			///
-			///Leverage this property within a [tax Arc.js action](https://www.mozu.com/docs/arcjs/commerce-catalog-storefront-tax/commerce-catalog-storefront-tax.htm) to supplement the tax information for this item or object with custom JSON data.
-			///
+			public List<SuggestedDiscount> SuggestedDiscounts { get; set; }
+
 			public JObject TaxData { get; set; }
 
-			///
-			///The total monetary sum of sales tax estimated for a cart or order.
-			///
 			public decimal? TaxTotal { get; set; }
 
-			///
-			///Unique identifier of the Mozu tenant.
-			///
 			public int? TenantId { get; set; }
 
-			///
-			///Total is used to indicate the monetary, estimated total amount of the cart or order, including items, sales tax, shipping costs, and other fees. Totals are not estimated for wish lists at this time.
-			///
 			public decimal? Total { get; set; }
 
-			///
-			///Unique identifier of the customer account (shopper or system user). System-supplied and read-only. If the shopper user is anonymous, the user ID represents a system-generated user ID string.
-			///
 			public string UserId { get; set; }
 
-			///
-			///Unique identifier of the customer visit in which the cart was created or last modified.
-			///
 			public string VisitId { get; set; }
 
-			///
-			///Unique identifier of the web session in which the cart, order, return, or wish list was created or last modified.
-			///
 			public string WebSessionId { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Carts/CartChangeMessageCollection.cs b/Mozu.Api/Contracts/CommerceRuntime/Carts/CartChangeMessageCollection.cs
old mode 100644
new mode 100755
index d67e51dd..63c24695
--- a/Mozu.Api/Contracts/CommerceRuntime/Carts/CartChangeMessageCollection.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Carts/CartChangeMessageCollection.cs
@@ -20,14 +20,8 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Carts
 		///
 		public class CartChangeMessageCollection
 		{
-			///
-			///A list of requested items. All returned data is provided in an items array.For a failed request, the returned response may be success with an empty item array.
-			///
 			public List<ChangeMessage> Items { get; set; }
 
-			///
-			///The total number of items in the list.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Carts/CartItem.cs b/Mozu.Api/Contracts/CommerceRuntime/Carts/CartItem.cs
old mode 100644
new mode 100755
index 87008647..3f1bda09
--- a/Mozu.Api/Contracts/CommerceRuntime/Carts/CartItem.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Carts/CartItem.cs
@@ -24,219 +24,97 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Carts
 		///
 		public class CartItem
 		{
-			///
-			///The adjusted subtotal of the line item, including all manual adjustments, discounts, shipping charges and discounts, and duty or any other additional line item fees.
-			///
 			public decimal? AdjustedLineItemSubtotal { get; set; }
 
-			///
-			///Identifier and datetime stamp information recorded when a user or application creates, updates, or deletes a resource entity. This value is system-supplied and read-only.
-			///
 			public AuditInfo AuditInfo { get; set; }
 
-			///
-			///Custom data for a given vendor set within the commerce process.
-			///
+			public int? AutoAddDiscountId { get; set; }
+
 			public JObject Data { get; set; }
 
-			///
-			///The subtotal of the cart, order, and wishlist items, including any applied discount calculations. Wishlist subtotals may change depending on the length of time, available discounts, and stock amounts of products at the time of review by shoppers.
-			///
 			public decimal? DiscountedTotal { get; set; }
 
-			///
-			///Estimated amount of discounts applied to all items in the carts and orders. System-supplied and read-only. This value will be available at the wish list, cart item, order item, and wish list item level at a later time.
-			///
 			public decimal? DiscountTotal { get; set; }
 
-			///
-			///Represents the total price of the cart item extended to the shopper. This begins with the Unit Price, then uses any of the following prices if they are defined, in the following order: Override Amount, Sale Amount, List Amount. This value is not calculated for wish lists at this time.
-			///
 			public decimal? ExtendedTotal { get; set; }
 
-			///
-			///The monetary sum of all fees incurred in the cart, order, line item in a cart, or line item in an order. This value is not calculated for wish lists at this time.
-			///
 			public decimal? FeeTotal { get; set; }
 
-			///
-			///The code that identifies the location used to fulfill the cart/cart item or order/order item. This code can include physical store locations for in-store pickup, warehouse locations providing the products for shipment, or the location for the digital file(s).
-			///
 			public string FulfillmentLocationCode { get; set; }
 
-			///
-			///The method used to fulfill this cart or order item. The method includes direct ship or in-store pickup. The available methods depend on the supported fulfillment types for the product. 
-			///
 			public string FulfillmentMethod { get; set; }
 
-			///
-			///The combined price for all handling costs calculated together for shipped orders, not for digital or in-store pickup. This includes all handling costs per the product line items and options, excluding taxes and discounts. 
-			///
 			public decimal? HandlingAmount { get; set; }
 
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public string Id { get; set; }
 
-			///
-			///Indicates if the product in a cart, order, or wish list is purchased on a recurring schedule. If true, the item can be purchased or fulfilled at regular intervals, such as a monthly billing cycle. For example, digital or physical product subscriptions are recurring cart items. This property is not used at this time and is reserved for future functionality.
-			///
 			public bool? IsRecurring { get; set; }
 
-			///
-			///Indicates if the item is subject to taxation, used by products, options, extras, cart and order items, line items, and wish lists. If true, the entity is subject to tax based on the relevant tax rate and rules.
-			///
 			public bool? IsTaxable { get; set; }
 
-			///
-			///The total amount of calculated tax for items, used by carts, orders, and wish lists.
-			///
 			public decimal? ItemTaxTotal { get; set; }
 
-			///
-			///The line id assigned to the order item. Visible only in the Admin, this is set from the Admin or in CommerceRuntime when a cart is converted to an order.
-			///
 			public int? LineId { get; set; }
 
-			///
-			///Language used for the entity. Currently, only "en-US" is supported.
-			///
 			public string LocaleCode { get; set; }
 
-			///
-			///The properties of a product, referenced and used by carts, orders, wish lists, and returns.
-			///
 			public Product Product { get; set; }
 
 			///
-			///The applicable product discount for an associated cart, order, or wish list. 
+			///Product discounts displays a list of all applicable discount.
 			///
 			public AppliedLineItemProductDiscount ProductDiscount { get; set; }
 
-			///
-			///List of product-level discounts projected to apply to a cart, order, or wish list.
-			///
 			public List<AppliedLineItemProductDiscount> ProductDiscounts { get; set; }
 
-			///
-			///The specified quantity of objects and items. This property is used for numerous object types including products, options, components within a product bundle, cart and order items, returned items, shipping line items, items in a digital product. and items associated with types and reservations.
-			///
+			public string PurchaseLocation { get; set; }
+
 			public int Quantity { get; set; }
 
-			///
-			///The total shipping amount for the line item before discounts and adjustments.
-			///
 			public decimal? ShippingAmountBeforeDiscountsAndAdjustments { get; set; }
 
-			///
-			///List of shipping discounts projected to apply to carts, orders, and wish lists and items at checkout.
-			///
 			public List<AppliedLineItemShippingDiscount> ShippingDiscounts { get; set; }
 
-			///
-			///The total amount of tax incurred on the shipping charges in the cart and order. This property is not calculated at this time for wish lists.
-			///
 			public decimal? ShippingTaxTotal { get; set; }
 
-			///
-			///The calculated total shipping amount estimated for carts or orders, including tax. This amount is not calculated for wish lists at this time.
-			///
 			public decimal? ShippingTotal { get; set; }
 
-			///
-			///Estimated amount of the cart or order without sales tax, shipping costs, and other fees. This amount is not calculated for wish lists at this time.
-			///
 			public decimal? Subtotal { get; set; }
 
-			///
-			///The monetary amount of an item in the cart that is subject to tax. This amount typically represents the line item subtotal before applied discounts for an order.
-			///
 			public decimal? TaxableTotal { get; set; }
 
-			///
-			///Leverage this property within a [tax Arc.js action](https://www.mozu.com/docs/arcjs/commerce-catalog-storefront-tax/commerce-catalog-storefront-tax.htm) to supplement the tax information for this item or object with custom JSON data.
-			///
 			public JObject TaxData { get; set; }
 
-			///
-			///Total is used to indicate the monetary, estimated total amount of the cart or order, including items, sales tax, shipping costs, and other fees. Totals are not estimated for wish lists at this time.
-			///
 			public decimal? Total { get; set; }
 
-			///
-			///The total charge for the line item without any weighted order level shipping and handling charges.
-			///
 			public decimal? TotalWithoutWeightedShippingAndHandling { get; set; }
 
-			///
-			///The total charge for the line item with all weighted order level shipping and handling charges.
-			///
 			public decimal? TotalWithWeightedShippingAndHandling { get; set; }
 
-			///
-			///Properties of the price per unit of a product, associated with cart and order items. This price is not used for wish lists at this time.
-			///
 			public CommerceUnitPrice UnitPrice { get; set; }
 
-			///
-			///The total weighted order level manual adjustment amount.
-			///
 			public decimal? WeightedOrderAdjustment { get; set; }
 
-			///
-			///The total weighted order level discount amount.
-			///
 			public decimal? WeightedOrderDiscount { get; set; }
 
-			///
-			///The total weighted order level duty charges.
-			///
 			public decimal? WeightedOrderDuty { get; set; }
 
-			///
-			///The amount to adjust the order handling fee.
-			///
 			public decimal? WeightedOrderHandlingAdjustment { get; set; }
 
-			///
-			///The total weighted order level handling fee amount.
-			///
 			public decimal? WeightedOrderHandlingFee { get; set; }
 
-			///
-			///The total weighted order handling fee discount amount.
-			///
 			public decimal? WeightedOrderHandlingFeeDiscount { get; set; }
 
-			///
-			///The total weighted order level handling fee tax amount.
-			///
 			public decimal? WeightedOrderHandlingFeeTax { get; set; }
 
-			///
-			///The total weighted order level shipping charge.
-			///
 			public decimal? WeightedOrderShipping { get; set; }
 
-			///
-			///The total weighted order level shipping discount amount.
-			///
 			public decimal? WeightedOrderShippingDiscount { get; set; }
 
-			///
-			///The total weighted order level shipping manual adjustment amount.
-			///
 			public decimal? WeightedOrderShippingManualAdjustment { get; set; }
 
-			///
-			///The total weighted order level shipping tax amount.
-			///
 			public decimal? WeightedOrderShippingTax { get; set; }
 
-			///
-			///The total weighted order level tax amount.
-			///
 			public decimal? WeightedOrderTax { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Carts/CartItemCollection.cs b/Mozu.Api/Contracts/CommerceRuntime/Carts/CartItemCollection.cs
old mode 100644
new mode 100755
index 0cdb3f84..b7cbc04c
--- a/Mozu.Api/Contracts/CommerceRuntime/Carts/CartItemCollection.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Carts/CartItemCollection.cs
@@ -19,14 +19,8 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Carts
 		///
 		public class CartItemCollection
 		{
-			///
-			///An array list of objects in the returned collection.
-			///
 			public List<CartItem> Items { get; set; }
 
-			///
-			///The number of results listed in the query collection, represented by a signed 64-bit (8-byte) integer. This value is system-supplied and read-only.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Carts/CartMessage.cs b/Mozu.Api/Contracts/CommerceRuntime/Carts/CartMessage.cs
old mode 100644
new mode 100755
index d1317a10..7fd099da
--- a/Mozu.Api/Contracts/CommerceRuntime/Carts/CartMessage.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Carts/CartMessage.cs
@@ -15,24 +15,12 @@
 
 namespace Mozu.Api.Contracts.CommerceRuntime.Carts
 {
-		///
-		///	Mozu.CommerceRuntime.Contracts.Carts.CartMessage ApiType DOCUMENT_HERE 
-		///
 		public class CartMessage
 		{
-			///
-			///The text of the change message, such as "This product is no longer available." System-supplied and read-only.
-			///
 			public string Message { get; set; }
 
-			///
-			///Specifies the cart message type.
-			///
 			public string MessageType { get; set; }
 
-			///
-			///An array of product details for any products that have been removed from the cart.
-			///
 			public List<Product> ProductsRemoved { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Carts/CartSummary.cs b/Mozu.Api/Contracts/CommerceRuntime/Carts/CartSummary.cs
old mode 100644
new mode 100755
index d3990d14..3ac7f073
--- a/Mozu.Api/Contracts/CommerceRuntime/Carts/CartSummary.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Carts/CartSummary.cs
@@ -18,24 +18,12 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Carts
 		///
 		public class CartSummary
 		{
-			///
-			///If true, this shopping cart is active.
-			///
 			public bool? HasActiveCart { get; set; }
 
-			///
-			///suaIf true, the cart's period of inactivity is past its calculated expiration date and the cart is considered abandoned.
-			///
 			public bool? IsExpired { get; set; }
 
-			///
-			///The total number of line items in the cart. Each line item can have multiple quantities.
-			///
 			public int? ItemCount { get; set; }
 
-			///
-			///Total is used to indicate the monetary, estimated total amount of the cart or order, including items, sales tax, shipping costs, and other fees. Totals are not estimated for wish lists at this time.
-			///
 			public decimal? Total { get; set; }
 
 			///
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Channels/Channel.cs b/Mozu.Api/Contracts/CommerceRuntime/Channels/Channel.cs
old mode 100644
new mode 100755
index dea580e7..b2c47b49
--- a/Mozu.Api/Contracts/CommerceRuntime/Channels/Channel.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Channels/Channel.cs
@@ -20,41 +20,20 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Channels
 		///
 		public class Channel
 		{
-			///
-			///Identifier and datetime stamp information recorded when a user or application creates, updates, or deletes a resource entity. This value is system-supplied and read-only.
-			///
 			public AuditInfo AuditInfo { get; set; }
 
-			///
-			///User-defined code that uniquely identifies the channel.
-			///
 			public string Code { get; set; }
 
 			public string CountryCode { get; set; }
 
-			///
-			///User-defined code that identifies the channel group.
-			///
 			public string GroupCode { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
-			///
-			///The geographical region associated with this channel. This region could represent any geographical entity from a state to a continent.
-			///
 			public string Region { get; set; }
 
-			///
-			///Array list of site identifiers associated with this channel. Each tenant site must have a channel association.
-			///
 			public List<int> SiteIds { get; set; }
 
-			///
-			///Unique identifier of the Mozu tenant.
-			///
 			public int TenantId { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Channels/ChannelCollection.cs b/Mozu.Api/Contracts/CommerceRuntime/Channels/ChannelCollection.cs
old mode 100644
new mode 100755
index 1b6e655e..0e1ee0cb
--- a/Mozu.Api/Contracts/CommerceRuntime/Channels/ChannelCollection.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Channels/ChannelCollection.cs
@@ -19,29 +19,14 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Channels
 		///
 		public class ChannelCollection
 		{
-			///
-			///An array list of objects in the returned collection.
-			///
 			public List<Channel> Items { get; set; }
 
-			///
-			///The number of pages returned based on the startIndex and pageSize values specified. This value is system-supplied and read-only.
-			///
 			public int PageCount { get; set; }
 
-			///
-			///The number of results to display on each page when creating paged results from a query. The maximum value is 200.
-			///
 			public int PageSize { get; set; }
 
-			///
-			///When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.
-			///
 			public int StartIndex { get; set; }
 
-			///
-			///The number of results listed in the query collection, represented by a signed 64-bit (8-byte) integer. This value is system-supplied and read-only.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Channels/ChannelGroup.cs b/Mozu.Api/Contracts/CommerceRuntime/Channels/ChannelGroup.cs
old mode 100644
new mode 100755
index 0e353c37..c0b21cea
--- a/Mozu.Api/Contracts/CommerceRuntime/Channels/ChannelGroup.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Channels/ChannelGroup.cs
@@ -19,24 +19,12 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Channels
 		///
 		public class ChannelGroup
 		{
-			///
-			///Identifier and datetime stamp information recorded when a user or application creates, updates, or deletes a resource entity. This value is system-supplied and read-only.
-			///
 			public AuditInfo AuditInfo { get; set; }
 
-			///
-			///User-defined code that identifies the channel group.
-			///
 			public string Code { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
-			///
-			///Unique identifier of the Mozu tenant.
-			///
 			public int TenantId { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Channels/ChannelGroupCollection.cs b/Mozu.Api/Contracts/CommerceRuntime/Channels/ChannelGroupCollection.cs
old mode 100644
new mode 100755
index 67c84d6c..b97876e5
--- a/Mozu.Api/Contracts/CommerceRuntime/Channels/ChannelGroupCollection.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Channels/ChannelGroupCollection.cs
@@ -19,29 +19,14 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Channels
 		///
 		public class ChannelGroupCollection
 		{
-			///
-			///An array list of objects in the returned collection.
-			///
 			public List<ChannelGroup> Items { get; set; }
 
-			///
-			///The number of pages returned based on the startIndex and pageSize values specified. This value is system-supplied and read-only.
-			///
 			public int PageCount { get; set; }
 
-			///
-			///The number of results to display on each page when creating paged results from a query. The maximum value is 200.
-			///
 			public int PageSize { get; set; }
 
-			///
-			///When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.
-			///
 			public int StartIndex { get; set; }
 
-			///
-			///The number of results listed in the query collection, represented by a signed 64-bit (8-byte) integer. This value is system-supplied and read-only.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Checkouts/Checkout.cs b/Mozu.Api/Contracts/CommerceRuntime/Checkouts/Checkout.cs
new file mode 100755
index 00000000..dbfdd1e2
--- /dev/null
+++ b/Mozu.Api/Contracts/CommerceRuntime/Checkouts/Checkout.cs
@@ -0,0 +1,135 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using Newtonsoft.Json.Linq;
+
+using Mozu.Api.Contracts.CommerceRuntime.Discounts;
+using Mozu.Api.Contracts.CommerceRuntime.Fulfillment;
+using Mozu.Api.Contracts.CommerceRuntime.Orders;
+using Mozu.Api.Contracts.CommerceRuntime.Payments;
+using Mozu.Api.Contracts.Core;
+
+namespace Mozu.Api.Contracts.CommerceRuntime.Checkouts
+{
+		public class Checkout
+		{
+			public bool? AcceptsMarketing { get; set; }
+
+			public decimal AmountRemainingForPayment { get; set; }
+
+			public List<OrderAttribute> Attributes { get; set; }
+
+			public AuditInfo AuditInfo { get; set; }
+
+			public List<string> AvailableActions { get; set; }
+
+			public string ChannelCode { get; set; }
+
+			public List<string> CouponCodes { get; set; }
+
+			public string CurrencyCode { get; set; }
+
+			public int? CustomerAccountId { get; set; }
+
+			public string CustomerInteractionType { get; set; }
+
+			public string CustomerTaxId { get; set; }
+
+			public JObject Data { get; set; }
+
+			public List<Destination> Destinations { get; set; }
+
+			public decimal? DutyTotal { get; set; }
+
+			public string Email { get; set; }
+
+			public decimal FeeTotal { get; set; }
+
+			public List<CheckoutGrouping> Groupings { get; set; }
+
+			public decimal HandlingSubTotal { get; set; }
+
+			public decimal HandlingTaxTotal { get; set; }
+
+			public decimal HandlingTotal { get; set; }
+
+			public string Id { get; set; }
+
+			public List<InvalidCoupon> InvalidCoupons { get; set; }
+
+			public string IpAddress { get; set; }
+
+			public bool? IsTaxExempt { get; set; }
+
+			public decimal ItemLevelHandlingDiscountTotal { get; set; }
+
+			public decimal ItemLevelProductDiscountTotal { get; set; }
+
+			public decimal ItemLevelShippingDiscountTotal { get; set; }
+
+			public List<OrderItem> Items { get; set; }
+
+			public decimal ItemTaxTotal { get; set; }
+
+			public decimal ItemTotal { get; set; }
+
+			public string LocationCode { get; set; }
+
+			public int? Number { get; set; }
+
+			public List<AppliedDiscount> OrderDiscounts { get; set; }
+
+			public decimal OrderLevelHandlingDiscountTotal { get; set; }
+
+			public decimal OrderLevelProductDiscountTotal { get; set; }
+
+			public decimal OrderLevelShippingDiscountTotal { get; set; }
+
+			public string OriginalCartId { get; set; }
+
+			public List<Payment> Payments { get; set; }
+
+			public string PriceListCode { get; set; }
+
+			public decimal ShippingSubTotal { get; set; }
+
+			public decimal ShippingTaxTotal { get; set; }
+
+			public decimal ShippingTotal { get; set; }
+
+			public ShopperNotes ShopperNotes { get; set; }
+
+			public int SiteId { get; set; }
+
+			public string SourceDevice { get; set; }
+
+			public DateTime? SubmittedDate { get; set; }
+
+			public decimal SubTotal { get; set; }
+
+			public List<SuggestedDiscount> SuggestedDiscounts { get; set; }
+
+			public JObject TaxData { get; set; }
+
+			public int TenantId { get; set; }
+
+			public decimal Total { get; set; }
+
+			public string Type { get; set; }
+
+			public string VisitId { get; set; }
+
+			public string WebSessionId { get; set; }
+
+		}
+
+}
\ No newline at end of file
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Checkouts/CheckoutAction.cs b/Mozu.Api/Contracts/CommerceRuntime/Checkouts/CheckoutAction.cs
new file mode 100755
index 00000000..a1a8b6ab
--- /dev/null
+++ b/Mozu.Api/Contracts/CommerceRuntime/Checkouts/CheckoutAction.cs
@@ -0,0 +1,22 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+
+
+namespace Mozu.Api.Contracts.CommerceRuntime.Checkouts
+{
+		public class CheckoutAction
+		{
+			public string ActionName { get; set; }
+
+		}
+
+}
\ No newline at end of file
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Checkouts/CheckoutCollection.cs b/Mozu.Api/Contracts/CommerceRuntime/Checkouts/CheckoutCollection.cs
new file mode 100755
index 00000000..5ba3d498
--- /dev/null
+++ b/Mozu.Api/Contracts/CommerceRuntime/Checkouts/CheckoutCollection.cs
@@ -0,0 +1,31 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+
+
+namespace Mozu.Api.Contracts.CommerceRuntime.Checkouts
+{
+		public class CheckoutCollection
+		{
+			public List<Checkout> Items { get; set; }
+
+			public int PageCount { get; set; }
+
+			public int PageSize { get; set; }
+
+			public int StartIndex { get; set; }
+
+			public int TotalCount { get; set; }
+
+		}
+
+}
\ No newline at end of file
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Checkouts/CheckoutGroupRates.cs b/Mozu.Api/Contracts/CommerceRuntime/Checkouts/CheckoutGroupRates.cs
new file mode 100755
index 00000000..49449a2c
--- /dev/null
+++ b/Mozu.Api/Contracts/CommerceRuntime/Checkouts/CheckoutGroupRates.cs
@@ -0,0 +1,26 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+
+using Mozu.Api.Contracts.CommerceRuntime.Fulfillment;
+
+namespace Mozu.Api.Contracts.CommerceRuntime.Checkouts
+{
+		public class CheckoutGroupRates
+		{
+			public string GroupingId { get; set; }
+
+			public List<ShippingRate> ShippingRates { get; set; }
+
+		}
+
+}
\ No newline at end of file
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Checkouts/CheckoutGroupShippingMethod.cs b/Mozu.Api/Contracts/CommerceRuntime/Checkouts/CheckoutGroupShippingMethod.cs
new file mode 100755
index 00000000..992d1b2a
--- /dev/null
+++ b/Mozu.Api/Contracts/CommerceRuntime/Checkouts/CheckoutGroupShippingMethod.cs
@@ -0,0 +1,25 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+
+using Mozu.Api.Contracts.CommerceRuntime.Fulfillment;
+
+namespace Mozu.Api.Contracts.CommerceRuntime.Checkouts
+{
+		public class CheckoutGroupShippingMethod
+		{
+			public string GroupingId { get; set; }
+
+			public ShippingRate ShippingRate { get; set; }
+
+		}
+
+}
\ No newline at end of file
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Checkouts/CheckoutGrouping.cs b/Mozu.Api/Contracts/CommerceRuntime/Checkouts/CheckoutGrouping.cs
new file mode 100755
index 00000000..3c56483a
--- /dev/null
+++ b/Mozu.Api/Contracts/CommerceRuntime/Checkouts/CheckoutGrouping.cs
@@ -0,0 +1,76 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using Newtonsoft.Json.Linq;
+
+using Mozu.Api.Contracts.CommerceRuntime.Discounts;
+using Mozu.Api.Contracts.Core;
+
+namespace Mozu.Api.Contracts.CommerceRuntime.Checkouts
+{
+		public class CheckoutGrouping
+		{
+			public string DestinationId { get; set; }
+
+			public decimal? DutyAmount { get; set; }
+
+			public decimal DutyTotal { get; set; }
+
+			public string FulfillmentMethod { get; set; }
+
+			public decimal? HandlingAmount { get; set; }
+
+			public List<AppliedDiscount> HandlingDiscounts { get; set; }
+
+			public decimal HandlingSubTotal { get; set; }
+
+			public decimal? HandlingTax { get; set; }
+
+			public decimal HandlingTaxTotal { get; set; }
+
+			public decimal HandlingTotal { get; set; }
+
+			public string Id { get; set; }
+
+			public decimal ItemLevelHandlingDiscountTotal { get; set; }
+
+			public decimal ItemLevelShippingDiscountTotal { get; set; }
+
+			public List<string> OrderItemIds { get; set; }
+
+			public decimal OrderLevelHandlingDiscountTotal { get; set; }
+
+			public decimal OrderLevelShippingDiscountTotal { get; set; }
+
+			public decimal? ShippingAmount { get; set; }
+
+			public List<ShippingDiscount> ShippingDiscounts { get; set; }
+
+			public string ShippingMethodCode { get; set; }
+
+			public string ShippingMethodName { get; set; }
+
+			public decimal ShippingSubTotal { get; set; }
+
+			public decimal? ShippingTax { get; set; }
+
+			public decimal ShippingTaxTotal { get; set; }
+
+			public decimal ShippingTotal { get; set; }
+
+			public bool StandaloneGroup { get; set; }
+
+			public JObject TaxData { get; set; }
+
+		}
+
+}
\ No newline at end of file
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Checkouts/ItemsForDestination.cs b/Mozu.Api/Contracts/CommerceRuntime/Checkouts/ItemsForDestination.cs
new file mode 100755
index 00000000..7ec78027
--- /dev/null
+++ b/Mozu.Api/Contracts/CommerceRuntime/Checkouts/ItemsForDestination.cs
@@ -0,0 +1,25 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+
+
+namespace Mozu.Api.Contracts.CommerceRuntime.Checkouts
+{
+		public class ItemsForDestination
+		{
+			public string DestinationId { get; set; }
+
+			public List<string> ItemIds { get; set; }
+
+		}
+
+}
\ No newline at end of file
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Commerce/Adjustment.cs b/Mozu.Api/Contracts/CommerceRuntime/Commerce/Adjustment.cs
old mode 100644
new mode 100755
index cc30e850..3940a2e8
--- a/Mozu.Api/Contracts/CommerceRuntime/Commerce/Adjustment.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Commerce/Adjustment.cs
@@ -18,19 +18,10 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Commerce
 		///
 		public class Adjustment
 		{
-			///
-			///The amount of the order-level adjustment, which can be a positive or negative amount.
-			///
 			public decimal? Amount { get; set; }
 
-			///
-			///The localized description in text for the object, displayed per the locale code. For example, descriptions are used for product descriptions, attributes, and pre-authorization transaction types.
-			///
 			public string Description { get; set; }
 
-			///
-			///Administrator notes associated with the order adjustment. These comments are not shopper facing.
-			///
 			public string InternalComment { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Commerce/ChangeMessage.cs b/Mozu.Api/Contracts/CommerceRuntime/Commerce/ChangeMessage.cs
old mode 100644
new mode 100755
index 5aa50612..7c726dcd
--- a/Mozu.Api/Contracts/CommerceRuntime/Commerce/ChangeMessage.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Commerce/ChangeMessage.cs
@@ -23,69 +23,30 @@ public class ChangeMessage
 			///
 			public decimal? Amount { get; set; }
 
-			///
-			///Unique identifier of an app available in your  tenant or within  Dev Center. This ID is unique across all apps installed, initialized, and enabled in the  and those in development through the Dev Center Console.
-			///
 			public string AppId { get; set; }
 
-			///
-			///The application's key.
-			///
 			public string AppKey { get; set; }
 
-			///
-			///The application's name.
-			///
 			public string AppName { get; set; }
 
-			///
-			///The unique identifier of the API request associated with the event action, which might contain multiple actions.
-			///
 			public string CorrelationId { get; set; }
 
-			///
-			///Date and time when the entity was created, represented in UTC Date/Time.
-			///
 			public DateTime? CreateDate { get; set; }
 
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public string Id { get; set; }
 
-			///
-			///Identifier for the object associated with the change message, which can represent a cart, cart item, or an order.
-			///
 			public string Identifier { get; set; }
 
-			///
-			///The text of the change message, such as "This product is no longer available." System-supplied and read-only.
-			///
 			public string Message { get; set; }
 
-			///
-			///Metadata content for entities, used by document lists, document type lists, document type, views, entity lists, and list views.
-			///
 			public object Metadata { get; set; }
 
-			///
-			///The new value of the object affected by the change, such as the new price of the product. System-supplied and read-only.
-			///
 			public string NewValue { get; set; }
 
-			///
-			///The prior value of the object affected by the change, such as the price of the product when it was added to the cart. System-supplied and read-only.
-			///
 			public string OldValue { get; set; }
 
-			///
-			///The text that appears on the subject line of the message, such as "The product price has changed."
-			///
 			public string Subject { get; set; }
 
-			///
-			///Represents the type of object affected by the change, such as Cart Item or Product. System-supplied and read-only.
-			///
 			public string SubjectType { get; set; }
 
 			///
@@ -93,29 +54,17 @@ public class ChangeMessage
 			///
 			public bool? Success { get; set; }
 
-			///
-			///The user's first name.
-			///
 			public string UserFirstName { get; set; }
 
 			///
-			///Unique identifier of the customer account (shopper or system user). System-supplied and read-only. If the shopper user is anonymous, the user ID represents a system-generated user ID string.
+			///The unique identifier of the user who initiated the change.
 			///
 			public string UserId { get; set; }
 
-			///
-			///The user's last name.
-			///
 			public string UserLastName { get; set; }
 
-			///
-			///The user type (e.g. Shopper, Admin, etc.).
-			///
 			public string UserScopeType { get; set; }
 
-			///
-			///The action associated with this message. For example, if the price of a product changes, the verb could be "Increased" or "Decreased". If the product is no longer available, the verb could be "Invalidated". System-supplied and read-only.
-			///
 			public string Verb { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Commerce/CommerceUnitPrice.cs b/Mozu.Api/Contracts/CommerceRuntime/Commerce/CommerceUnitPrice.cs
old mode 100644
new mode 100755
index ea200bb5..090452aa
--- a/Mozu.Api/Contracts/CommerceRuntime/Commerce/CommerceUnitPrice.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Commerce/CommerceUnitPrice.cs
@@ -18,24 +18,12 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Commerce
 		///
 		public class CommerceUnitPrice
 		{
-			///
-			///Represents the total price of the line item extended to the shopper. This begins with the Unit Price, then uses any of the following prices if they are defined, in the following order: Override Amount, Sale Amount, List Amount.
-			///
 			public decimal? ExtendedAmount { get; set; }
 
-			///
-			///The price the item is listed for in the storefront.
-			///
 			public decimal? ListAmount { get; set; }
 
-			///
-			///The override price of the item set by the merchant for a given order.
-			///
 			public decimal? OverrideAmount { get; set; }
 
-			///
-			///The sale price set for the item.
-			///
 			public decimal? SaleAmount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Commerce/ExtendedProperty.cs b/Mozu.Api/Contracts/CommerceRuntime/Commerce/ExtendedProperty.cs
old mode 100644
new mode 100755
index f26f9556..56935787
--- a/Mozu.Api/Contracts/CommerceRuntime/Commerce/ExtendedProperty.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Commerce/ExtendedProperty.cs
@@ -13,19 +13,10 @@
 
 namespace Mozu.Api.Contracts.CommerceRuntime.Commerce
 {
-		///
-		///	Mozu.CommerceRuntime.Contracts.Commerce.ExtendedProperty ApiType DOCUMENT_HERE 
-		///
 		public class ExtendedProperty
 		{
-			///
-			///Key used for metadata defined for objects, including extensible attributes, custom attributes associated with a shipping provider, and search synonyms definitions. This content may be user-defined depending on the object and usage.For search synonym definitions, refer to [Synonym Expansion Types](https://www.mozu.com/docs/Developer/api-guides/search-settings.htm#synonym_expansion_types) for more information about the key usage.
-			///
 			public string Key { get; set; }
 
-			///
-			///The value of a property, used by numerous objects within  including facets, attributes, products, localized content, metadata, capabilities ( and third-party), location inventory adjustment, and more. The value may be a string, integer, or double. Validation may be run against the entered and saved values depending on the object type.
-			///
 			public string Value { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Commerce/PackageMeasurements.cs b/Mozu.Api/Contracts/CommerceRuntime/Commerce/PackageMeasurements.cs
old mode 100644
new mode 100755
index 54dc52a4..d54e4df4
--- a/Mozu.Api/Contracts/CommerceRuntime/Commerce/PackageMeasurements.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Commerce/PackageMeasurements.cs
@@ -19,24 +19,12 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Commerce
 		///
 		public class PackageMeasurements
 		{
-			///
-			///Height of the package in imperial units of feet and inches.
-			///
 			public Measurement Height { get; set; }
 
-			///
-			///Length of the package in imperial units of feet and inches.
-			///
 			public Measurement Length { get; set; }
 
-			///
-			///Weight of the package in imperial units of pounds and ounces.
-			///
 			public Measurement Weight { get; set; }
 
-			///
-			///Width of the package in imperial units of feet and inches.
-			///
 			public Measurement Width { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Discounts/AppliedDiscount.cs b/Mozu.Api/Contracts/CommerceRuntime/Discounts/AppliedDiscount.cs
old mode 100644
new mode 100755
index 5c7779e5..73c6eefd
--- a/Mozu.Api/Contracts/CommerceRuntime/Discounts/AppliedDiscount.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Discounts/AppliedDiscount.cs
@@ -18,24 +18,12 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Discounts
 		///
 		public class AppliedDiscount
 		{
-			///
-			///Alphanumeric code associated with the coupon or promotion that results in a discounted price.
-			///
 			public string CouponCode { get; set; }
 
-			///
-			///Name of the discount added and applied to a shopping cart and order for a shopper's purchase. 
-			///
 			public Discount Discount { get; set; }
 
-			///
-			///Indicates if a discount is not used for the product or product line item in an order. If true, the system ignores this discount when pricing the order.
-			///
 			public bool? Excluded { get; set; }
 
-			///
-			///The value of the discount applied to the cart or order, represented as a negative currency amount to apply to the original price.
-			///
 			public decimal? Impact { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Discounts/AppliedLineItemProductDiscount.cs b/Mozu.Api/Contracts/CommerceRuntime/Discounts/AppliedLineItemProductDiscount.cs
old mode 100644
new mode 100755
index 28a5c494..a27e0e2c
--- a/Mozu.Api/Contracts/CommerceRuntime/Discounts/AppliedLineItemProductDiscount.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Discounts/AppliedLineItemProductDiscount.cs
@@ -29,7 +29,7 @@ public class AppliedLineItemProductDiscount
 			public string CouponCode { get; set; }
 
 			///
-			///Name of the discount added and applied to a shopping cart and order for a shopper's purchase. 
+			///This describes discounts that apply to the order, if any. For example, when the subtotal of the order exceeds a certain amount, or a discount for free shipping.
 			///
 			public Discount Discount { get; set; }
 
@@ -38,24 +38,18 @@ public class AppliedLineItemProductDiscount
 			///
 			public int DiscountQuantity { get; set; }
 
-			///
-			///Indicates if a discount is not used for the product or product line item in an order. If true, the system ignores this discount when pricing the order.
-			///
 			public bool? Excluded { get; set; }
 
 			///
-			///The value of the discount applied to the cart or order, represented as a negative currency amount to apply to the original price.
+			///The value of the applied discount. This is a negative number, which is subtracted from the original price to get the final price.
 			///
 			public decimal? Impact { get; set; }
 
 			///
-			///The impact of a discount for each discount quantity. 
+			///The impact of this discount for each discount quantity.
 			///
 			public decimal? ImpactPerUnit { get; set; }
 
-			///
-			///Quantity of products priced. This is always one unless calculating pricing on the order or cart.
-			///
 			public int? ProductQuantity { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Discounts/AppliedLineItemShippingDiscount.cs b/Mozu.Api/Contracts/CommerceRuntime/Discounts/AppliedLineItemShippingDiscount.cs
old mode 100644
new mode 100755
index 418a5da4..32583b23
--- a/Mozu.Api/Contracts/CommerceRuntime/Discounts/AppliedLineItemShippingDiscount.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Discounts/AppliedLineItemShippingDiscount.cs
@@ -19,23 +19,20 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Discounts
 		public class AppliedLineItemShippingDiscount
 		{
 			///
-			///Name of the discount added and applied to a shopping cart and order for a shopper's purchase. 
+			///This describes shipping discounts that apply to a line item in the order, if any.
 			///
 			public AppliedDiscount Discount { get; set; }
 
 			///
-			///The number of the line items that are used for this particular discount.
+			///The number of the line item that is used for this particular discount.
 			///
 			public int DiscountQuantity { get; set; }
 
 			///
-			///The impact of a discount for each discount quantity. 
+			///The impact of this discount for each discount quantity.
 			///
 			public decimal ImpactPerUnit { get; set; }
 
-			///
-			///Carrier-supplied, unique code that represents the shipping method service type associated with the shipping discount.
-			///
 			public string MethodCode { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Discounts/Discount.cs b/Mozu.Api/Contracts/CommerceRuntime/Discounts/Discount.cs
old mode 100644
new mode 100755
index 7e1308d7..47b2bfd2
--- a/Mozu.Api/Contracts/CommerceRuntime/Discounts/Discount.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Discounts/Discount.cs
@@ -19,24 +19,12 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Discounts
 		///
 		public class Discount
 		{
-			///
-			///Date and time in UTC format when a discount, credit, wish list, or cart expires. An expired discount no longer can be redeemed. An expired wish list is no longer available. An expired credit can no longer be redeemed for a purchase. Acart becomes inactive and expired based on a system-calculated interval. For example, if an anonymous shopper has 14 days of inactivity, the cart is considered abandoned after that period of inactivity. System-supplied and read-only.
-			///
 			public DateTime? ExpirationDate { get; set; }
 
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public int Id { get; set; }
 
-			///
-			///List of cart or order items to which the discount applies, if applicable.
-			///
 			public List<string> ItemIds { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Discounts/InvalidCoupon.cs b/Mozu.Api/Contracts/CommerceRuntime/Discounts/InvalidCoupon.cs
old mode 100644
new mode 100755
index fb5fb8c6..1d9f789a
--- a/Mozu.Api/Contracts/CommerceRuntime/Discounts/InvalidCoupon.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Discounts/InvalidCoupon.cs
@@ -25,18 +25,15 @@ public class InvalidCoupon
 			///
 			public DateTime CreateDate { get; set; }
 
-			///
-			///The unique identifier of the discount.
-			///
 			public int DiscountId { get; set; }
 
 			///
-			///The reason description for an action, including item return, coupon not valid, and item is taxed. 
+			///The reason the coupon was determined to be invalid.
 			///
 			public string Reason { get; set; }
 
 			///
-			///A code indicating the reason why a facet is invalid.
+			///The code that identifies the reason the coupon code is invalid.
 			///
 			public int ReasonCode { get; set; }
 
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Discounts/ShippingDiscount.cs b/Mozu.Api/Contracts/CommerceRuntime/Discounts/ShippingDiscount.cs
old mode 100644
new mode 100755
index 06150a15..65c33bba
--- a/Mozu.Api/Contracts/CommerceRuntime/Discounts/ShippingDiscount.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Discounts/ShippingDiscount.cs
@@ -18,14 +18,8 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Discounts
 		///
 		public class ShippingDiscount
 		{
-			///
-			///Name of the discount added and applied to a shopping cart and order for a shopper's purchase. 
-			///
 			public AppliedDiscount Discount { get; set; }
 
-			///
-			///Carrier-supplied, unique code that represents the shipping method service type associated with the shipping discount.
-			///
 			public string MethodCode { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Discounts/SuggestedDiscount.cs b/Mozu.Api/Contracts/CommerceRuntime/Discounts/SuggestedDiscount.cs
new file mode 100755
index 00000000..d79c4921
--- /dev/null
+++ b/Mozu.Api/Contracts/CommerceRuntime/Discounts/SuggestedDiscount.cs
@@ -0,0 +1,26 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+
+
+namespace Mozu.Api.Contracts.CommerceRuntime.Discounts
+{
+		public class SuggestedDiscount
+		{
+			public bool AutoAdd { get; set; }
+
+			public int DiscountId { get; set; }
+
+			public string ProductCode { get; set; }
+
+		}
+
+}
\ No newline at end of file
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Fulfillment/Destination.cs b/Mozu.Api/Contracts/CommerceRuntime/Fulfillment/Destination.cs
new file mode 100755
index 00000000..850f1c77
--- /dev/null
+++ b/Mozu.Api/Contracts/CommerceRuntime/Fulfillment/Destination.cs
@@ -0,0 +1,27 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+
+using Mozu.Api.Contracts.Core;
+
+namespace Mozu.Api.Contracts.CommerceRuntime.Fulfillment
+{
+		public class Destination
+		{
+			public Contact DestinationContact { get; set; }
+
+			public string Id { get; set; }
+
+			public bool? IsDestinationCommercial { get; set; }
+
+		}
+
+}
\ No newline at end of file
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Fulfillment/DigitalPackage.cs b/Mozu.Api/Contracts/CommerceRuntime/Fulfillment/DigitalPackage.cs
old mode 100644
new mode 100755
index cc33aeb2..9a02f04f
--- a/Mozu.Api/Contracts/CommerceRuntime/Fulfillment/DigitalPackage.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Fulfillment/DigitalPackage.cs
@@ -22,17 +22,17 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Fulfillment
 		public class DigitalPackage
 		{
 			///
-			///Basic audit info about the object, including date, time, and user account. This data may be captured when creating, updating, and removing data.
+			///Audit info contains the basic audit information about the digital item.
 			///
 			public AuditInfo AuditInfo { get; set; }
 
 			///
-			///Available actions you can complete for an order. These actions may differ depending on the status of the order, such as actions required to enter a payment, return of a package, and fulfillment of a shipment.
+			///Available actions are actions that you can take on this fulfillment unit.
 			///
 			public List<string> AvailableActions { get; set; }
 
 			///
-			///Collection (list or paged) of change messages logged for each modification made by a shopper to their carts, wishlists, orders, package, payment, pickup, and returns. Change log messages are system-supplied based on shopper actions and read only.
+			///Change messages handle message related to changes with the fulfillment unit.
 			///
 			public List<ChangeMessage> ChangeMessages { get; set; }
 
@@ -42,27 +42,27 @@ public class DigitalPackage
 			public string Code { get; set; }
 
 			///
-			///Date and time when a shipment completes fulfillment by delivery to a customer's physical address, picked up by a customer at a store, or delivered digitally for downloadable products.
+			///The digital fulfillment date is the date of the pickup.
 			///
 			public DateTime? FulfillmentDate { get; set; }
 
 			///
-			///The code that identifies the location used to fulfill the cart/cart item or order/order item. This code can include physical store locations for in-store pickup, warehouse locations providing the products for shipment, or the location for the digital file(s).
+			///The digital package location code is for the location from which to obtain this item.
 			///
 			public string FulfillmentLocationCode { get; set; }
 
 			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
+			///The digital package ID is the ID of the fulfillment unit.
 			///
 			public string Id { get; set; }
 
 			///
-			///A list of requested items. All returned data is provided in an items array.For a failed request, the returned response may be success with an empty item array.
+			///The digital package list is a list of items in the fulfillment unit.
 			///
 			public List<DigitalPackageItem> Items { get; set; }
 
 			///
-			///The current status of the object.This value is read only. Valid values for this field are: "Active", "Expired", and "Inactive".
+			///This is the status of the fulfillment unit.
 			///
 			public string Status { get; set; }
 
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Fulfillment/DigitalPackageItem.cs b/Mozu.Api/Contracts/CommerceRuntime/Fulfillment/DigitalPackageItem.cs
old mode 100644
new mode 100755
index 27cd8547..9f8611f5
--- a/Mozu.Api/Contracts/CommerceRuntime/Fulfillment/DigitalPackageItem.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Fulfillment/DigitalPackageItem.cs
@@ -25,23 +25,17 @@ public class DigitalPackageItem
 			///
 			public string GiftCardCode { get; set; }
 
-			///
-			///The line id associated with the fulfillment.
-			///
 			public int? LineId { get; set; }
 
-			///
-			///Fully qualified name of the selected option's attribute. Bundledproducts result from a static bundle or are dynamically added as a result of the shopper selecting products as extras. When the bundled item is dynamic, it includes the attribute's fully qualified name of the extra that it came from. When `optionAttributeFQN `is null, the bundled item was statically defined. When not null, the item came from an extra selection.
-			///
 			public string OptionAttributeFQN { get; set; }
 
 			///
-			///The unique, user-defined product code of a product, used throughout  to reference and associate to a product.
+			///The product code is the code of the digital product to be fulfilled.
 			///
 			public string ProductCode { get; set; }
 
 			///
-			///The specified quantity of objects and items. This property is used for numerous object types including products, options, components within a product bundle, cart and order items, returned items, shipping line items, items in a digital product. and items associated with types and reservations.
+			///This specifies the quantity of the digital order item.
 			///
 			public int Quantity { get; set; }
 
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Fulfillment/FulfillmentAction.cs b/Mozu.Api/Contracts/CommerceRuntime/Fulfillment/FulfillmentAction.cs
old mode 100644
new mode 100755
index 13a8266e..09a88bc5
--- a/Mozu.Api/Contracts/CommerceRuntime/Fulfillment/FulfillmentAction.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Fulfillment/FulfillmentAction.cs
@@ -19,9 +19,6 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Fulfillment
 		///
 		public class FulfillmentAction
 		{
-			///
-			///The name of the action to perform for the payment, fulfillment, order, or return.
-			///
 			public string ActionName { get; set; }
 
 			///
@@ -29,14 +26,8 @@ public class FulfillmentAction
 			///
 			public List<string> DigitalPackageIds { get; set; }
 
-			///
-			///Array list of unique IDs of packages in a shipment planned for or finished a shipping fulfillment action. 
-			///
 			public List<string> PackageIds { get; set; }
 
-			///
-			///Array list of in-store pickups for which to perform the fulfillment action.
-			///
 			public List<string> PickupIds { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Fulfillment/FulfillmentInfo.cs b/Mozu.Api/Contracts/CommerceRuntime/Fulfillment/FulfillmentInfo.cs
old mode 100644
new mode 100755
index c8ad667a..0540b7a2
--- a/Mozu.Api/Contracts/CommerceRuntime/Fulfillment/FulfillmentInfo.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Fulfillment/FulfillmentInfo.cs
@@ -20,34 +20,16 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Fulfillment
 		///
 		public class FulfillmentInfo
 		{
-			///
-			///Identifier and datetime stamp information recorded when a user or application creates, updates, or deletes a resource entity. This value is system-supplied and read-only.
-			///
 			public AuditInfo AuditInfo { get; set; }
 
-			///
-			///Custom data originated by the shipping service.
-			///
 			public JObject Data { get; set; }
 
-			///
-			///The contact information of the person receiving the shipment or performing the pickup.
-			///
 			public Contact FulfillmentContact { get; set; }
 
-			///
-			///If true, the shipping destination for a shipment is a commercial address.
-			///
 			public bool? IsDestinationCommercial { get; set; }
 
-			///
-			///The code associated with a carrier's shipping method service type, used during fulfillment of packages and shipments. Service type codes include a prefix that indicates the carrier. For example: FEDEX_INTERNATIONAL_STANDARD and UPS_GROUND.If using a custom rate, this property corresponds to the  field in  when you navigate to  &gt;  &gt; , and then click on an existing rate or on .
-			///
 			public string ShippingMethodCode { get; set; }
 
-			///
-			///The carrier-supplied name for the shipping service type, such as "UPS Ground" or "2nd Day Air".If using a custom rate, this property corresponds to the  field in  when you navigate to  &gt;  &gt; , and then click on an existing rate or on .
-			///
 			public string ShippingMethodName { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Fulfillment/Package.cs b/Mozu.Api/Contracts/CommerceRuntime/Fulfillment/Package.cs
old mode 100644
new mode 100755
index f4d902b9..e3e88ef3
--- a/Mozu.Api/Contracts/CommerceRuntime/Fulfillment/Package.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Fulfillment/Package.cs
@@ -21,18 +21,12 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Fulfillment
 		///
 		public class Package
 		{
-			///
-			///Identifier and datetime stamp information recorded when a user or application creates, updates, or deletes a resource entity. This value is system-supplied and read-only.
-			///
 			public AuditInfo AuditInfo { get; set; }
 
-			///
-			///Available actions you can complete for an order. These actions may differ depending on the status of the order, such as actions required to enter a payment, return of a package, and fulfillment of a shipment.
-			///
 			public List<string> AvailableActions { get; set; }
 
 			///
-			///Collection (list or paged) of change messages logged for each modification made by a shopper to their carts, wishlists, orders, package, payment, pickup, and returns. Change log messages are system-supplied based on shopper actions and read only.
+			///List of change messages associated with the package.
 			///
 			public List<ChangeMessage> ChangeMessages { get; set; }
 
@@ -41,64 +35,31 @@ public class Package
 			///
 			public string Code { get; set; }
 
-			///
-			///Date and time when a shipment completes fulfillment by delivery to a customer's physical address, picked up by a customer at a store, or delivered digitally for downloadable products.
-			///
 			public DateTime? FulfillmentDate { get; set; }
 
 			///
-			///The code that identifies the location used to fulfill the cart/cart item or order/order item. This code can include physical store locations for in-store pickup, warehouse locations providing the products for shipment, or the location for the digital file(s).
+			///The location code that represents the location from which this package will ship.
 			///
 			public string FulfillmentLocationCode { get; set; }
 
-			///
-			///If there is a shipping label present for this Package, this will be set to true
-			///
 			public bool HasLabel { get; set; }
 
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public string Id { get; set; }
 
-			///
-			///An array list of objects in the returned collection.
-			///
 			public List<PackageItem> Items { get; set; }
 
-			///
-			///Dimensional properties (height, length, and width) of packages, products and bundles.
-			///
 			public PackageMeasurements Measurements { get; set; }
 
-			///
-			///The package type associated with this physical package. Possible values include , , , , , , or .
-			///
 			public string PackagingType { get; set; }
 
-			///
-			///The read-only, system-generated ID of the shipment associated with the shipment. When a package is first created, it is not associated with a shipment. However, once the [CreatePackageShipments](https://www.mozu.com/docs/api/commerce/orders/operations/createpackageshipments.htm) operation runs, it creates a shipment for the package (and any other packages that are part of the shipment) and generates shipping labels.
-			///
 			public string ShipmentId { get; set; }
 
-			///
-			///The code associated with a carrier's shipping method service type, used during fulfillment of packages and shipments. Service type codes include a prefix that indicates the carrier. For example: FEDEX_INTERNATIONAL_STANDARD and UPS_GROUND.If using a custom rate, this property corresponds to the  field in  when you navigate to  &gt;  &gt; , and then click on an existing rate or on .
-			///
 			public string ShippingMethodCode { get; set; }
 
-			///
-			///The carrier-supplied name for the shipping service type, such as "UPS Ground" or "2nd Day Air".If using a custom rate, this property corresponds to the  field in  when you navigate to  &gt;  &gt; , and then click on an existing rate or on .
-			///
 			public string ShippingMethodName { get; set; }
 
-			///
-			///The current status of the object.This value is read only. Valid values for this field are: "Active", "Expired", and "Inactive".
-			///
 			public string Status { get; set; }
 
-			///
-			///Tracking number for the package or shipment, supplied by the shipping carrier to track the shipment until fulfillment completes. The tracking number format may differ between carriers.
-			///
 			public string TrackingNumber { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Fulfillment/PackageItem.cs b/Mozu.Api/Contracts/CommerceRuntime/Fulfillment/PackageItem.cs
old mode 100644
new mode 100755
index 52d27ebd..f306e685
--- a/Mozu.Api/Contracts/CommerceRuntime/Fulfillment/PackageItem.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Fulfillment/PackageItem.cs
@@ -19,18 +19,12 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Fulfillment
 		public class PackageItem
 		{
 			///
-			///This specifies the fulfillment type of digital package item.
+			///This specifies the type of fulfillment item.
 			///
 			public string FulfillmentItemType { get; set; }
 
-			///
-			///The line id associated with the fulfillment.
-			///
 			public int? LineId { get; set; }
 
-			///
-			///Fully qualified name of the selected option's attribute. Bundledproducts result from a static bundle or are dynamically added as a result of the shopper selecting products as extras. When the bundled item is dynamic, it includes the attribute's fully qualified name of the extra that it came from. When `optionAttributeFQN `is null, the bundled item was statically defined. When not null, the item came from an extra selection.
-			///
 			public string OptionAttributeFQN { get; set; }
 
 			///
@@ -38,9 +32,6 @@ public class PackageItem
 			///
 			public string ProductCode { get; set; }
 
-			///
-			///The specified quantity of objects and items. This property is used for numerous object types including products, options, components within a product bundle, cart and order items, returned items, shipping line items, items in a digital product. and items associated with types and reservations.
-			///
 			public int Quantity { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Fulfillment/Pickup.cs b/Mozu.Api/Contracts/CommerceRuntime/Fulfillment/Pickup.cs
old mode 100644
new mode 100755
index b30299a2..da0b8ccf
--- a/Mozu.Api/Contracts/CommerceRuntime/Fulfillment/Pickup.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Fulfillment/Pickup.cs
@@ -21,18 +21,12 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Fulfillment
 		///
 		public class Pickup
 		{
-			///
-			///Identifier and datetime stamp information recorded when a user or application creates, updates, or deletes a resource entity. This value is system-supplied and read-only.
-			///
 			public AuditInfo AuditInfo { get; set; }
 
-			///
-			///Available actions you can complete for an order. These actions may differ depending on the status of the order, such as actions required to enter a payment, return of a package, and fulfillment of a shipment.
-			///
 			public List<string> AvailableActions { get; set; }
 
 			///
-			///Collection (list or paged) of change messages logged for each modification made by a shopper to their carts, wishlists, orders, package, payment, pickup, and returns. Change log messages are system-supplied based on shopper actions and read only.
+			///List of change messages associated with the pickup.
 			///
 			public List<ChangeMessage> ChangeMessages { get; set; }
 
@@ -41,29 +35,17 @@ public class Pickup
 			///
 			public string Code { get; set; }
 
-			///
-			///Date and time when a shipment completes fulfillment by delivery to a customer's physical address, picked up by a customer at a store, or delivered digitally for downloadable products.
-			///
 			public DateTime? FulfillmentDate { get; set; }
 
 			///
-			///The code that identifies the location used to fulfill the cart/cart item or order/order item. This code can include physical store locations for in-store pickup, warehouse locations providing the products for shipment, or the location for the digital file(s).
+			///The location code that represents the location where the shopper will fulfill this pickup.
 			///
 			public string FulfillmentLocationCode { get; set; }
 
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public string Id { get; set; }
 
-			///
-			///An array list of objects in the returned collection.
-			///
 			public List<PickupItem> Items { get; set; }
 
-			///
-			///The current status of the object.This value is read only. Valid values for this field are: "Active", "Expired", and "Inactive".
-			///
 			public string Status { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Fulfillment/PickupItem.cs b/Mozu.Api/Contracts/CommerceRuntime/Fulfillment/PickupItem.cs
old mode 100644
new mode 100755
index 0eebcde7..72452774
--- a/Mozu.Api/Contracts/CommerceRuntime/Fulfillment/PickupItem.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Fulfillment/PickupItem.cs
@@ -19,18 +19,12 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Fulfillment
 		public class PickupItem
 		{
 			///
-			///This specifies the fulfillment type of digital package item.
+			///This specifies the type of fulfillment item.
 			///
 			public string FulfillmentItemType { get; set; }
 
-			///
-			///The line id associated with the fulfillment.
-			///
 			public int? LineId { get; set; }
 
-			///
-			///Fully qualified name of the selected option's attribute. Bundledproducts result from a static bundle or are dynamically added as a result of the shopper selecting products as extras. When the bundled item is dynamic, it includes the attribute's fully qualified name of the extra that it came from. When `optionAttributeFQN `is null, the bundled item was statically defined. When not null, the item came from an extra selection.
-			///
 			public string OptionAttributeFQN { get; set; }
 
 			///
@@ -38,9 +32,6 @@ public class PickupItem
 			///
 			public string ProductCode { get; set; }
 
-			///
-			///The specified quantity of objects and items. This property is used for numerous object types including products, options, components within a product bundle, cart and order items, returned items, shipping line items, items in a digital product. and items associated with types and reservations.
-			///
 			public int Quantity { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Fulfillment/Shipment.cs b/Mozu.Api/Contracts/CommerceRuntime/Fulfillment/Shipment.cs
old mode 100644
new mode 100755
index d634decc..7c4897cb
--- a/Mozu.Api/Contracts/CommerceRuntime/Fulfillment/Shipment.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Fulfillment/Shipment.cs
@@ -20,54 +20,24 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Fulfillment
 		///
 		public class Shipment
 		{
-			///
-			///Identifier and datetime stamp information recorded when a user or application creates, updates, or deletes a resource entity. This value is system-supplied and read-only.
-			///
 			public AuditInfo AuditInfo { get; set; }
 
-			///
-			///Total cost of shipping the shipment to the shopper.
-			///
 			public decimal? Cost { get; set; }
 
-			///
-			///3-letter ISO 4217 standard global currency code. Currently, only "USD" (US Dollar) is supported.
-			///
 			public string CurrencyCode { get; set; }
 
-			///
-			///The physical address orders are sent to as a shipping destination. This address may contain multiple lines, city, state/province, country, and zip/postal code. The destination is used to calculate shipping costs.
-			///
 			public Contact DestinationAddress { get; set; }
 
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public string Id { get; set; }
 
-			///
-			///The physical address from which the order or shipment will ship.
-			///
 			public Contact OriginAddress { get; set; }
 
-			///
-			///Array list of unique IDs of packages in a shipment planned for or finished a shipping fulfillment action. 
-			///
 			public List<string> PackageIds { get; set; }
 
-			///
-			///The code associated with a carrier's shipping method service type, used during fulfillment of packages and shipments. Service type codes include a prefix that indicates the carrier. For example: FEDEX_INTERNATIONAL_STANDARD and UPS_GROUND.If using a custom rate, this property corresponds to the  field in  when you navigate to  &gt;  &gt; , and then click on an existing rate or on .
-			///
 			public string ShippingMethodCode { get; set; }
 
-			///
-			///If true, a shopper signature is required to deliver this shipment.
-			///
 			public bool? SignatureRequired { get; set; }
 
-			///
-			///Tracking number for the package or shipment, supplied by the shipping carrier to track the shipment until fulfillment completes. The tracking number format may differ between carriers.
-			///
 			public string TrackingNumber { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Fulfillment/ShippingRate.cs b/Mozu.Api/Contracts/CommerceRuntime/Fulfillment/ShippingRate.cs
old mode 100644
new mode 100755
index 1167d4eb..353bf962
--- a/Mozu.Api/Contracts/CommerceRuntime/Fulfillment/ShippingRate.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Fulfillment/ShippingRate.cs
@@ -21,44 +21,20 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Fulfillment
 		///
 		public class ShippingRate
 		{
-			///
-			///3-letter ISO 4217 standard global currency code. Currently, only "USD" (US Dollar) is supported.
-			///
 			public string CurrencyCode { get; set; }
 
-			///
-			///Custom data returned by the shipping service.
-			///
 			public JObject Data { get; set; }
 
-			///
-			///Indicates if the facet is currently valid.
-			///
 			public bool? IsValid { get; set; }
 
-			///
-			///Array list of validation and status messages associated with shipping rates, orders, and product purchasable state.
-			///
 			public List<string> Messages { get; set; }
 
-			///
-			///The amount the company and the shopper pay for shipping based on the current rate. Depending on any company discounts or fees, the price the company pays for shipping may differ from what the shopper pays.
-			///
 			public decimal? Price { get; set; }
 
-			///
-			///The code associated with a carrier's shipping method service type, used during fulfillment of packages and shipments. Service type codes include a prefix that indicates the carrier. For example: FEDEX_INTERNATIONAL_STANDARD and UPS_GROUND.If using a custom rate, this property corresponds to the  field in  when you navigate to  &gt;  &gt; , and then click on an existing rate or on .
-			///
 			public string ShippingMethodCode { get; set; }
 
-			///
-			///The carrier-supplied name for the shipping service type, such as "UPS Ground" or "2nd Day Air".If using a custom rate, this property corresponds to the  field in  when you navigate to  &gt;  &gt; , and then click on an existing rate or on .
-			///
 			public string ShippingMethodName { get; set; }
 
-			///
-			///The shipping zone to which this rate applies.
-			///
 			public string ShippingZoneCode { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Orders/DigitalWallet.cs b/Mozu.Api/Contracts/CommerceRuntime/Orders/DigitalWallet.cs
old mode 100644
new mode 100755
index 997945f3..70eca6f8
--- a/Mozu.Api/Contracts/CommerceRuntime/Orders/DigitalWallet.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Orders/DigitalWallet.cs
@@ -13,19 +13,10 @@
 
 namespace Mozu.Api.Contracts.CommerceRuntime.Orders
 {
-		///
-		///	Mozu.CommerceRuntime.Contracts.Orders.DigitalWallet ApiType DOCUMENT_HERE 
-		///
 		public class DigitalWallet
 		{
-			///
-			///ID of the cart being used to create the order.
-			///
 			public string CartId { get; set; }
 
-			///
-			///Digital wallet data.
-			///
 			public string DigitalWalletData { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Orders/Order.cs b/Mozu.Api/Contracts/CommerceRuntime/Orders/Order.cs
old mode 100644
new mode 100755
index 0927505b..b5559e5e
--- a/Mozu.Api/Contracts/CommerceRuntime/Orders/Order.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Orders/Order.cs
@@ -32,13 +32,10 @@ public class Order
 			public DateTime? AcceptedDate { get; set; }
 
 			///
-			///Indicates if the customer account is opted to receive marketing materials. If true, the customer account is opted in for receiving the content. 
+			///If true, the customer account associated with the order is opted in to receive marketing materials.
 			///
 			public bool? AcceptsMarketing { get; set; }
 
-			///
-			///Properties of an ad-hoc price adjustment for an order.
-			///
 			public Adjustment Adjustment { get; set; }
 
 			///
@@ -46,9 +43,6 @@ public class Order
 			///
 			public decimal AmountAvailableForRefund { get; set; }
 
-			///
-			///A counter for how much money has been issued in refunds. This calculated field does NOT include refunds issued in returns.
-			///
 			public decimal AmountRefunded { get; set; }
 
 			///
@@ -56,74 +50,32 @@ public class Order
 			///
 			public decimal AmountRemainingForPayment { get; set; }
 
-			///
-			///Collection of attributes that may be paged list or a list, depending on the usage per object and API type. 
-			///
 			public List<OrderAttribute> Attributes { get; set; }
 
-			///
-			///Identifier and datetime stamp information recorded when a user or application creates, updates, or deletes a resource entity. This value is system-supplied and read-only.
-			///
 			public AuditInfo AuditInfo { get; set; }
 
-			///
-			///Available actions you can complete for an order. These actions may differ depending on the status of the order, such as actions required to enter a payment, return of a package, and fulfillment of a shipment.
-			///
 			public List<string> AvailableActions { get; set; }
 
-			///
-			///Properties for the customer's billing information associated with an order or specific payment.
-			///
 			public BillingInfo BillingInfo { get; set; }
 
-			///
-			///Date when the order was cancelled. System-supplied and read-only.
-			///
 			public DateTime? CancelledDate { get; set; }
 
-			///
-			///Collection (list or paged) of change messages logged for each modification made by a shopper to their carts, wishlists, orders, package, payment, pickup, and returns. Change log messages are system-supplied based on shopper actions and read only.
-			///
 			public List<ChangeMessage> ChangeMessages { get; set; }
 
-			///
-			///Code that identifies the channel associated with the site for the shopper's created shopping cart, order, and return.
-			///
 			public string ChannelCode { get; set; }
 
-			///
-			///Date when the order was closed. Closed order is an order that has been processed and the items shipped. System-supplied and read-only.
-			///
 			public DateTime? ClosedDate { get; set; }
 
-			///
-			///Array list of coupon codes associated with a shopping cart and the associated order. These codes are entered by a shopper when proceeding to checkout. 
-			///
 			public List<string> CouponCodes { get; set; }
 
-			///
-			///3-letter ISO 4217 standard global currency code. Currently, only "USD" (US Dollar) is supported.
-			///
 			public string CurrencyCode { get; set; }
 
-			///
-			///Unique identifer of the customer account. This ID is used to associate numerous types of data and object with the customer account, including orders, returns, wish lists, and in-store credit.
-			///
 			public int? CustomerAccountId { get; set; }
 
-			///
-			///The type of customer interaction used to create this shopping cart. Possible values are Website, Call, Store, or Unknown.
-			///
 			public string CustomerInteractionType { get; set; }
 
-			///
-			///The tax identification number (TIN) of the customer who submitted the order. If the customer who submitted the order has a customer account defined for the tenant, the system sets this value when the order is submitted.
-			///
 			public string CustomerTaxId { get; set; }
 
-			///
-			///Custom data for a given vendor set within the commerce process.
-			///
 			public JObject Data { get; set; }
 
 			///
@@ -131,89 +83,41 @@ public class Order
 			///
 			public List<DigitalPackage> DigitalPackages { get; set; }
 
-			///
-			///The aggregate total for all items in the cart, including costs associated with shopper-defined options or extras and any applied discounts.
-			///
 			public decimal? DiscountedSubtotal { get; set; }
 
-			///
-			///The subtotal of the cart, order, and wishlist items, including any applied discount calculations. Wishlist subtotals may change depending on the length of time, available discounts, and stock amounts of products at the time of review by shoppers.
-			///
 			public decimal? DiscountedTotal { get; set; }
 
-			///
-			///Estimated amount of discounts applied to all items in the carts and orders. System-supplied and read-only. This value will be available at the wish list, cart item, order item, and wish list item level at a later time.
-			///
 			public decimal? DiscountTotal { get; set; }
 
-			///
-			///Order level duty or tariff amount. Does not take into account duties or tariffs specifically on items on the order
-			///
 			public decimal? DutyAmount { get; set; }
 
-			///
-			///Duties or tariffs for the Order as well as OrderItems (e.g. if the Order has a $5 duty or tariff for any reason and an OrderItem has a $2 duty or tariff then the value in this property would be $7)
-			///
 			public decimal? DutyTotal { get; set; }
 
-			///
-			///The email address of the specified user or the email address associated with the specified entity.
-			///
 			public string Email { get; set; }
 
-			///
-			///Date and time in UTC format when a discount, credit, wish list, or cart expires. An expired discount no longer can be redeemed. An expired wish list is no longer available. An expired credit can no longer be redeemed for a purchase. Acart becomes inactive and expired based on a system-calculated interval. For example, if an anonymous shopper has 14 days of inactivity, the cart is considered abandoned after that period of inactivity. System-supplied and read-only.
-			///
 			public DateTime? ExpirationDate { get; set; }
 
-			///
-			///Extra properties (key-value pairs) that extend the primary object. Think of this as a property bag of string keys and string values.
-			///
 			public List<ExtendedProperty> ExtendedProperties { get; set; }
 
 			///
-			///Unique identifier used by an external program to identify a  order, customer account, or wish list.
+			///Unique identifier used by an external program to identify a Mozu order.
 			///
 			public string ExternalId { get; set; }
 
-			///
-			///The monetary sum of all fees incurred in the cart, order, line item in a cart, or line item in an order. This value is not calculated for wish lists at this time.
-			///
 			public decimal? FeeTotal { get; set; }
 
-			///
-			///Properties of the information required to fulfill the cart, order, or wish list. Shoppers can fulfill ordered items by using in-store pickup or direct shipping.
-			///
 			public FulfillmentInfo FulfillmentInfo { get; set; }
 
-			///
-			///The current fulfillment status of the order, which is "Fulfilled," "NotFulfilled," or "PartiallyFulfilled." The order is considered fulfilled when all packages are shipped or all pickups are picked up.
-			///
 			public string FulfillmentStatus { get; set; }
 
-			///
-			///The amount to adjust the order handling fee.
-			///
 			public Adjustment HandlingAdjustment { get; set; }
 
-			///
-			///The combined price for all handling costs calculated together for shipped orders, not for digital or in-store pickup. This includes all handling costs per the product line items and options, excluding taxes and discounts. 
-			///
 			public decimal? HandlingAmount { get; set; }
 
-			///
-			///The list of historically-applied handling discounts. The active one will have IsExcluded == false
-			///
 			public List<AppliedDiscount> HandlingDiscounts { get; set; }
 
-			///
-			///Handling fees for the Order as well as OrderItems (e.g. if the Order has a $5 handling fee and an OrderItem has a $2 handling fee per item quantity then the value in this property would be $9)
-			///
 			public decimal? HandlingSubTotal { get; set; }
 
-			///
-			///Calculated total tax amount for handling costs if the cart/order is subject to sales tax. 
-			///
 			public decimal? HandlingTaxTotal { get; set; }
 
 			///
@@ -221,34 +125,22 @@ public class Order
 			///
 			public decimal? HandlingTotal { get; set; }
 
-			///
-			///If true, the order has a draft that may include one or more uncommitted changes to the order or its components.
-			///
 			public bool? HasDraft { get; set; }
 
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public string Id { get; set; }
 
 			///
-			///The date and time an order or wish list is imported into . This is not the date and time it was created in the external application.
+			///If the order was imported from an external program, the date and time the order was imported into Mozu.
 			///
 			public DateTime? ImportDate { get; set; }
 
 			///
-			///The list of invalid coupons the shopper attempted to enter for the cart or order. These coupons may no longer be valid or incorrectly entered.
+			///List of invalid coupon codes the shopper entered for the order.
 			///
 			public List<InvalidCoupon> InvalidCoupons { get; set; }
 
-			///
-			///A captured and stored IP address. IP addresses are stored for the origin location of submitted orders and the tenant domain.
-			///
 			public string IpAddress { get; set; }
 
-			///
-			///If true, this version of the order is a draft that might contain uncommitted changes.
-			///
 			public bool? IsDraft { get; set; }
 
 			///
@@ -256,204 +148,96 @@ public class Order
 			///
 			public bool IsEligibleForReturns { get; set; }
 
-			///
-			///Indicates if this object/data was imported from an outside source such as a data import or synchronization via an app or service. If true, this data was originally imported into  and accessible through your store database. Examples of imported objects/data include orders and customer accounts.
-			///
 			public bool? IsImport { get; set; }
 
-			///
-			///If true, the order is exempt from applied sales tax.
-			///
+			public bool IsPartialOrder { get; set; }
+
 			public bool? IsTaxExempt { get; set; }
 
-			///
-			///An array list of objects in the returned collection.
-			///
 			public List<OrderItem> Items { get; set; }
 
-			///
-			///The total amount of calculated tax for items, used by carts, orders, and wish lists.
-			///
 			public decimal? ItemTaxTotal { get; set; }
 
-			///
-			///The date in UTC Date/Time when the items in the cart were last validated against the site's product catalog. System-supplied and read-only.
-			///
 			public DateTime? LastValidationDate { get; set; }
 
-			///
-			///The total charge for the line item with all weighted order level manual adjustments.
-			///
 			public decimal? LineItemSubtotalWithOrderAdjustments { get; set; }
 
-			///
-			///The unique, user-defined code that identifies a location. This location can be the location where the order was entered, location for newly in-stock products, and where products are returned.
-			///
 			public string LocationCode { get; set; }
 
-			///
-			///Paged list collection of note content for objects including customers, orders, and returns. 
-			///
 			public List<OrderNote> Notes { get; set; }
 
-			///
-			///List of order-level discounts projected to apply to the cart at checkout or order.
-			///
 			public List<AppliedDiscount> OrderDiscounts { get; set; }
 
-			///
-			///The order number that displays on the storefront which differs from the order ID.
-			///
 			public int? OrderNumber { get; set; }
 
-			///
-			///Identifier of the cart prior to the customer proceeding to checkout.
-			///
 			public string OriginalCartId { get; set; }
 
-			///
-			///Array list of physical packages shipped for a specified order.
-			///
 			public List<Package> Packages { get; set; }
 
-			///
-			///If this Order has a parent Order, the parent Order ID is recorded here.
-			///
+			public string ParentCheckoutId { get; set; }
+
+			public int? ParentCheckoutNumber { get; set; }
+
 			public string ParentOrderId { get; set; }
 
-			///
-			///If the Order has a parent Order, the order number is recorded here.
-			///
 			public int? ParentOrderNumber { get; set; }
 
-			///
-			///If this order was created to fulfill an item replacement as part of a return merchandise authorization (RMA), the unique identifier of the return.
-			///
 			public string ParentReturnId { get; set; }
 
-			///
-			///If the Order has a parent Order with a return, the return number is recorded here.
-			///
 			public int? ParentReturnNumber { get; set; }
 
-			///
-			///Wrapper for a collection of payments associated with an order or return. An order can include a number of payments until the full total is covered. 
-			///
+			public int? PartialOrderCount { get; set; }
+
+			public int? PartialOrderNumber { get; set; }
+
 			public List<Payment> Payments { get; set; }
 
-			///
-			///Status of the payment for the specified order.
-			///
 			public string PaymentStatus { get; set; }
 
-			///
-			///Array list of the in-store pickups defined for the order.
-			///
 			public List<Pickup> Pickups { get; set; }
 
-			///
-			///If the order is associated with a price list, this is the unique code of the price list.
-			///
 			public string PriceListCode { get; set; }
 
-			///
-			///Refunds associated with this order. A refund is a single exchange of money from merchant to customer that either encapsulates a refund to a credit card or an issuance of a store credit. Refunds does not reduce the 'amount collected' on an order and it is possible for refunds to exceed the total order amount.
-			///
 			public List<Refund> Refunds { get; set; }
 
-			///
-			///Status of any returns associated with this order after it was completed.
-			///
 			public string ReturnStatus { get; set; }
 
-			///
-			///Array list of the shipments defined to fulfill items in this order using the direct ship fulfillment method.
-			///
 			public List<Shipment> Shipments { get; set; }
 
-			///
-			///Properties of an ad-hoc price adjustment made for an order.
-			///
 			public Adjustment ShippingAdjustment { get; set; }
 
-			///
-			///The total shipping amount for the order before discounts and adjustments.
-			///
 			public decimal? ShippingAmountBeforeDiscountsAndAdjustments { get; set; }
 
-			///
-			///List of shipping discounts projected to apply to carts, orders, and wish lists and items at checkout.
-			///
 			public List<ShippingDiscount> ShippingDiscounts { get; set; }
 
-			///
-			///The shipping subtotal amount calculated without any applied discounts for line item and entire amounts of carts and orders. This property is not calculated for wish lists at this time.
-			///
 			public decimal? ShippingSubTotal { get; set; }
 
-			///
-			///The total amount of tax incurred on the shipping charges in the cart and order. This property is not calculated at this time for wish lists.
-			///
 			public decimal? ShippingTaxTotal { get; set; }
 
-			///
-			///The calculated total shipping amount estimated for carts or orders, including tax. This amount is not calculated for wish lists at this time.
-			///
 			public decimal? ShippingTotal { get; set; }
 
-			///
-			///A paged list collection of shopper notes for the order.
-			///
 			public ShopperNotes ShopperNotes { get; set; }
 
-			///
-			///Unique identifier of the site.
-			///
 			public int? SiteId { get; set; }
 
-			///
-			///The device from which the order originated in the case of offline orders.
-			///
 			public string SourceDevice { get; set; }
 
-			///
-			///The current status of the object.This value is read only. Valid values for this field are: "Active", "Expired", and "Inactive".
-			///
 			public string Status { get; set; }
 
-			///
-			///The date and time the order was submitted. System-supplied and read-only.
-			///
 			public DateTime? SubmittedDate { get; set; }
 
-			///
-			///Estimated amount of the cart or order without sales tax, shipping costs, and other fees. This amount is not calculated for wish lists at this time.
-			///
 			public decimal? Subtotal { get; set; }
 
-			///
-			///Leverage this property within a [tax Arc.js action](https://www.mozu.com/docs/arcjs/commerce-catalog-storefront-tax/commerce-catalog-storefront-tax.htm) to supplement the tax information for this item or object with custom JSON data.
-			///
+			public List<SuggestedDiscount> SuggestedDiscounts { get; set; }
+
 			public JObject TaxData { get; set; }
 
-			///
-			///The total monetary sum of sales tax estimated for a cart or order.
-			///
 			public decimal? TaxTotal { get; set; }
 
-			///
-			///Unique identifier of the Mozu tenant.
-			///
 			public int? TenantId { get; set; }
 
-			///
-			///Total is used to indicate the monetary, estimated total amount of the cart or order, including items, sales tax, shipping costs, and other fees. Totals are not estimated for wish lists at this time.
-			///
 			public decimal? Total { get; set; }
 
-			///
-			///The total amount collected to date for the order.
-			///
 			public decimal TotalCollected { get; set; }
 
 			///
@@ -466,19 +250,10 @@ public class Order
 			///
 			public List<OrderValidationResult> ValidationResults { get; set; }
 
-			///
-			///The current version number of the order, wish list, document list, or document type list.
-			///
 			public string Version { get; set; }
 
-			///
-			///Unique identifier of the customer visit in which the cart was created or last modified.
-			///
 			public string VisitId { get; set; }
 
-			///
-			///Unique identifier of the web session in which the cart, order, return, or wish list was created or last modified.
-			///
 			public string WebSessionId { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Orders/OrderAction.cs b/Mozu.Api/Contracts/CommerceRuntime/Orders/OrderAction.cs
old mode 100644
new mode 100755
index 306d99ce..ee92f1a5
--- a/Mozu.Api/Contracts/CommerceRuntime/Orders/OrderAction.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Orders/OrderAction.cs
@@ -18,9 +18,6 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Orders
 		///
 		public class OrderAction
 		{
-			///
-			///The name of the action to perform for the payment, fulfillment, order, or return.
-			///
 			public string ActionName { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Orders/OrderAttribute.cs b/Mozu.Api/Contracts/CommerceRuntime/Orders/OrderAttribute.cs
old mode 100644
new mode 100755
index 5e97c465..f94b7541
--- a/Mozu.Api/Contracts/CommerceRuntime/Orders/OrderAttribute.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Orders/OrderAttribute.cs
@@ -20,24 +20,12 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Orders
 		///
 		public class OrderAttribute
 		{
-			///
-			///Unique identifier of the attribute definition.
-			///
 			public int? AttributeDefinitionId { get; set; }
 
-			///
-			///Identifier and datetime stamp information recorded when a user or application creates, updates, or deletes a resource entity. This value is system-supplied and read-only.
-			///
 			public AuditInfo AuditInfo { get; set; }
 
-			///
-			///The fully qualified name of the attribute, which is a user defined attribute identifier.
-			///
 			public string FullyQualifiedName { get; set; }
 
-			///
-			///List of value data for objects.
-			///
 			public List<object> Values { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Orders/OrderCollection.cs b/Mozu.Api/Contracts/CommerceRuntime/Orders/OrderCollection.cs
old mode 100644
new mode 100755
index e614fa7e..ac5db76b
--- a/Mozu.Api/Contracts/CommerceRuntime/Orders/OrderCollection.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Orders/OrderCollection.cs
@@ -19,29 +19,14 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Orders
 		///
 		public class OrderCollection
 		{
-			///
-			///An array list of objects in the returned collection.
-			///
 			public List<Order> Items { get; set; }
 
-			///
-			///The number of pages returned based on the startIndex and pageSize values specified. This value is system-supplied and read-only.
-			///
 			public int PageCount { get; set; }
 
-			///
-			///The number of results to display on each page when creating paged results from a query. The maximum value is 200.
-			///
 			public int PageSize { get; set; }
 
-			///
-			///When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.
-			///
 			public int StartIndex { get; set; }
 
-			///
-			///The number of results listed in the query collection, represented by a signed 64-bit (8-byte) integer. This value is system-supplied and read-only.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Orders/OrderItem.cs b/Mozu.Api/Contracts/CommerceRuntime/Orders/OrderItem.cs
old mode 100644
new mode 100755
index f5ee243a..1af1adee
--- a/Mozu.Api/Contracts/CommerceRuntime/Orders/OrderItem.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Orders/OrderItem.cs
@@ -24,229 +24,103 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Orders
 		///
 		public class OrderItem
 		{
-			///
-			///The adjusted subtotal of the line item, including all manual adjustments, discounts, shipping charges and discounts, and duty or any other additional line item fees.
-			///
 			public decimal? AdjustedLineItemSubtotal { get; set; }
 
-			///
-			///Identifier and datetime stamp information recorded when a user or application creates, updates, or deletes a resource entity. This value is system-supplied and read-only.
-			///
 			public AuditInfo AuditInfo { get; set; }
 
-			///
-			///Custom data for a given vendor set within the commerce process.
-			///
+			public int? AutoAddDiscountId { get; set; }
+
 			public JObject Data { get; set; }
 
-			///
-			///The subtotal of the cart, order, and wishlist items, including any applied discount calculations. Wishlist subtotals may change depending on the length of time, available discounts, and stock amounts of products at the time of review by shoppers.
-			///
+			public string DestinationId { get; set; }
+
 			public decimal? DiscountedTotal { get; set; }
 
-			///
-			///Estimated amount of discounts applied to all items in the carts and orders. System-supplied and read-only. This value will be available at the wish list, cart item, order item, and wish list item level at a later time.
-			///
 			public decimal? DiscountTotal { get; set; }
 
-			///
-			///Duty or Tariff for this item
-			///
 			public decimal? DutyAmount { get; set; }
 
-			///
-			///Represents the total price of the cart item extended to the shopper. This begins with the Unit Price, then uses any of the following prices if they are defined, in the following order: Override Amount, Sale Amount, List Amount. This value is not calculated for wish lists at this time.
-			///
 			public decimal? ExtendedTotal { get; set; }
 
-			///
-			///The monetary sum of all fees incurred in the cart, order, line item in a cart, or line item in an order. This value is not calculated for wish lists at this time.
-			///
 			public decimal? FeeTotal { get; set; }
 
-			///
-			///The code that identifies the location used to fulfill the cart/cart item or order/order item. This code can include physical store locations for in-store pickup, warehouse locations providing the products for shipment, or the location for the digital file(s).
-			///
 			public string FulfillmentLocationCode { get; set; }
 
-			///
-			///The method used to fulfill this cart or order item. The method includes direct ship or in-store pickup. The available methods depend on the supported fulfillment types for the product. 
-			///
 			public string FulfillmentMethod { get; set; }
 
-			///
-			///The combined price for all handling costs calculated together for shipped orders, not for digital or in-store pickup. This includes all handling costs per the product line items and options, excluding taxes and discounts. 
-			///
 			public decimal? HandlingAmount { get; set; }
 
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public string Id { get; set; }
 
-			///
-			///Indicates if the product in a cart, order, or wish list is purchased on a recurring schedule. If true, the item can be purchased or fulfilled at regular intervals, such as a monthly billing cycle. For example, digital or physical product subscriptions are recurring cart items. This property is not used at this time and is reserved for future functionality.
-			///
 			public bool? IsRecurring { get; set; }
 
-			///
-			///Indicates if the item is subject to taxation, used by products, options, extras, cart and order items, line items, and wish lists. If true, the entity is subject to tax based on the relevant tax rate and rules.
-			///
 			public bool? IsTaxable { get; set; }
 
-			///
-			///The total amount of calculated tax for items, used by carts, orders, and wish lists.
-			///
 			public decimal? ItemTaxTotal { get; set; }
 
-			///
-			///The line id assigned to the order item. Visible only in the Admin, this is set from the Admin or in CommerceRuntime when a cart is converted to an order.
-			///
 			public int? LineId { get; set; }
 
-			///
-			///Language used for the entity. Currently, only "en-US" is supported.
-			///
 			public string LocaleCode { get; set; }
 
-			///
-			///The unique identifier of the item when it was applied to a cart, prior to checkout, when the cart became an order.
-			///
 			public string OriginalCartItemId { get; set; }
 
-			///
-			///The properties of a product, referenced and used by carts, orders, wish lists, and returns.
-			///
 			public Product Product { get; set; }
 
 			///
-			///The applicable product discount for an associated cart, order, or wish list. 
+			///The discount that applies to the product.
 			///
 			public AppliedLineItemProductDiscount ProductDiscount { get; set; }
 
-			///
-			///List of product-level discounts projected to apply to a cart, order, or wish list.
-			///
 			public List<AppliedLineItemProductDiscount> ProductDiscounts { get; set; }
 
-			///
-			///The specified quantity of objects and items. This property is used for numerous object types including products, options, components within a product bundle, cart and order items, returned items, shipping line items, items in a digital product. and items associated with types and reservations.
-			///
+			public string PurchaseLocation { get; set; }
+
 			public int Quantity { get; set; }
 
-			///
-			///The total shipping amount for the line item before discounts and adjustments.
-			///
 			public decimal? ShippingAmountBeforeDiscountsAndAdjustments { get; set; }
 
-			///
-			///List of shipping discounts projected to apply to carts, orders, and wish lists and items at checkout.
-			///
 			public List<AppliedLineItemShippingDiscount> ShippingDiscounts { get; set; }
 
-			///
-			///The total amount of tax incurred on the shipping charges in the cart and order. This property is not calculated at this time for wish lists.
-			///
 			public decimal? ShippingTaxTotal { get; set; }
 
-			///
-			///The calculated total shipping amount estimated for carts or orders, including tax. This amount is not calculated for wish lists at this time.
-			///
 			public decimal? ShippingTotal { get; set; }
 
-			///
-			///Estimated amount of the cart or order without sales tax, shipping costs, and other fees. This amount is not calculated for wish lists at this time.
-			///
 			public decimal? Subtotal { get; set; }
 
-			///
-			///The monetary amount of an item in the cart that is subject to tax. This amount typically represents the line item subtotal before applied discounts for an order.
-			///
 			public decimal? TaxableTotal { get; set; }
 
-			///
-			///Leverage this property within a [tax Arc.js action](https://www.mozu.com/docs/arcjs/commerce-catalog-storefront-tax/commerce-catalog-storefront-tax.htm) to supplement the tax information for this item or object with custom JSON data.
-			///
 			public JObject TaxData { get; set; }
 
-			///
-			///Total is used to indicate the monetary, estimated total amount of the cart or order, including items, sales tax, shipping costs, and other fees. Totals are not estimated for wish lists at this time.
-			///
 			public decimal? Total { get; set; }
 
-			///
-			///The total charge for the line item without any weighted order level shipping and handling charges.
-			///
 			public decimal? TotalWithoutWeightedShippingAndHandling { get; set; }
 
-			///
-			///The total charge for the line item with all weighted order level shipping and handling charges.
-			///
 			public decimal? TotalWithWeightedShippingAndHandling { get; set; }
 
-			///
-			///Properties of the price per unit of a product, associated with cart and order items. This price is not used for wish lists at this time.
-			///
 			public CommerceUnitPrice UnitPrice { get; set; }
 
-			///
-			///The total weighted order level manual adjustment amount.
-			///
 			public decimal? WeightedOrderAdjustment { get; set; }
 
-			///
-			///The total weighted order level discount amount.
-			///
 			public decimal? WeightedOrderDiscount { get; set; }
 
-			///
-			///The total weighted order level duty charges.
-			///
 			public decimal? WeightedOrderDuty { get; set; }
 
-			///
-			///The weighted order handling adjustment.
-			///
 			public decimal? WeightedOrderHandlingAdjustment { get; set; }
 
-			///
-			///The total weighted order level handling fee amount.
-			///
 			public decimal? WeightedOrderHandlingFee { get; set; }
 
-			///
-			///The total weighted order handling fee discount amount.
-			///
 			public decimal? WeightedOrderHandlingFeeDiscount { get; set; }
 
-			///
-			///The total weighted order level handling fee tax amount.
-			///
 			public decimal? WeightedOrderHandlingFeeTax { get; set; }
 
-			///
-			///The total weighted order level shipping charge.
-			///
 			public decimal? WeightedOrderShipping { get; set; }
 
-			///
-			///The total weighted order level shipping discount amount.
-			///
 			public decimal? WeightedOrderShippingDiscount { get; set; }
 
-			///
-			///The total weighted order level shipping manual adjustment amount.
-			///
 			public decimal? WeightedOrderShippingManualAdjustment { get; set; }
 
-			///
-			///The total weighted order level shipping tax amount.
-			///
 			public decimal? WeightedOrderShippingTax { get; set; }
 
-			///
-			///The total weighted order level tax amount.
-			///
 			public decimal? WeightedOrderTax { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Orders/OrderItemCollection.cs b/Mozu.Api/Contracts/CommerceRuntime/Orders/OrderItemCollection.cs
old mode 100644
new mode 100755
index 4dced533..3dc8639e
--- a/Mozu.Api/Contracts/CommerceRuntime/Orders/OrderItemCollection.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Orders/OrderItemCollection.cs
@@ -19,14 +19,8 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Orders
 		///
 		public class OrderItemCollection
 		{
-			///
-			///An array list of objects in the returned collection.
-			///
 			public List<OrderItem> Items { get; set; }
 
-			///
-			///The number of results listed in the query collection, represented by a signed 64-bit (8-byte) integer. This value is system-supplied and read-only.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Orders/OrderNote.cs b/Mozu.Api/Contracts/CommerceRuntime/Orders/OrderNote.cs
old mode 100644
new mode 100755
index 455224c0..d15ff7fa
--- a/Mozu.Api/Contracts/CommerceRuntime/Orders/OrderNote.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Orders/OrderNote.cs
@@ -19,19 +19,10 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Orders
 		///
 		public class OrderNote
 		{
-			///
-			///Identifier and datetime stamp information recorded when a user or application creates, updates, or deletes a resource entity. This value is system-supplied and read-only.
-			///
 			public AuditInfo AuditInfo { get; set; }
 
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public string Id { get; set; }
 
-			///
-			///The text content of the order note.
-			///
 			public string Text { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Orders/OrderReturnableItem.cs b/Mozu.Api/Contracts/CommerceRuntime/Orders/OrderReturnableItem.cs
old mode 100644
new mode 100755
index 3c0465ff..87963ba6
--- a/Mozu.Api/Contracts/CommerceRuntime/Orders/OrderReturnableItem.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Orders/OrderReturnableItem.cs
@@ -13,84 +13,36 @@
 
 namespace Mozu.Api.Contracts.CommerceRuntime.Orders
 {
-		///
-		///	Mozu.CommerceRuntime.Contracts.Orders.OrderReturnableItem ApiType DOCUMENT_HERE 
-		///
 		public class OrderReturnableItem
 		{
-			///
-			///Specifies whether to exclude product extras when you return a product or bundle. For example, assume the following order items:* Product A (bundle item)* Product B (bundle item)* Product C (bundle item)* Product D (extra on bundle)* Product F (extra on product)If this property is , Products D or F are included when the bundle or Product E are added to a return. If this property is , Products D or F are not included unless added individually.
-			///
 			public bool ExcludeProductExtras { get; set; }
 
-			///
-			///The fulfillment status of the item, which is one of the following values:* * 
-			///
 			public string FulfillmentStatus { get; set; }
 
-			///
-			///Unique identifier of the order item associated with a validation message, order, or return.
-			///
 			public string OrderItemId { get; set; }
 
-			///
-			///The fully-qualified name of an attribute option on the item if it has an extra. For bundle items, this property is null.
-			///
 			public string OrderItemOptionAttributeFQN { get; set; }
 
-			///
-			///The unique identifier of the line number associated with the item.
-			///
 			public int OrderLineId { get; set; }
 
-			///
-			///The product code of the parent item, if applicable. For example, a product bundle is the parent of the items in the bundle, and a product is the parent of a product extra.
-			///
 			public string ParentProductCode { get; set; }
 
-			///
-			///The name of the parent item, if applicable. For example, a product bundle is the parent of the items in the bundle, and a product is the parent of a product extra.
-			///
 			public string ParentProductName { get; set; }
 
-			///
-			///The unique, user-defined product code of a product, used throughout  to reference and associate to a product.
-			///
 			public string ProductCode { get; set; }
 
-			///
-			///The name of the product that represents a line item in a taxable order or product bundle.
-			///
 			public string ProductName { get; set; }
 
-			///
-			///The quantity of the item that a shopper or CSR has directly requested for return. For example, if someone requests a return on a product bundle, the bundle is directly returned, but the bundle items are indirectly returned. Conversely, if someone requests a return on a bundle item, the bundle item is directly returned, while the bundle is indirectly returned (in this case, the bundle is only partially returned, unless the other bundle items are also requested for return).
-			///
 			public int QuantityDirectlyReturned { get; set; }
 
-			///
-			///The quantity that has been fulfilled for the given line item. An item must be fulfilled before it is returnable. If an order contains Product X with a quantity of 3, and the quantity fulfilled is 2, then two Product X items are returnable (assuming all other return conditions are met).
-			///
 			public int QuantityFulfilled { get; set; }
 
-			///
-			///The quantity of the item that is required for the successful return of another item. For example, if someone requests a return on a product bundle, the bundle is directly returned, but the bundle items are indirectly returned. Conversely, if someone requests a return on a bundle item, the bundle item is directly returned, while the bundle is indirectly returned (in this case, the bundle is only partially returned, unless the other bundle items are also requested for return).
-			///
 			public int QuantityIndirectlyReturned { get; set; }
 
-			///
-			///The total quantity of an item on the order.
-			///
 			public int QuantityOrdered { get; set; }
 
-			///
-			///The quantity of a given item that is eligible for return. This number may be smaller than the quantity ordered, and changes depending on the actions taken on the return. For example, if an order contains five of Product X, but only three of those items are fulfilled, then only three items show as returnable (assuming all other return conditions are met).
-			///
 			public int QuantityReturnable { get; set; }
 
-			///
-			///The number of discrete units that make up an individual item. For example, 1 (ordered quantity) bag of screws may contain a unity quantity of 50 screws.
-			///
 			public int UnitQuantity { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Orders/OrderReturnableItemCollection.cs b/Mozu.Api/Contracts/CommerceRuntime/Orders/OrderReturnableItemCollection.cs
old mode 100644
new mode 100755
index d34866cf..aaa58263
--- a/Mozu.Api/Contracts/CommerceRuntime/Orders/OrderReturnableItemCollection.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Orders/OrderReturnableItemCollection.cs
@@ -14,19 +14,10 @@
 
 namespace Mozu.Api.Contracts.CommerceRuntime.Orders
 {
-		///
-		///	Mozu.CommerceRuntime.Contracts.Orders.OrderReturnableItemCollection ApiType DOCUMENT_HERE 
-		///
 		public class OrderReturnableItemCollection
 		{
-			///
-			///A list of requested items. All returned data is provided in an items array.For a failed request, the returned response may be success with an empty item array.
-			///
 			public List<OrderReturnableItem> Items { get; set; }
 
-			///
-			///The total number of items in the list.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Orders/OrderValidationMessage.cs b/Mozu.Api/Contracts/CommerceRuntime/Orders/OrderValidationMessage.cs
old mode 100644
new mode 100755
index 45bfa5ff..f0e63c31
--- a/Mozu.Api/Contracts/CommerceRuntime/Orders/OrderValidationMessage.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Orders/OrderValidationMessage.cs
@@ -19,7 +19,7 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Orders
 		public class OrderValidationMessage
 		{
 			///
-			///The text of the change message, such as "This product is no longer available." System-supplied and read-only.
+			///The body of the message returned by the order validation capability.
 			///
 			public string Message { get; set; }
 
@@ -29,7 +29,7 @@ public class OrderValidationMessage
 			public string MessageType { get; set; }
 
 			///
-			///Unique identifier of the order item associated with a validation message, order, or return.
+			///Unique identifier of the order item associated with the validation message.
 			///
 			public string OrderItemId { get; set; }
 
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Orders/OrderValidationResult.cs b/Mozu.Api/Contracts/CommerceRuntime/Orders/OrderValidationResult.cs
old mode 100644
new mode 100755
index 43b6d81a..21b1d48c
--- a/Mozu.Api/Contracts/CommerceRuntime/Orders/OrderValidationResult.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Orders/OrderValidationResult.cs
@@ -25,12 +25,12 @@ public class OrderValidationResult
 			public DateTime? CreatedDate { get; set; }
 
 			///
-			///Array list of validation and status messages associated with shipping rates, orders, and product purchasable state.
+			///Collection of messages returned by the order validation capability.
 			///
 			public List<OrderValidationMessage> Messages { get; set; }
 
 			///
-			///The current status of the object.This value is read only. Valid values for this field are: "Active", "Expired", and "Inactive".
+			///The status returned from the order validation capability for the order specified in the request, which is Pass, Fail, Error, or Review.
 			///
 			public string Status { get; set; }
 
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Orders/ShopperNotes.cs b/Mozu.Api/Contracts/CommerceRuntime/Orders/ShopperNotes.cs
old mode 100644
new mode 100755
index 832c09ee..63a4b5bf
--- a/Mozu.Api/Contracts/CommerceRuntime/Orders/ShopperNotes.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Orders/ShopperNotes.cs
@@ -18,14 +18,8 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Orders
 		///
 		public class ShopperNotes
 		{
-			///
-			///Notes entered and saved with an order. These notes may be entered by a shopper on a wishlist or for an order. Comments may also be entered by  Admins on an order that may be visible only to authorized shoppers and users.
-			///
 			public string Comments { get; set; }
 
-			///
-			///Shopper-entered gift message for the associated order.
-			///
 			public string GiftMessage { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Payments/BillingInfo.cs b/Mozu.Api/Contracts/CommerceRuntime/Payments/BillingInfo.cs
old mode 100644
new mode 100755
index 9ad45487..68e86cb9
--- a/Mozu.Api/Contracts/CommerceRuntime/Payments/BillingInfo.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Payments/BillingInfo.cs
@@ -20,54 +20,26 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Payments
 		///
 		public class BillingInfo
 		{
-			///
-			///Identifier and datetime stamp information recorded when a user or application creates, updates, or deletes a resource entity. This value is system-supplied and read-only.
-			///
 			public AuditInfo AuditInfo { get; set; }
 
-			///
-			///The cardholder's billing contact information, including addresses.
-			///
 			public Contact BillingContact { get; set; }
 
-			///
-			///If the customer is paying by card, the credit card information.
-			///
 			public PaymentCard Card { get; set; }
 
-			///
-			///Information about the check used in the billing information, if it exists.
-			///
 			public CheckPayment Check { get; set; }
 
-			///
-			///Custom data originated by the billing service.
-			///
+			public string CustomCreditType { get; set; }
+
 			public JObject Data { get; set; }
 
-			///
-			///Holds the transaction ID for an external payment type service.
-			///
 			public string ExternalTransactionId { get; set; }
 
-			///
-			///If true, the system overrides the customer's billing address information with the supplied fulfillment information.
-			///
 			public bool IsSameBillingShippingAddress { get; set; }
 
-			///
-			///The type of payment, such as credit card, check, or PayPal Express. Additional payment types will be supported in future releases.
-			///
 			public string PaymentType { get; set; }
 
-			///
-			///Identifies a specific workflow the payment goes through. This is used to define a workflow for external payment services.
-			///
 			public string PaymentWorkflow { get; set; }
 
-			///
-			///The purchase order payment details.
-			///
 			public PurchaseOrderPayment PurchaseOrder { get; set; }
 
 			///
@@ -75,6 +47,8 @@ public class BillingInfo
 			///
 			public string StoreCreditCode { get; set; }
 
+			public string StoreCreditType { get; set; }
+
 		}
 
 }
\ No newline at end of file
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Payments/CheckPayment.cs b/Mozu.Api/Contracts/CommerceRuntime/Payments/CheckPayment.cs
old mode 100644
new mode 100755
index 5a7bbe21..4a937562
--- a/Mozu.Api/Contracts/CommerceRuntime/Payments/CheckPayment.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Payments/CheckPayment.cs
@@ -13,14 +13,8 @@
 
 namespace Mozu.Api.Contracts.CommerceRuntime.Payments
 {
-		///
-		///	Mozu.CommerceRuntime.Contracts.Payments.CheckPayment ApiType DOCUMENT_HERE 
-		///
 		public class CheckPayment
 		{
-			///
-			///If applicable, the check number associated with the payment action or interaction.
-			///
 			public string CheckNumber { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Payments/Payment.cs b/Mozu.Api/Contracts/CommerceRuntime/Payments/Payment.cs
old mode 100644
new mode 100755
index ac534f12..681b7a0c
--- a/Mozu.Api/Contracts/CommerceRuntime/Payments/Payment.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Payments/Payment.cs
@@ -22,14 +22,8 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Payments
 		///
 		public class Payment
 		{
-			///
-			///The total monetary amount collected in this payment transaction for the order.
-			///
 			public decimal AmountCollected { get; set; }
 
-			///
-			///If the payment transaction is a shopper store credit, the total monetary amount credited in this payment transaction for the order.
-			///
 			public decimal AmountCredited { get; set; }
 
 			///
@@ -37,74 +31,35 @@ public class Payment
 			///
 			public decimal AmountRequested { get; set; }
 
-			///
-			///Identifier and datetime stamp information recorded when a user or application creates, updates, or deletes a resource entity. This value is system-supplied and read-only.
-			///
 			public AuditInfo AuditInfo { get; set; }
 
-			///
-			///Available actions you can complete for an order. These actions may differ depending on the status of the order, such as actions required to enter a payment, return of a package, and fulfillment of a shipment.
-			///
 			public List<string> AvailableActions { get; set; }
 
-			///
-			///Properties for the customer's billing information associated with an order or specific payment.
-			///
 			public BillingInfo BillingInfo { get; set; }
 
 			///
-			///Collection (list or paged) of change messages logged for each modification made by a shopper to their carts, wishlists, orders, package, payment, pickup, and returns. Change log messages are system-supplied based on shopper actions and read only.
+			///List of change messages associated with the payment.
 			///
 			public List<ChangeMessage> ChangeMessages { get; set; }
 
-			///
-			///Custom data originated by the payment service.
-			///
 			public JObject Data { get; set; }
 
-			///
-			///The external/third party transaction Id for this payment. This is used to store the transaction Id from digital wallet like Visa Checkout
-			///
 			public string ExternalTransactionId { get; set; }
 
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public string Id { get; set; }
 
-			///
-			///Container for the interactions associated with the payment, which includes details for each action performed for the payment.
-			///
 			public List<PaymentInteraction> Interactions { get; set; }
 
-			///
-			///Indicates if the product in a cart, order, or wish list is purchased on a recurring schedule. If true, the item can be purchased or fulfilled at regular intervals, such as a monthly billing cycle. For example, digital or physical product subscriptions are recurring cart items. This property is not used at this time and is reserved for future functionality.
-			///
 			public bool IsRecurring { get; set; }
 
-			///
-			///Unique identifier of the order associated with the payment.
-			///
 			public string OrderId { get; set; }
 
-			///
-			///The transaction ID supplied by the payment service to associate with this order payment.
-			///
 			public string PaymentServiceTransactionId { get; set; }
 
-			///
-			///The type of payment, such as credit card, check, or PayPal Express. Additional payment types will be supported in future releases.
-			///
 			public string PaymentType { get; set; }
 
-			///
-			///The source of data for this payment. By default, this will be set to 'mozu'
-			///
 			public string PaymentWorkflow { get; set; }
 
-			///
-			///The current status of the object.This value is read only. Valid values for this field are: "Active", "Expired", and "Inactive".
-			///
 			public string Status { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Payments/PaymentAction.cs b/Mozu.Api/Contracts/CommerceRuntime/Payments/PaymentAction.cs
old mode 100644
new mode 100755
index 6975afc9..732cc1e8
--- a/Mozu.Api/Contracts/CommerceRuntime/Payments/PaymentAction.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Payments/PaymentAction.cs
@@ -20,64 +20,28 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Payments
 		///
 		public class PaymentAction
 		{
-			///
-			///The name of the action to perform for the payment, fulfillment, order, or return.
-			///
 			public string ActionName { get; set; }
 
-			///
-			///The total monetary amount of the payment transaction.
-			///
 			public decimal? Amount { get; set; }
 
-			///
-			///The URL provided to cancel payments submitted using PayPal Express or another non-gateway payment provider.
-			///
 			public string CancelUrl { get; set; }
 
-			///
-			///If applicable, the check number associated with the payment action or interaction.
-			///
 			public string CheckNumber { get; set; }
 
-			///
-			///3-letter ISO 4217 standard global currency code. Currently, only "USD" (US Dollar) is supported.
-			///
 			public string CurrencyCode { get; set; }
 
-			///
-			///A general field for data to be communicated from an external payment service. 
-			///
 			public JObject Data { get; set; }
 
-			///
-			///An ID provided by a third party external payment service to identify a transaction.
-			///
 			public string ExternalTransactionId { get; set; }
 
-			///
-			///Date and time of a payment interaction, including handling and processing a payment and validating and completing a payment with a payment gateway.
-			///
 			public DateTime? InteractionDate { get; set; }
 
-			///
-			///Properties of a manually performed interaction with the payment gateway.
-			///
 			public PaymentGatewayInteraction ManualGatewayInteraction { get; set; }
 
-			///
-			///The billing information associated with this payment action.
-			///
 			public BillingInfo NewBillingInfo { get; set; }
 
-			///
-			///Unique ID that references an original transaction in the event of a credit back.
-			///
 			public string ReferenceSourcePaymentId { get; set; }
 
-			///
-			///The URL provided to redirect users who submit payments using PayPal Express or another non-gateway payment provider.
-			///
 			public string ReturnUrl { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Payments/PaymentCard.cs b/Mozu.Api/Contracts/CommerceRuntime/Payments/PaymentCard.cs
old mode 100644
new mode 100755
index b907d592..6253be0e
--- a/Mozu.Api/Contracts/CommerceRuntime/Payments/PaymentCard.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Payments/PaymentCard.cs
@@ -18,44 +18,22 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Payments
 		///
 		public class PaymentCard
 		{
-			///
-			///The masked credit card number part returned from the payment gateway.
-			///
+			public string Bin { get; set; }
+
 			public string CardNumberPartOrMask { get; set; }
 
-			///
-			///The two-digit month a credit card expires for a payment method.
-			///
 			public short ExpireMonth { get; set; }
 
-			///
-			///The four-digit year the credit card expires for a payment method.
-			///
 			public short ExpireYear { get; set; }
 
-			///
-			///If true, the credit card information is saved to the customer account for future use.
-			///
 			public bool IsCardInfoSaved { get; set; }
 
-			///
-			///If true, the credit card is used for a recurring order payment.
-			///
 			public bool? IsUsedRecurring { get; set; }
 
-			///
-			///The full name printed on a credit card. The name should match what is printed on the card exactly, used in validation during a payment.
-			///
 			public string NameOnCard { get; set; }
 
-			///
-			///The type of credit card, such as Visa or Amex.
-			///
 			public string PaymentOrCardType { get; set; }
 
-			///
-			///Unique identifier of the credit card from the payment service.
-			///
 			public string PaymentServiceCardId { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Payments/PaymentCollection.cs b/Mozu.Api/Contracts/CommerceRuntime/Payments/PaymentCollection.cs
old mode 100644
new mode 100755
index e05739f3..6c2cc122
--- a/Mozu.Api/Contracts/CommerceRuntime/Payments/PaymentCollection.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Payments/PaymentCollection.cs
@@ -19,14 +19,8 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Payments
 		///
 		public class PaymentCollection
 		{
-			///
-			///An array list of objects in the returned collection.
-			///
 			public List<Payment> Items { get; set; }
 
-			///
-			///The number of results listed in the query collection, represented by a signed 64-bit (8-byte) integer. This value is system-supplied and read-only.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Payments/PaymentGatewayInteraction.cs b/Mozu.Api/Contracts/CommerceRuntime/Payments/PaymentGatewayInteraction.cs
old mode 100644
new mode 100755
index 4b547049..d39fd355
--- a/Mozu.Api/Contracts/CommerceRuntime/Payments/PaymentGatewayInteraction.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Payments/PaymentGatewayInteraction.cs
@@ -18,39 +18,21 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Payments
 		///
 		public class PaymentGatewayInteraction
 		{
-			///
-			///If required by the payment gateway, the authorization code of the transaction.
-			///
 			public string GatewayAuthCode { get; set; }
 
-			///
-			///AVS (Address Verification Service) codes supplied by the payment gateway. The codes indicate partial to complete or failed matches against the billing address for the shopper against the financial institute data through the gateway.
-			///
 			public string GatewayAVSCodes { get; set; }
 
-			///
-			///CVV2 (Card Verification Value) codes supplied by the payment gateway. The codes indicate a verified or failed match of the encrypted code entered against the financial institution data through the gateway.
-			///
 			public string GatewayCVV2Codes { get; set; }
 
-			///
-			///Unique identifier of the payment interaction from the payment gateway.
-			///
 			public int? GatewayInteractionId { get; set; }
 
-			///
-			///Response code from the gateway associated with the payment interaction. The response code is unique to the gateway.The response code is associated with the , which contains the textual response message.Refer to [Gateway Response Code and Text](https://www.mozu.com/docs/developer/api-guides/payment-gateways.htm#gateway_response_code_and_text) in the API Guides for more information.
-			///
 			public string GatewayResponseCode { get; set; }
 
 			///
-			///Textual message returned by the payment gateway for the associated .Refer to [Gateway Response Code and Text](https://www.mozu.com/docs/developer/api-guides/payment-gateways.htm#gateway_response_code_and_text) in the API Guides for more information.
+			///Textual message returned by the payment gateway.
 			///
 			public string GatewayResponseText { get; set; }
 
-			///
-			///Unique identifier of the gateway transaction associated with the payment interaction.
-			///
 			public string GatewayTransactionId { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Payments/PaymentGatewayResponseData.cs b/Mozu.Api/Contracts/CommerceRuntime/Payments/PaymentGatewayResponseData.cs
old mode 100644
new mode 100755
index ee7c9a12..096ba750
--- a/Mozu.Api/Contracts/CommerceRuntime/Payments/PaymentGatewayResponseData.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Payments/PaymentGatewayResponseData.cs
@@ -13,19 +13,10 @@
 
 namespace Mozu.Api.Contracts.CommerceRuntime.Payments
 {
-		///
-		///	The raw payment response from the gateway.This is a list of key value pairs.
-		///
 		public class PaymentGatewayResponseData
 		{
-			///
-			///Key used for metadata defined for objects, including extensible attributes, custom attributes associated with a shipping provider, and search synonyms definitions. This content may be user-defined depending on the object and usage.For search synonym definitions, refer to [Synonym Expansion Types](https://www.mozu.com/docs/Developer/api-guides/search-settings.htm#synonym_expansion_types) for more information about the key usage.
-			///
 			public string Key { get; set; }
 
-			///
-			///The value of a property, used by numerous objects within  including facets, attributes, products, localized content, metadata, capabilities ( and third-party), location inventory adjustment, and more. The value may be a string, integer, or double. Validation may be run against the entered and saved values depending on the object type.
-			///
 			public string Value { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Payments/PaymentInteraction.cs b/Mozu.Api/Contracts/CommerceRuntime/Payments/PaymentInteraction.cs
old mode 100644
new mode 100755
index d1ea061a..e3a43c10
--- a/Mozu.Api/Contracts/CommerceRuntime/Payments/PaymentInteraction.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Payments/PaymentInteraction.cs
@@ -20,129 +20,57 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Payments
 		///
 		public class PaymentInteraction
 		{
-			///
-			///If applicable, the total monetary amount associated with this payment interaction.
-			///
 			public decimal? Amount { get; set; }
 
-			///
-			///Identifier and datetime stamp information recorded when a user or application creates, updates, or deletes a resource entity. This value is system-supplied and read-only.
-			///
 			public AuditInfo AuditInfo { get; set; }
 
-			///
-			///If applicable, the check number associated with the payment action or interaction.
-			///
 			public string CheckNumber { get; set; }
 
-			///
-			///3-letter ISO 4217 standard global currency code. Currently, only "USD" (US Dollar) is supported.
-			///
 			public string CurrencyCode { get; set; }
 
-			///
-			///If required by the payment gateway, the authorization code of the transaction.
-			///
 			public string GatewayAuthCode { get; set; }
 
-			///
-			///AVS (Address Verification Service) codes supplied by the payment gateway. The codes indicate partial to complete or failed matches against the billing address for the shopper against the financial institute data through the gateway.
-			///
 			public string GatewayAVSCodes { get; set; }
 
-			///
-			///CVV2 (Card Verification Value) codes supplied by the payment gateway. The codes indicate a verified or failed match of the encrypted code entered against the financial institution data through the gateway.
-			///
 			public string GatewayCVV2Codes { get; set; }
 
-			///
-			///Unique identifier of the payment interaction from the payment gateway.
-			///
 			public int? GatewayInteractionId { get; set; }
 
-			///
-			///Response code from the gateway associated with the payment interaction. The response code is unique to the gateway.The response code is associated with the , which contains the textual response message.Refer to [Gateway Response Code and Text](https://www.mozu.com/docs/developer/api-guides/payment-gateways.htm#gateway_response_code_and_text) in the API Guides for more information.
-			///
 			public string GatewayResponseCode { get; set; }
 
-			///
-			///Additional response data from the gateway that's unique to each gateway.This is a list of key value pairs.Refer to [Gateway Response Data](https://www.mozu.com/docs/developer/api-guides/payment-gateways.htm#gateway_response_data) in the API Guides for more information.
-			///
 			public List<PaymentGatewayResponseData> GatewayResponseData { get; set; }
 
 			///
-			///Textual message returned by the payment gateway for the associated .Refer to [Gateway Response Code and Text](https://www.mozu.com/docs/developer/api-guides/payment-gateways.htm#gateway_response_code_and_text) in the API Guides for more information.
+			///Textual message returned by the payment gateway.
 			///
 			public string GatewayResponseText { get; set; }
 
-			///
-			///Unique identifier of the gateway transaction associated with the payment interaction.
-			///
 			public string GatewayTransactionId { get; set; }
 
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public string Id { get; set; }
 
-			///
-			///Date and time of a payment interaction, including handling and processing a payment and validating and completing a payment with a payment gateway.
-			///
 			public DateTime? InteractionDate { get; set; }
 
-			///
-			///The type of payment interaction. The payment can be Capture or CheckReceived. The value also includes customer payment interactions such as Website, Call, Store, or Unknown.
-			///
 			public string InteractionType { get; set; }
 
-			///
-			///If true, the payment interaction was manually defined s part of offline order processing.
-			///
 			public bool IsManual { get; set; }
 
-			///
-			///Indicates if the product in a cart, order, or wish list is purchased on a recurring schedule. If true, the item can be purchased or fulfilled at regular intervals, such as a monthly billing cycle. For example, digital or physical product subscriptions are recurring cart items. This property is not used at this time and is reserved for future functionality.
-			///
 			public bool? IsRecurring { get; set; }
 
-			///
-			///User-entered notation content for an object, used to save information such as payment, return, account, and order notes.
-			///
 			public string Note { get; set; }
 
-			///
-			///Unique identifier of the order associated with the payment.
-			///
 			public string OrderId { get; set; }
 
-			///
-			///The status of the payment prior to the interaction being performed, which enables manual rollback of previous transactions.
-			///
 			public string PaymentEntryStatus { get; set; }
 
-			///
-			///Unique identifier of the payment associated with this transaction.
-			///
 			public string PaymentId { get; set; }
 
-			///
-			///Unique identifier of previous interaction that this payment interaction is modifying. For example, when refunding a payment, the crediting interaction would reference the capture interaction.
-			///
 			public int? PaymentTransactionInteractionIdReference { get; set; }
 
-			///
-			///The unique identifier of the refund for a given interaction.
-			///
 			public string RefundId { get; set; }
 
-			///
-			///The unique identifier of the return associated with a given interaction.
-			///
 			public string ReturnId { get; set; }
 
-			///
-			///The current status of the object.This value is read only. Valid values for this field are: "Active", "Expired", and "Inactive".
-			///
 			public string Status { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Payments/PurchaseOrderCustomField.cs b/Mozu.Api/Contracts/CommerceRuntime/Payments/PurchaseOrderCustomField.cs
old mode 100644
new mode 100755
index ed417a53..29841be2
--- a/Mozu.Api/Contracts/CommerceRuntime/Payments/PurchaseOrderCustomField.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Payments/PurchaseOrderCustomField.cs
@@ -13,24 +13,12 @@
 
 namespace Mozu.Api.Contracts.CommerceRuntime.Payments
 {
-		///
-		///	The details of the custom fields associated with the purchase order payment.Refer to [Custom Text Fields](https://www.mozu.com/docs/guides/orders/purchase-order.htm#custom_text_fields) in the Purchase Orders guides topic for more information.
-		///
 		public class PurchaseOrderCustomField
 		{
-			///
-			///The code for the custom field associated with the purchase order.Refer to [Custom Text Fields](https://www.mozu.com/docs/guides/orders/purchase-order.htm#custom_text_fields) in the Purchase Order guides topic for more information.
-			///
 			public string Code { get; set; }
 
-			///
-			///Descriptive text used as a label for objects, such as field names, facets, date ranges, contact information, and package information.
-			///
 			public string Label { get; set; }
 
-			///
-			///The value of a property, used by numerous objects within  including facets, attributes, products, localized content, metadata, capabilities ( and third-party), location inventory adjustment, and more. The value may be a string, integer, or double. Validation may be run against the entered and saved values depending on the object type.
-			///
 			public string Value { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Payments/PurchaseOrderPayment.cs b/Mozu.Api/Contracts/CommerceRuntime/Payments/PurchaseOrderPayment.cs
old mode 100644
new mode 100755
index e3e8a479..ed2b3713
--- a/Mozu.Api/Contracts/CommerceRuntime/Payments/PurchaseOrderPayment.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Payments/PurchaseOrderPayment.cs
@@ -14,24 +14,12 @@
 
 namespace Mozu.Api.Contracts.CommerceRuntime.Payments
 {
-		///
-		///	The details of the purchase order payment.
-		///
 		public class PurchaseOrderPayment
 		{
-			///
-			///Details of the custom text fields associated with the purchase order.Refer to [Custom Text Fields](https://www.mozu.com/docs/guides/orders/purchase-order.htm#custom_text_fields) in the Purchase Order guides topic for more information.
-			///
 			public List<PurchaseOrderCustomField> CustomFields { get; set; }
 
-			///
-			///The details of the payment terms. The payment terms are made up of a  and a .Refer to [Payment Terms](https://www.mozu.com/docs/guides/orders/purchase-order.htm#payment_terms) in the Purchase Order guides topic for more information.
-			///
 			public PurchaseOrderPaymentTerm PaymentTerm { get; set; }
 
-			///
-			///The purchase order number.
-			///
 			public string PurchaseOrderNumber { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Payments/PurchaseOrderPaymentTerm.cs b/Mozu.Api/Contracts/CommerceRuntime/Payments/PurchaseOrderPaymentTerm.cs
old mode 100644
new mode 100755
index 29e7e305..95f8d1d5
--- a/Mozu.Api/Contracts/CommerceRuntime/Payments/PurchaseOrderPaymentTerm.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Payments/PurchaseOrderPaymentTerm.cs
@@ -13,19 +13,10 @@
 
 namespace Mozu.Api.Contracts.CommerceRuntime.Payments
 {
-		///
-		///	The details of the payment terms assocaited with the purchase order payment.Refer to [Payment Terms](https://www.mozu.com/docs/guides/orders/purchase-order.htm#payment_terms) in the Purchase Orders guides topic for more information.
-		///
 		public class PurchaseOrderPaymentTerm
 		{
-			///
-			///The payment term code associated with the purchase order.Refer to [Payment Terms](https://www.mozu.com/docs/guides/orders/purchase-order.htm#payment_terms) in the Purchase Order guides topic for more information.
-			///
 			public string Code { get; set; }
 
-			///
-			///The localized description in text for the object, displayed per the locale code. For example, descriptions are used for product descriptions, attributes, and pre-authorization transaction types.
-			///
 			public string Description { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Products/BundledProduct.cs b/Mozu.Api/Contracts/CommerceRuntime/Products/BundledProduct.cs
old mode 100644
new mode 100755
index 374a8614..a0bab097
--- a/Mozu.Api/Contracts/CommerceRuntime/Products/BundledProduct.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Products/BundledProduct.cs
@@ -15,47 +15,35 @@
 namespace Mozu.Api.Contracts.CommerceRuntime.Products
 {
 		///
-		///	Properties of a component product in a product bundle. A product bundle can represent either a collection of multiple products sold as a single entity, or a collection of the same product sold as a package. For example, a 10-pack of socks or multiple parts and devices in a technology bundle for a computer.
+		///	Properties of a component product in a product bundle. A product bundle can represent either a collection of multiple products sold as a single entity, or a collection of the same product sold as a package. For example, a 10-pack of socks.
 		///
 		public class BundledProduct
 		{
-			///
-			///Allocation ID associated with this product on this order.
-			///
 			public DateTime? AllocationExpiration { get; set; }
 
-			///
-			///Allocation ID associated with this product on this order.
-			///
 			public int? AllocationId { get; set; }
 
 			///
-			///The credit value of the product or bundled product. When the `goodsType `is `DigitalCredit`, this value is populated to indicate the value of the credit. This is used to create store credit in the fulfillment of gift cards.
+			///The credit value of the bundled product.
 			///
 			public decimal? CreditValue { get; set; }
 
-			///
-			///If the product is in relative pricing mode, this is the difference between associated prices for a product, variation option, or extra. The difference is calculated by subtracting the base price from the associated price with this product, option, and/or extra. For example, if a product with a defined monogram extra costs an additional $10, the `deltaPrice `value is "10". Between options, a price for a medium may be $10 and a large $12 giving a `deltaPrice `value of "2".Refer to [Product Variant Pricing and Weight](../../../guides/catalog/products.htm#product_variant_pricing_and_weight) in the Products guides topic for more information.
-			///
 			public decimal? DeltaPrice { get; set; }
 
 			///
-			///The localized description in text for the object, displayed per the locale code. For example, descriptions are used for product descriptions, attributes, and pre-authorization transaction types.
+			///The description defined for a component product in a product bundle. System-supplied and read only.
 			///
 			public string Description { get; set; }
 
-			///
-			///Fulfillment status of the product.
-			///
 			public string FulfillmentStatus { get; set; }
 
 			///
-			///The type of goods in a bundled product. A bundled product is composed of products associated to sell together. Possible values include “Physical” and “DigitalCredit”. This comes from the `productType `of the product. Products are defaulted to a Physical `goodsType`. Gift cards have a `goodsType `of DigitalCredit.
+			///The type of goods in a bundled product. For example: physical, digital, or digital credit.
 			///
 			public string GoodsType { get; set; }
 
 			///
-			///Indicates if the product must be shipped alone in a container. This is used for products and products within a bundle. If true, this product cannot be shipped in a package with other items and must ship in a package by itself.
+			///If true, this product cannot be shipped in a package with other items and must ship in a package by itself.
 			///
 			public bool IsPackagedStandAlone { get; set; }
 
@@ -65,7 +53,7 @@ public class BundledProduct
 			public PackageMeasurements Measurements { get; set; }
 
 			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
+			///The name of a component product in a product bundle. System-supplied and read only.
 			///
 			public string Name { get; set; }
 
@@ -75,7 +63,7 @@ public class BundledProduct
 			public string OptionAttributeFQN { get; set; }
 
 			///
-			///The value of the option attribute. These values are associated and used by product bundles and options.
+			///The value of the bundled product.
 			///
 			public object OptionValue { get; set; }
 
@@ -85,12 +73,12 @@ public class BundledProduct
 			public string ProductCode { get; set; }
 
 			///
-			///Unique identifier of the product reservation associated with the component product in a product bundle or item in a cart/order. System-supplied and read only.
+			///Unique identifier of the product reservation associated with the component product in a product bundle. System-supplied and read only.
 			///
 			public int? ProductReservationId { get; set; }
 
 			///
-			///The specified quantity of objects and items. This property is used for numerous object types including products, options, components within a product bundle, cart and order items, returned items, shipping line items, items in a digital product. and items associated with types and reservations.
+			///The quantity of a component product in its product bundle. System-supplied and read only.
 			///
 			public int Quantity { get; set; }
 
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Products/Category.cs b/Mozu.Api/Contracts/CommerceRuntime/Products/Category.cs
old mode 100644
new mode 100755
index d37dd9b8..ec456520
--- a/Mozu.Api/Contracts/CommerceRuntime/Products/Category.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Products/Category.cs
@@ -14,18 +14,12 @@
 namespace Mozu.Api.Contracts.CommerceRuntime.Products
 {
 		///
-		///	The category associated with assigned products. Products, product bundles, and options can be classified to multiple categories. 
+		///	The category into which products are classified.
 		///
 		public class Category
 		{
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public int? Id { get; set; }
 
-			///
-			///If applicable, the parent category in the category tree. This can be associated to a product as the parent category.
-			///
 			public Category Parent { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Products/Product.cs b/Mozu.Api/Contracts/CommerceRuntime/Products/Product.cs
old mode 100644
new mode 100755
index 54346e5c..b9a2fe1c
--- a/Mozu.Api/Contracts/CommerceRuntime/Products/Product.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Products/Product.cs
@@ -20,33 +20,21 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Products
 		///
 		public class Product
 		{
-			///
-			///Allocation ID associated with this product on this order.
-			///
 			public DateTime? AllocationExpiration { get; set; }
 
-			///
-			///Allocation ID associated with this product on this order.
-			///
 			public int? AllocationId { get; set; }
 
 			///
-			///Properties of a collection of component products that make up a single product bundle with its own product code. Tenants can define product bundles for any product type that supports the Bundle product usage.
+			///Collection of component products that make up a single product bundle with its own product code, added to a cart or order.
 			///
 			public List<BundledProduct> BundledProducts { get; set; }
 
-			///
-			///The list of all categories associated with the product. These categories contain products, can have discounts associated, and define the grouping of products to display on the storefront.
-			///
 			public List<Category> Categories { get; set; }
 
-			///
-			///The localized description in text for the object, displayed per the locale code. For example, descriptions are used for product descriptions, attributes, and pre-authorization transaction types.
-			///
 			public string Description { get; set; }
 
 			///
-			///Indicates if the discount is restricted. If true, the system cannot apply any discounts to this product. Discount restrictions are defined at the master catalog level. Client administrators cannot override discount restrictions at the catalog level, but they can limit the restriction to a defined time interval.For price list entries, specifies whether discounts are restricted for the specific entry if  is set to .Refer to [Discount Restriction](../../../guides/catalog/price-lists.htm#discountrestriction) in the Price Lists guides topic for more information.
+			///If true, the system cannot apply any discounts to this product. Discount restrictions are defined at the master catalog level. Client administrators cannot override discount restrictions at the catalog level, but they can limit the restriction to a defined time interval.
 			///
 			public bool? DiscountsRestricted { get; set; }
 
@@ -60,49 +48,34 @@ public class Product
 			///
 			public DateTime? DiscountsRestrictedStartDate { get; set; }
 
-			///
-			///Fulfillment status of the product.
-			///
 			public string FulfillmentStatus { get; set; }
 
 			///
-			///List of supported types of fulfillment for the product or variation. The types include direct ship, in-store pickup, or both.
+			///List of fulfillment types that the product supports.
 			///
 			public List<string> FulfillmentTypesSupported { get; set; }
 
 			///
-			///The type of goods in a bundled product. A bundled product is composed of products associated to sell together. Possible values include “Physical” and “DigitalCredit”. This comes from the `productType `of the product. Products are defaulted to a Physical `goodsType`. Gift cards have a `goodsType `of DigitalCredit.
+			///The type of goods of a product. For example: physical, digital, or digital credit.
 			///
 			public string GoodsType { get; set; }
 
-			///
-			///The alternate image description defined for the product, in the language specified in the locale code for the storefront.
-			///
 			public string ImageAlternateText { get; set; }
 
 			///
-			///The URL link for the image file associated with a product or category.
+			///The URL of the image file associated with a product on a storefront.
 			///
 			public string ImageUrl { get; set; }
 
 			///
-			///Indicates if the product must be shipped alone in a container. This is used for products and products within a bundle. If true, this product cannot be shipped in a package with other items and must ship in a package by itself.
+			///If true, this product cannot ship in a package with other items and must ship in a package by itself.
 			///
 			public bool IsPackagedStandAlone { get; set; }
 
-			///
-			///Indicates if the product in a cart, order, or wish list is purchased on a recurring schedule. If true, the item can be purchased or fulfilled at regular intervals, such as a monthly billing cycle. For example, digital or physical product subscriptions are recurring cart items. This property is not used at this time and is reserved for future functionality.
-			///
 			public bool? IsRecurring { get; set; }
 
-			///
-			///Indicates if the item is subject to taxation, used by products, options, extras, cart and order items, line items, and wish lists. If true, the entity is subject to tax based on the relevant tax rate and rules.
-			///
 			public bool? IsTaxable { get; set; }
 
-			///
-			///Dimensions of the packaged product.
-			///
 			public PackageMeasurements Measurements { get; set; }
 
 			///
@@ -110,34 +83,19 @@ public class Product
 			///
 			public string MfgPartNumber { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
-			///
-			///List of option attributes configured for an object. These values are associated and used by products, product bundles, and product types.
-			///
 			public List<ProductOption> Options { get; set; }
 
-			///
-			///The price of the product that appears on the storefront including any applied discounts.
-			///
 			public ProductPrice Price { get; set; }
 
-			///
-			///Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.
-			///
 			public string ProductCode { get; set; }
 
 			///
-			///Unique identifier of the product reservation associated with the component product in a product bundle or item in a cart/order. System-supplied and read only.
+			///The unique identifier of the product reservation created for this item in the cart or order.
 			///
 			public int? ProductReservationId { get; set; }
 
-			///
-			///A product type is like a product template.
-			///
 			public string ProductType { get; set; }
 
 			///
@@ -145,19 +103,13 @@ public class Product
 			///
 			public string ProductUsage { get; set; }
 
-			///
-			///Collection of property attributes defined for the object. Properties are associated to all objects within , including documents, products, and product types.
-			///
 			public List<ProductProperty> Properties { get; set; }
 
 			///
-			///The universal product code (UPC) is the barcode defined for the product. The UPC is unique across all sales channels. 
+			///The universal product code defined for the product.
 			///
 			public string Upc { get; set; }
 
-			///
-			///Merchant-created code associated with a specific product variation. Variation product codes maintain an association with the base product code.
-			///
 			public string VariationProductCode { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Products/ProductOption.cs b/Mozu.Api/Contracts/CommerceRuntime/Products/ProductOption.cs
old mode 100644
new mode 100755
index f8c46462..0e10656a
--- a/Mozu.Api/Contracts/CommerceRuntime/Products/ProductOption.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Products/ProductOption.cs
@@ -18,34 +18,16 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Products
 		///
 		public class ProductOption
 		{
-			///
-			///The fully qualified name of the attribute, which is a user defined attribute identifier.
-			///
 			public string AttributeFQN { get; set; }
 
-			///
-			///The data type of the source product property, typically of type Bool, DateTime, Number, or String.
-			///
 			public string DataType { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
-			///
-			///The value a shopper entered for an attribute that requires additional input for the product on a storefront. This entered value is a selected option or entered content for an extra, such as selecting a color or entering content for a monogram.
-			///
 			public object ShopperEnteredValue { get; set; }
 
-			///
-			///If the object value is a String, this value provides that string value, used by vocabulary property values, products, and options.
-			///
 			public string StringValue { get; set; }
 
-			///
-			///The value of a property, used by numerous objects within  including facets, attributes, products, localized content, metadata, capabilities ( and third-party), location inventory adjustment, and more. The value may be a string, integer, or double. Validation may be run against the entered and saved values depending on the object type.
-			///
 			public object Value { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Products/ProductPrice.cs b/Mozu.Api/Contracts/CommerceRuntime/Products/ProductPrice.cs
old mode 100644
new mode 100755
index fa8af595..6de6cb6e
--- a/Mozu.Api/Contracts/CommerceRuntime/Products/ProductPrice.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Products/ProductPrice.cs
@@ -19,38 +19,23 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Products
 		public class ProductPrice
 		{
 			///
-			///The credit value of the product or bundled product. When the `goodsType `is `DigitalCredit`, this value is populated to indicate the value of the credit. This is used to create store credit in the fulfillment of gift cards.
+			///The credit value when the product happens to be a gift card or similar product.
 			///
 			public decimal? CreditValue { get; set; }
 
 			///
-			///The manufacturer's suggested retail price (MSRP) for the product. This content may be defined by the supplier.
+			///The manufacturer's suggested retail price for the product.
 			///
 			public decimal? Msrp { get; set; }
 
-			///
-			///The price the merchant charges for a product on a storefront if no sales price is defined.
-			///
 			public decimal? Price { get; set; }
 
-			///
-			///If the product's price comes from a price list, this property is the code of the price list with which the product is associated.
-			///
 			public string PriceListCode { get; set; }
 
-			///
-			///The price list entry mode of the product. This property is for future funtionality and currently should only be .
-			///
 			public string PriceListEntryMode { get; set; }
 
-			///
-			///The set sale price for a product consisting of a price with a discount already applied.For price list entries, this property is the product's sale price if the  is set to .
-			///
 			public decimal? SalePrice { get; set; }
 
-			///
-			///The override price defined by the tenant for this cart or order item.
-			///
 			public decimal? TenantOverridePrice { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Products/ProductProperty.cs b/Mozu.Api/Contracts/CommerceRuntime/Products/ProductProperty.cs
old mode 100644
new mode 100755
index 75954f21..4ffddf29
--- a/Mozu.Api/Contracts/CommerceRuntime/Products/ProductProperty.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Products/ProductProperty.cs
@@ -19,29 +19,14 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Products
 		///
 		public class ProductProperty
 		{
-			///
-			///The fully qualified name of the attribute, which is a user defined attribute identifier.
-			///
 			public string AttributeFQN { get; set; }
 
-			///
-			///The data type of the source product property, typically of type Bool, DateTime, Number, or String.
-			///
 			public string DataType { get; set; }
 
-			///
-			///Indicates if the object has or can have multiple properties or values. If true, the object can have more than one value, selectable by shoppers through the storefront or configurable through the catalogs. 
-			///
 			public bool IsMultiValue { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
-			///
-			///List of value data for objects.
-			///
 			public List<ProductPropertyValue> Values { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Products/ProductPropertyValue.cs b/Mozu.Api/Contracts/CommerceRuntime/Products/ProductPropertyValue.cs
old mode 100644
new mode 100755
index f81d5bd0..0ce308bf
--- a/Mozu.Api/Contracts/CommerceRuntime/Products/ProductPropertyValue.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Products/ProductPropertyValue.cs
@@ -18,14 +18,8 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Products
 		///
 		public class ProductPropertyValue
 		{
-			///
-			///If the object value is a String, this value provides that string value, used by vocabulary property values, products, and options.
-			///
 			public string StringValue { get; set; }
 
-			///
-			///The value of a property, used by numerous objects within  including facets, attributes, products, localized content, metadata, capabilities ( and third-party), location inventory adjustment, and more. The value may be a string, integer, or double. Validation may be run against the entered and saved values depending on the object type.
-			///
 			public object Value { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Refunds/Refund.cs b/Mozu.Api/Contracts/CommerceRuntime/Refunds/Refund.cs
old mode 100644
new mode 100755
index f7adc74c..e5c87c66
--- a/Mozu.Api/Contracts/CommerceRuntime/Refunds/Refund.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Refunds/Refund.cs
@@ -15,39 +15,18 @@
 
 namespace Mozu.Api.Contracts.CommerceRuntime.Refunds
 {
-		///
-		///	Mozu.CommerceRuntime.Contracts.Refunds.Refund ApiType DOCUMENT_HERE 
-		///
 		public class Refund
 		{
-			///
-			///Amount refunded.
-			///
 			public decimal Amount { get; set; }
 
-			///
-			///Basic audit info about the object, including date, time, and user account. This data may be captured when creating, updating, and removing data.
-			///
 			public AuditInfo AuditInfo { get; set; }
 
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public string Id { get; set; }
 
-			///
-			///Unique identifier of the order associated with the payment.
-			///
 			public string OrderId { get; set; }
 
-			///
-			///The payment associated with this refund (if applicable).
-			///
 			public Payment Payment { get; set; }
 
-			///
-			///The reason description for an action, including item return, coupon not valid, and item is taxed. 
-			///
 			public string Reason { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Returns/ReasonCollection.cs b/Mozu.Api/Contracts/CommerceRuntime/Returns/ReasonCollection.cs
old mode 100644
new mode 100755
index f6baca8d..efcc2dd0
--- a/Mozu.Api/Contracts/CommerceRuntime/Returns/ReasonCollection.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Returns/ReasonCollection.cs
@@ -14,19 +14,10 @@
 
 namespace Mozu.Api.Contracts.CommerceRuntime.Returns
 {
-		///
-		///	Mozu.CommerceRuntime.Contracts.Returns.ReasonCollection ApiType DOCUMENT_HERE 
-		///
 		public class ReasonCollection
 		{
-			///
-			///A list of requested items. All returned data is provided in an items array.For a failed request, the returned response may be success with an empty item array.
-			///
 			public List<string> Items { get; set; }
 
-			///
-			///The total number of items in the list.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Returns/Return.cs b/Mozu.Api/Contracts/CommerceRuntime/Returns/Return.cs
old mode 100644
new mode 100755
index 1194bd0d..34864390
--- a/Mozu.Api/Contracts/CommerceRuntime/Returns/Return.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Returns/Return.cs
@@ -24,179 +24,77 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Returns
 		///
 		public class Return
 		{
-			///
-			///Identifier and datetime stamp information recorded when a user or application creates, updates, or deletes a resource entity. This value is system-supplied and read-only.
-			///
 			public AuditInfo AuditInfo { get; set; }
 
-			///
-			///Available actions you can complete for an order. These actions may differ depending on the status of the order, such as actions required to enter a payment, return of a package, and fulfillment of a shipment.
-			///
 			public List<string> AvailableActions { get; set; }
 
 			///
-			///Collection (list or paged) of change messages logged for each modification made by a shopper to their carts, wishlists, orders, package, payment, pickup, and returns. Change log messages are system-supplied based on shopper actions and read only.
+			///List of change messages associated with the return.
 			///
 			public List<ChangeMessage> ChangeMessages { get; set; }
 
-			///
-			///Code that identifies the channel associated with the site for the shopper's created shopping cart, order, and return.
-			///
 			public string ChannelCode { get; set; }
 
-			///
-			///contact ApiType DOCUMENT_HERE 
-			///
 			public Contact Contact { get; set; }
 
-			///
-			///3-letter ISO 4217 standard global currency code. Currently, only "USD" (US Dollar) is supported.
-			///
 			public string CurrencyCode { get; set; }
 
-			///
-			///Unique identifer of the customer account. This ID is used to associate numerous types of data and object with the customer account, including orders, returns, wish lists, and in-store credit.
-			///
 			public int? CustomerAccountId { get; set; }
 
-			///
-			///The type of customer interaction used to create this shopping cart. Possible values are Website, Call, Store, or Unknown.
-			///
 			public string CustomerInteractionType { get; set; }
 
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public string Id { get; set; }
 
-			///
-			///An array list of objects in the returned collection.
-			///
 			public List<ReturnItem> Items { get; set; }
 
-			///
-			///The unique, user-defined code that identifies a location. This location can be the location where the order was entered, location for newly in-stock products, and where products are returned.
-			///
 			public string LocationCode { get; set; }
 
-			///
-			///The total value of the return to the merchant for accounting purposes. This total represents the combined product loss and shipping loss associated with the return.
-			///
 			public decimal? LossTotal { get; set; }
 
-			///
-			///Paged list collection of note content for objects including customers, orders, and returns. 
-			///
 			public List<OrderNote> Notes { get; set; }
 
-			///
-			///If this return is associated with a previously completed order, the unique identifier of the original order.
-			///
 			public string OriginalOrderId { get; set; }
 
-			///
-			///The order number of the original order where the return was created.
-			///
 			public int? OriginalOrderNumber { get; set; }
 
-			///
-			///Array list of physical packages shipped for a specified order.
-			///
 			public List<Package> Packages { get; set; }
 
-			///
-			///Wrapper for a collection of payments associated with an order or return. An order can include a number of payments until the full total is covered. 
-			///
 			public List<Payment> Payments { get; set; }
 
-			///
-			///The total tax amount levied on the product loss amount.
-			///
 			public decimal? ProductLossTaxTotal { get; set; }
 
-			///
-			///The total value of the product returned to the merchant for accounting purposes, calculated by multiplying the cost of the item by its quantity returned.
-			///
 			public decimal? ProductLossTotal { get; set; }
 
-			///
-			///The status that indicates whether you have received the return item from the shopper. The accepted values are , , or .
-			///
 			public string ReceiveStatus { get; set; }
 
-			///
-			///If a refund action was performed for this return, the total amount refunded to the shopper. The refund amount can differ from the sum of the price of the returned items.
-			///
 			public decimal? RefundAmount { get; set; }
 
-			///
-			///The status of the refund. The accepted values are  if the shopper only wants a replacement or  if either a partial or full refund is applied to the return.
-			///
 			public string RefundStatus { get; set; }
 
-			///
-			///The status of the replacement order. The accepted values are  if there is no replacement order or  if a replacement order exits.
-			///
 			public string ReplaceStatus { get; set; }
 
-			///
-			///A merchant-specific identifier used to sequentially order returns.
-			///
 			public int? ReturnNumber { get; set; }
 
-			///
-			///Unique identifier for the last order created as a result of the return. If the return results in shipping a replacement item, the order includes shipment information for the replaced items. If the return results in a refund, the order includes payment transactions to credit the shopper.
-			///
 			public string ReturnOrderId { get; set; }
 
-			///
-			///The type of return, which is  or .At the top-level return level, this field is DEPRECATED because Refund and Replace items can now be mixed within a single return. For backwards-compatibility with older applications, the field defaults to .
-			///
 			public string ReturnType { get; set; }
 
-			///
-			///The date by which a shopper must ship items associated with a return in an "awaiting items" state to the merchant.
-			///
 			public DateTime? RmaDeadline { get; set; }
 
-			///
-			///The total tax amount levied on the shipping loss amount.
-			///
 			public decimal? ShippingLossTaxTotal { get; set; }
 
-			///
-			///The total value of shipping the returned product to the merchant for accounting purposes, calculated by multiplying the shipping cost of the item by its quantity returned.
-			///
 			public decimal? ShippingLossTotal { get; set; }
 
-			///
-			///Unique identifier of the site.
-			///
 			public int? SiteId { get; set; }
 
-			///
-			///The current status of the object.This value is read only. Valid values for this field are: "Active", "Expired", and "Inactive".
-			///
 			public string Status { get; set; }
 
-			///
-			///Unique identifier of the Mozu tenant.
-			///
 			public int? TenantId { get; set; }
 
-			///
-			///Unique identifier of the customer account (shopper or system user). System-supplied and read-only. If the shopper user is anonymous, the user ID represents a system-generated user ID string.
-			///
 			public string UserId { get; set; }
 
-			///
-			///Unique identifier of the customer visit in which the cart was created or last modified.
-			///
 			public string VisitId { get; set; }
 
-			///
-			///Unique identifier of the web session in which the cart, order, return, or wish list was created or last modified.
-			///
 			public string WebSessionId { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Returns/ReturnAction.cs b/Mozu.Api/Contracts/CommerceRuntime/Returns/ReturnAction.cs
old mode 100644
new mode 100755
index eba51951..0dc99f0d
--- a/Mozu.Api/Contracts/CommerceRuntime/Returns/ReturnAction.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Returns/ReturnAction.cs
@@ -19,14 +19,8 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Returns
 		///
 		public class ReturnAction
 		{
-			///
-			///The name of the action to perform for the payment, fulfillment, order, or return.
-			///
 			public string ActionName { get; set; }
 
-			///
-			///The list of returns for which to perform the action.
-			///
 			public List<string> ReturnIds { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Returns/ReturnBundle.cs b/Mozu.Api/Contracts/CommerceRuntime/Returns/ReturnBundle.cs
old mode 100644
new mode 100755
index 9cd244ad..c3a88c2c
--- a/Mozu.Api/Contracts/CommerceRuntime/Returns/ReturnBundle.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Returns/ReturnBundle.cs
@@ -24,7 +24,7 @@ public class ReturnBundle
 			public string ProductCode { get; set; }
 
 			///
-			///The specified quantity of objects and items. This property is used for numerous object types including products, options, components within a product bundle, cart and order items, returned items, shipping line items, items in a digital product. and items associated with types and reservations.
+			///The number of returned product bundles in the return.
 			///
 			public int Quantity { get; set; }
 
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Returns/ReturnCollection.cs b/Mozu.Api/Contracts/CommerceRuntime/Returns/ReturnCollection.cs
old mode 100644
new mode 100755
index 27719da8..dcb727a2
--- a/Mozu.Api/Contracts/CommerceRuntime/Returns/ReturnCollection.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Returns/ReturnCollection.cs
@@ -19,29 +19,14 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Returns
 		///
 		public class ReturnCollection
 		{
-			///
-			///An array list of objects in the returned collection.
-			///
 			public List<Return> Items { get; set; }
 
-			///
-			///The number of pages returned based on the startIndex and pageSize values specified. This value is system-supplied and read-only.
-			///
 			public int PageCount { get; set; }
 
-			///
-			///The number of results to display on each page when creating paged results from a query. The maximum value is 200.
-			///
 			public int PageSize { get; set; }
 
-			///
-			///When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.
-			///
 			public int StartIndex { get; set; }
 
-			///
-			///The number of results listed in the query collection, represented by a signed 64-bit (8-byte) integer. This value is system-supplied and read-only.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Returns/ReturnItem.cs b/Mozu.Api/Contracts/CommerceRuntime/Returns/ReturnItem.cs
old mode 100644
new mode 100755
index 76ef5819..7aa0cfa9
--- a/Mozu.Api/Contracts/CommerceRuntime/Returns/ReturnItem.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Returns/ReturnItem.cs
@@ -22,128 +22,59 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Returns
 		public class ReturnItem
 		{
 			///
-			///Properties of a collection of component products that make up a single product bundle with its own product code. Tenants can define product bundles for any product type that supports the Bundle product usage.
+			///Properties of a collection of component products that make up a single returned product bundle with its own product code.
 			///
 			public List<ReturnBundle> BundledProducts { get; set; }
 
-			///
-			///Specifies whether to exclude product extras when you return a product or bundle. For example, assume the following order items:* Product A (bundle item)* Product B (bundle item)* Product C (bundle item)* Product D (extra on bundle)* Product F (extra on product)If this property is , Products D or F are included when the bundle or Product E are added to a return. If this property is , Products D or F are not included unless added individually.
-			///
 			public bool? ExcludeProductExtras { get; set; }
 
 			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
+			///Unique identifier of the return whose items you want to get.
 			///
 			public string Id { get; set; }
 
-			///
-			///Paged list collection of note content for objects including customers, orders, and returns. 
-			///
 			public List<OrderNote> Notes { get; set; }
 
-			///
-			///Unique identifier of the order item associated with a validation message, order, or return.
-			///
 			public string OrderItemId { get; set; }
 
-			///
-			///This is the Option attribute FQN for the item being returned .. typically only when the return item is a product bundle item.
-			///
 			public string OrderItemOptionAttributeFQN { get; set; }
 
-			///
-			///The OrderLineId that this ReturnItem is associated with. If order item is present, the orderLineId should be present also.
-			///
 			public int? OrderLineId { get; set; }
 
-			///
-			///The properties of a product, referenced and used by carts, orders, wish lists, and returns.
-			///
 			public Product Product { get; set; }
 
-			///
-			///The total value of the product returned to the merchant for accounting purposes, calculated by multiplying the cost of the item by its quantity returned.
-			///
 			public decimal? ProductLossAmount { get; set; }
 
-			///
-			///The total tax amount levied on the product loss amount.
-			///
 			public decimal? ProductLossTaxAmount { get; set; }
 
-			///
-			///The actual quantity received for the return item.
-			///
 			public int QuantityReceived { get; set; }
 
-			///
-			///The quantity of the given line item that will be replaced.
-			///
 			public int? QuantityReplaced { get; set; }
 
-			///
-			///The quantity of returned items that can be returned to active product stock.
-			///
 			public int QuantityRestockable { get; set; }
 
-			///
-			///The quantity of the item shipped to the shopper in the event of a return item replacement.
-			///
 			public int QuantityShipped { get; set; }
 
-			///
-			///The list of return reasons for the item and the quantity associated with each return reason.
-			///
 			public List<ReturnReason> Reasons { get; set; }
 
-			///
-			///The status that indicates whether the shopper has returned the item. The accepted values are , , or .
-			///
 			public string ReceiveStatus { get; set; }
 
-			///
-			///The amount of the refund.
-			///
 			public decimal? RefundAmount { get; set; }
 
-			///
-			///The status of the refund for the item. The accepted values are  if the shopper only wants a replacement or  if either a partial or full refund is applied to the item.
-			///
 			public string RefundStatus { get; set; }
 
-			///
-			///The status of the replacement order for the item. The accepted values are  if there is no replacement order or  if a replacement order exits.
-			///
 			public string ReplaceStatus { get; set; }
 
-			///
-			///A Boolean that indicates whether the item requires the shopper to return the item.
-			///
 			public bool ReturnNotRequired { get; set; }
 
-			///
-			///The type of the return for the item. Either  or .
-			///
 			public string ReturnType { get; set; }
 
-			///
-			///The total value of shipping the returned product to the merchant for accounting purposes, calculated by multiplying the shipping cost of the item by its quantity returned.
-			///
 			public decimal? ShippingLossAmount { get; set; }
 
-			///
-			///The total tax amount levied on the shipping loss amount.
-			///
 			public decimal? ShippingLossTaxAmount { get; set; }
 
-			///
-			///The total cost without shipping and handling applied.
-			///
 			public decimal? TotalWithoutWeightedShippingAndHandling { get; set; }
 
-			///
-			///The total cost with shipping and handling applied.
-			///
 			public decimal? TotalWithWeightedShippingAndHandling { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Returns/ReturnItemCollection.cs b/Mozu.Api/Contracts/CommerceRuntime/Returns/ReturnItemCollection.cs
old mode 100644
new mode 100755
index 57b4fc61..1fb824b3
--- a/Mozu.Api/Contracts/CommerceRuntime/Returns/ReturnItemCollection.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Returns/ReturnItemCollection.cs
@@ -20,13 +20,10 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Returns
 		public class ReturnItemCollection
 		{
 			///
-			///A list of requested items. All returned data is provided in an items array.For a failed request, the returned response may be success with an empty item array.
+			///Retrieves the details of all return items in an order.
 			///
 			public List<ReturnItem> Items { get; set; }
 
-			///
-			///The total number of items in the list.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Returns/ReturnItemSpecifier.cs b/Mozu.Api/Contracts/CommerceRuntime/Returns/ReturnItemSpecifier.cs
old mode 100644
new mode 100755
index 1da67066..c5405167
--- a/Mozu.Api/Contracts/CommerceRuntime/Returns/ReturnItemSpecifier.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Returns/ReturnItemSpecifier.cs
@@ -13,19 +13,10 @@
 
 namespace Mozu.Api.Contracts.CommerceRuntime.Returns
 {
-		///
-		///	Mozu.CommerceRuntime.Contracts.Returns.ReturnItemSpecifier ApiType DOCUMENT_HERE 
-		///
 		public class ReturnItemSpecifier
 		{
-			///
-			///The specified quantity of objects and items. This property is used for numerous object types including products, options, components within a product bundle, cart and order items, returned items, shipping line items, items in a digital product. and items associated with types and reservations.
-			///
 			public int Quantity { get; set; }
 
-			///
-			///The ID of the return item to add to a replacement order.
-			///
 			public string ReturnItemId { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Returns/ReturnReason.cs b/Mozu.Api/Contracts/CommerceRuntime/Returns/ReturnReason.cs
old mode 100644
new mode 100755
index c4adff74..c19e3003
--- a/Mozu.Api/Contracts/CommerceRuntime/Returns/ReturnReason.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Returns/ReturnReason.cs
@@ -18,14 +18,8 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Returns
 		///
 		public class ReturnReason
 		{
-			///
-			///The specified quantity of objects and items. This property is used for numerous object types including products, options, components within a product bundle, cart and order items, returned items, shipping line items, items in a digital product. and items associated with types and reservations.
-			///
 			public int Quantity { get; set; }
 
-			///
-			///The reason description for an action, including item return, coupon not valid, and item is taxed. 
-			///
 			public string Reason { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Wishlists/Wishlist.cs b/Mozu.Api/Contracts/CommerceRuntime/Wishlists/Wishlist.cs
old mode 100644
new mode 100755
index 59662e40..7f3b55a8
--- a/Mozu.Api/Contracts/CommerceRuntime/Wishlists/Wishlist.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Wishlists/Wishlist.cs
@@ -24,209 +24,97 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Wishlists
 		///
 		public class Wishlist
 		{
-			///
-			///Identifier and datetime stamp information recorded when a user or application creates, updates, or deletes a resource entity. This value is system-supplied and read-only.
-			///
 			public AuditInfo AuditInfo { get; set; }
 
-			///
-			///Collection (list or paged) of change messages logged for each modification made by a shopper to their carts, wishlists, orders, package, payment, pickup, and returns. Change log messages are system-supplied based on shopper actions and read only.
-			///
 			public List<ChangeMessage> ChangeMessages { get; set; }
 
-			///
-			///Code that identifies the channel associated with the site for the shopper's created shopping cart, order, and return.
-			///
 			public string ChannelCode { get; set; }
 
-			///
-			///3-letter ISO 4217 standard global currency code. Currently, only "USD" (US Dollar) is supported.
-			///
 			public string CurrencyCode { get; set; }
 
-			///
-			///Unique identifer of the customer account. This ID is used to associate numerous types of data and object with the customer account, including orders, returns, wish lists, and in-store credit.
-			///
 			public int? CustomerAccountId { get; set; }
 
-			///
-			///The type of customer interaction used to create this shopping cart. Possible values are Website, Call, Store, or Unknown.
-			///
 			public string CustomerInteractionType { get; set; }
 
-			///
-			///Custom data for a given vendor set within the commerce process.
-			///
 			public JObject Data { get; set; }
 
-			///
-			///The aggregate total for all items in the cart, including costs associated with shopper-defined options or extras and any applied discounts.
-			///
 			public decimal? DiscountedSubtotal { get; set; }
 
-			///
-			///The subtotal of the cart, order, and wishlist items, including any applied discount calculations. Wishlist subtotals may change depending on the length of time, available discounts, and stock amounts of products at the time of review by shoppers.
-			///
 			public decimal? DiscountedTotal { get; set; }
 
-			///
-			///Estimated amount of discounts applied to all items in the carts and orders. System-supplied and read-only. This value will be available at the wish list, cart item, order item, and wish list item level at a later time.
-			///
 			public decimal? DiscountTotal { get; set; }
 
-			///
-			///Date and time in UTC format when a discount, credit, wish list, or cart expires. An expired discount no longer can be redeemed. An expired wish list is no longer available. An expired credit can no longer be redeemed for a purchase. Acart becomes inactive and expired based on a system-calculated interval. For example, if an anonymous shopper has 14 days of inactivity, the cart is considered abandoned after that period of inactivity. System-supplied and read-only.
-			///
 			public DateTime? ExpirationDate { get; set; }
 
-			///
-			///Extra properties (key-value pairs) that extend the primary object. Think of this as a property bag of string keys and string values.
-			///
 			public List<ExtendedProperty> ExtendedProperties { get; set; }
 
 			///
-			///Unique identifier used by an external program to identify a  order, customer account, or wish list.
+			///The identifier an external program uses to identify the Mozu wish list.
 			///
 			public string ExternalId { get; set; }
 
-			///
-			///The monetary sum of all fees incurred in the cart, order, line item in a cart, or line item in an order. This value is not calculated for wish lists at this time.
-			///
 			public decimal? FeeTotal { get; set; }
 
-			///
-			///Properties of the information required to fulfill the cart, order, or wish list. Shoppers can fulfill ordered items by using in-store pickup or direct shipping.
-			///
 			public FulfillmentInfo FulfillmentInfo { get; set; }
 
-			///
-			///Calculated total tax amount for handling costs if the cart/order is subject to sales tax. 
-			///
 			public decimal? HandlingTaxTotal { get; set; }
 
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public string Id { get; set; }
 
 			///
-			///The date and time an order or wish list is imported into . This is not the date and time it was created in the external application.
+			///If this wish list was imported from an external program, the date and time the wish list was imported.
 			///
 			public DateTime? ImportDate { get; set; }
 
 			///
-			///Indicates if this object/data was imported from an outside source such as a data import or synchronization via an app or service. If true, this data was originally imported into  and accessible through your store database. Examples of imported objects/data include orders and customer accounts.
+			///If true, this wish list was imported from an external program.
 			///
 			public bool? IsImport { get; set; }
 
-			///
-			///An array list of objects in the returned collection.
-			///
 			public List<WishlistItem> Items { get; set; }
 
-			///
-			///The total amount of calculated tax for items, used by carts, orders, and wish lists.
-			///
 			public decimal? ItemTaxTotal { get; set; }
 
-			///
-			///The date in UTC Date/Time when the items in the cart were last validated against the site's product catalog. System-supplied and read-only.
-			///
 			public DateTime? LastValidationDate { get; set; }
 
-			///
-			///The total charge for the line item with all weighted order level manual adjustments.
-			///
 			public decimal? LineItemSubtotalWithOrderAdjustments { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
-			///
-			///List of order-level discounts projected to apply to the cart at checkout or order.
-			///
 			public List<AppliedDiscount> OrderDiscounts { get; set; }
 
-			///
-			///The type of privacy to apply to this wish list. Possible values are "Private" which makes the wish list viewable only to the shopper, "DirectShare" which makes the wish list viewable only to people with whom the shopper shares the wish list link, or "Public" which makes the wish list available to everyone. At this time, the system treats all shopper wish lists as "Public" regardless of the defined privacy type.
-			///
 			public string PrivacyType { get; set; }
 
-			///
-			///The total shipping amount for the wishlist before discounts and adjustments.
-			///
 			public decimal? ShippingAmountBeforeDiscountsAndAdjustments { get; set; }
 
-			///
-			///The shipping subtotal amount calculated without any applied discounts for line item and entire amounts of carts and orders. This property is not calculated for wish lists at this time.
-			///
 			public decimal? ShippingSubTotal { get; set; }
 
-			///
-			///The total amount of tax incurred on the shipping charges in the cart and order. This property is not calculated at this time for wish lists.
-			///
 			public decimal? ShippingTaxTotal { get; set; }
 
-			///
-			///The calculated total shipping amount estimated for carts or orders, including tax. This amount is not calculated for wish lists at this time.
-			///
 			public decimal? ShippingTotal { get; set; }
 
-			///
-			///Unique identifier of the site.
-			///
 			public int? SiteId { get; set; }
 
-			///
-			///The integer that represents the sequential order of this wish list in the customer's collection of wish lists.
-			///
 			public int? SortOrder { get; set; }
 
-			///
-			///Estimated amount of the cart or order without sales tax, shipping costs, and other fees. This amount is not calculated for wish lists at this time.
-			///
 			public decimal? Subtotal { get; set; }
 
-			///
-			///Leverage this property within a [tax Arc.js action](https://www.mozu.com/docs/arcjs/commerce-catalog-storefront-tax/commerce-catalog-storefront-tax.htm) to supplement the tax information for this item or object with custom JSON data.
-			///
+			public List<SuggestedDiscount> SuggestedDiscounts { get; set; }
+
 			public JObject TaxData { get; set; }
 
-			///
-			///The total monetary sum of sales tax estimated for a cart or order.
-			///
 			public decimal? TaxTotal { get; set; }
 
-			///
-			///Unique identifier of the Mozu tenant.
-			///
 			public int? TenantId { get; set; }
 
-			///
-			///Total is used to indicate the monetary, estimated total amount of the cart or order, including items, sales tax, shipping costs, and other fees. Totals are not estimated for wish lists at this time.
-			///
 			public decimal? Total { get; set; }
 
-			///
-			///User-defined string that defines the type of wish list to define, such as wish list, baby registry, or Christmas list.
-			///
 			public string TypeTag { get; set; }
 
-			///
-			///System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.
-			///
 			public string Version { get; set; }
 
-			///
-			///Unique identifier of the customer visit in which the cart was created or last modified.
-			///
 			public string VisitId { get; set; }
 
-			///
-			///Unique identifier of the web session in which the cart, order, return, or wish list was created or last modified.
-			///
 			public string WebSessionId { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Wishlists/WishlistCollection.cs b/Mozu.Api/Contracts/CommerceRuntime/Wishlists/WishlistCollection.cs
old mode 100644
new mode 100755
index 8bac0e0c..8152f179
--- a/Mozu.Api/Contracts/CommerceRuntime/Wishlists/WishlistCollection.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Wishlists/WishlistCollection.cs
@@ -19,29 +19,14 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Wishlists
 		///
 		public class WishlistCollection
 		{
-			///
-			///An array list of objects in the returned collection.
-			///
 			public List<Wishlist> Items { get; set; }
 
-			///
-			///The number of pages returned based on the startIndex and pageSize values specified. This value is system-supplied and read-only.
-			///
 			public int PageCount { get; set; }
 
-			///
-			///The number of results to display on each page when creating paged results from a query. The maximum value is 200.
-			///
 			public int PageSize { get; set; }
 
-			///
-			///When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.
-			///
 			public int StartIndex { get; set; }
 
-			///
-			///The number of results listed in the query collection, represented by a signed 64-bit (8-byte) integer. This value is system-supplied and read-only.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Wishlists/WishlistItem.cs b/Mozu.Api/Contracts/CommerceRuntime/Wishlists/WishlistItem.cs
old mode 100644
new mode 100755
index 49518d70..a2cd3fb5
--- a/Mozu.Api/Contracts/CommerceRuntime/Wishlists/WishlistItem.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Wishlists/WishlistItem.cs
@@ -24,224 +24,99 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Wishlists
 		///
 		public class WishlistItem
 		{
-			///
-			///The adjusted subtotal of the line item, including all manual adjustments, discounts, shipping charges and discounts, and duty or any other additional line item fees.
-			///
 			public decimal? AdjustedLineItemSubtotal { get; set; }
 
-			///
-			///Identifier and datetime stamp information recorded when a user or application creates, updates, or deletes a resource entity. This value is system-supplied and read-only.
-			///
 			public AuditInfo AuditInfo { get; set; }
 
-			///
-			///Notes entered and saved with an order. These notes may be entered by a shopper on a wishlist or for an order. Comments may also be entered by  Admins on an order that may be visible only to authorized shoppers and users.
-			///
+			public int? AutoAddDiscountId { get; set; }
+
 			public string Comments { get; set; }
 
-			///
-			///Custom data for a given vendor set within the commerce process.
-			///
 			public JObject Data { get; set; }
 
-			///
-			///The subtotal of the cart, order, and wishlist items, including any applied discount calculations. Wishlist subtotals may change depending on the length of time, available discounts, and stock amounts of products at the time of review by shoppers.
-			///
 			public decimal? DiscountedTotal { get; set; }
 
-			///
-			///Estimated amount of discounts applied to all items in the carts and orders. System-supplied and read-only. This value will be available at the wish list, cart item, order item, and wish list item level at a later time.
-			///
 			public decimal? DiscountTotal { get; set; }
 
-			///
-			///Represents the total price of the cart item extended to the shopper. This begins with the Unit Price, then uses any of the following prices if they are defined, in the following order: Override Amount, Sale Amount, List Amount. This value is not calculated for wish lists at this time.
-			///
 			public decimal? ExtendedTotal { get; set; }
 
-			///
-			///The monetary sum of all fees incurred in the cart, order, line item in a cart, or line item in an order. This value is not calculated for wish lists at this time.
-			///
 			public decimal? FeeTotal { get; set; }
 
-			///
-			///The combined price for all handling costs calculated together for shipped orders, not for digital or in-store pickup. This includes all handling costs per the product line items and options, excluding taxes and discounts. 
-			///
 			public decimal? HandlingAmount { get; set; }
 
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public string Id { get; set; }
 
-			///
-			///Indicates if the product in a cart, order, or wish list is purchased on a recurring schedule. If true, the item can be purchased or fulfilled at regular intervals, such as a monthly billing cycle. For example, digital or physical product subscriptions are recurring cart items. This property is not used at this time and is reserved for future functionality.
-			///
 			public bool? IsRecurring { get; set; }
 
-			///
-			///Indicates if the item is subject to taxation, used by products, options, extras, cart and order items, line items, and wish lists. If true, the entity is subject to tax based on the relevant tax rate and rules.
-			///
 			public bool? IsTaxable { get; set; }
 
-			///
-			///The total amount of calculated tax for items, used by carts, orders, and wish lists.
-			///
 			public decimal? ItemTaxTotal { get; set; }
 
-			///
-			///The line id assigned to the order item. Visible only in the Admin, this is set from the Admin or in CommerceRuntime when a cart is converted to an order.
-			///
 			public int? LineId { get; set; }
 
-			///
-			///Language used for the entity. Currently, only "en-US" is supported.
-			///
 			public string LocaleCode { get; set; }
 
-			///
-			///User-defined string that indicates the priority of an item in a wish list. Possible values are Lowest, Low, Medium, High, and Highest.
-			///
 			public string PriorityType { get; set; }
 
-			///
-			///The properties of a product, referenced and used by carts, orders, wish lists, and returns.
-			///
 			public Product Product { get; set; }
 
 			///
-			///The applicable product discount for an associated cart, order, or wish list. 
+			///List of product discounts that apply to the item in the wishlist.
 			///
 			public AppliedLineItemProductDiscount ProductDiscount { get; set; }
 
-			///
-			///List of product-level discounts projected to apply to a cart, order, or wish list.
-			///
 			public List<AppliedLineItemProductDiscount> ProductDiscounts { get; set; }
 
-			///
-			///The status of the item that indicates whether an item in a wish list can be purchased. Possible values are "Purchasable" which indicates the item can be purchased, "NotPurchasable" which indicates the item is out of stock or otherwise unavailable, or "Missing" which indicates the item has been deleted from the catalog since it was added to the wish list.
-			///
 			public string PurchasableStatusType { get; set; }
 
-			///
-			///The specified quantity of objects and items. This property is used for numerous object types including products, options, components within a product bundle, cart and order items, returned items, shipping line items, items in a digital product. and items associated with types and reservations.
-			///
+			public string PurchaseLocation { get; set; }
+
 			public int Quantity { get; set; }
 
-			///
-			///The total shipping amount for the line item before discounts and adjustments.
-			///
 			public decimal? ShippingAmountBeforeDiscountsAndAdjustments { get; set; }
 
-			///
-			///List of shipping discounts projected to apply to carts, orders, and wish lists and items at checkout.
-			///
 			public List<AppliedLineItemShippingDiscount> ShippingDiscounts { get; set; }
 
-			///
-			///The total amount of tax incurred on the shipping charges in the cart and order. This property is not calculated at this time for wish lists.
-			///
 			public decimal? ShippingTaxTotal { get; set; }
 
-			///
-			///The calculated total shipping amount estimated for carts or orders, including tax. This amount is not calculated for wish lists at this time.
-			///
 			public decimal? ShippingTotal { get; set; }
 
-			///
-			///Estimated amount of the cart or order without sales tax, shipping costs, and other fees. This amount is not calculated for wish lists at this time.
-			///
 			public decimal? Subtotal { get; set; }
 
-			///
-			///The monetary amount of an item in the cart that is subject to tax. This amount typically represents the line item subtotal before applied discounts for an order.
-			///
 			public decimal? TaxableTotal { get; set; }
 
-			///
-			///Leverage this property within a [tax Arc.js action](https://www.mozu.com/docs/arcjs/commerce-catalog-storefront-tax/commerce-catalog-storefront-tax.htm) to supplement the tax information for this item or object with custom JSON data.
-			///
 			public JObject TaxData { get; set; }
 
-			///
-			///Total is used to indicate the monetary, estimated total amount of the cart or order, including items, sales tax, shipping costs, and other fees. Totals are not estimated for wish lists at this time.
-			///
 			public decimal? Total { get; set; }
 
-			///
-			///The total charge for the line item without any weighted order level shipping and handling charges.
-			///
 			public decimal? TotalWithoutWeightedShippingAndHandling { get; set; }
 
-			///
-			///The total charge for the line item with all weighted order level shipping and handling charges.
-			///
 			public decimal? TotalWithWeightedShippingAndHandling { get; set; }
 
-			///
-			///Properties of the price per unit of a product, associated with cart and order items. This price is not used for wish lists at this time.
-			///
 			public CommerceUnitPrice UnitPrice { get; set; }
 
-			///
-			///The total weighted order level manual adjustment amount.
-			///
 			public decimal? WeightedOrderAdjustment { get; set; }
 
-			///
-			///The total weighted order level discount amount.
-			///
 			public decimal? WeightedOrderDiscount { get; set; }
 
-			///
-			///The total weighted order level duty charges.
-			///
 			public decimal? WeightedOrderDuty { get; set; }
 
-			///
-			///The adjustment to apply to the order handling fee.
-			///
 			public decimal? WeightedOrderHandlingAdjustment { get; set; }
 
-			///
-			///The total weighted order level handling fee amount.
-			///
 			public decimal? WeightedOrderHandlingFee { get; set; }
 
-			///
-			///The total weighted order handling fee discount amount.
-			///
 			public decimal? WeightedOrderHandlingFeeDiscount { get; set; }
 
-			///
-			///The total weighted order level handling fee tax amount.
-			///
 			public decimal? WeightedOrderHandlingFeeTax { get; set; }
 
-			///
-			///The total weighted order level shipping charge.
-			///
 			public decimal? WeightedOrderShipping { get; set; }
 
-			///
-			///The total weighted order level shipping discount amount.
-			///
 			public decimal? WeightedOrderShippingDiscount { get; set; }
 
-			///
-			///The total weighted order level shipping manual adjustment amount.
-			///
 			public decimal? WeightedOrderShippingManualAdjustment { get; set; }
 
-			///
-			///The total weighted order level shipping tax amount.
-			///
 			public decimal? WeightedOrderShippingTax { get; set; }
 
-			///
-			///The total weighted order level tax amount.
-			///
 			public decimal? WeightedOrderTax { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/CommerceRuntime/Wishlists/WishlistItemCollection.cs b/Mozu.Api/Contracts/CommerceRuntime/Wishlists/WishlistItemCollection.cs
old mode 100644
new mode 100755
index 62639c1d..31d9cfdb
--- a/Mozu.Api/Contracts/CommerceRuntime/Wishlists/WishlistItemCollection.cs
+++ b/Mozu.Api/Contracts/CommerceRuntime/Wishlists/WishlistItemCollection.cs
@@ -19,29 +19,14 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Wishlists
 		///
 		public class WishlistItemCollection
 		{
-			///
-			///An array list of objects in the returned collection.
-			///
 			public List<WishlistItem> Items { get; set; }
 
-			///
-			///The number of pages returned based on the startIndex and pageSize values specified. This value is system-supplied and read-only.
-			///
 			public int PageCount { get; set; }
 
-			///
-			///The number of results to display on each page when creating paged results from a query. The maximum value is 200.
-			///
 			public int PageSize { get; set; }
 
-			///
-			///When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.
-			///
 			public int StartIndex { get; set; }
 
-			///
-			///The number of results listed in the query collection, represented by a signed 64-bit (8-byte) integer. This value is system-supplied and read-only.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Content/ActiveDateRange.cs b/Mozu.Api/Contracts/Content/ActiveDateRange.cs
old mode 100644
new mode 100755
index 42ed97fb..14f78271
--- a/Mozu.Api/Contracts/Content/ActiveDateRange.cs
+++ b/Mozu.Api/Contracts/Content/ActiveDateRange.cs
@@ -13,19 +13,10 @@
 
 namespace Mozu.Api.Contracts.Content
 {
-		///
-		///	Specifies a start date and end date for when associated object is on the live site, if  is set to .If  is set to  ignores this property.
-		///
 		public class ActiveDateRange
 		{
-			///
-			///The end of the active date range for this document
-			///
 			public DateTime? EndDate { get; set; }
 
-			///
-			///The beginning of the active date range of this document
-			///
 			public DateTime? StartDate { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Content/AddOrDeletePublishItem.cs b/Mozu.Api/Contracts/Content/AddOrDeletePublishItem.cs
old mode 100644
new mode 100755
index e06ab194..b8b9ad1d
--- a/Mozu.Api/Contracts/Content/AddOrDeletePublishItem.cs
+++ b/Mozu.Api/Contracts/Content/AddOrDeletePublishItem.cs
@@ -13,29 +13,14 @@
 
 namespace Mozu.Api.Contracts.Content
 {
-		///
-		///	This property is not exposed in documentation.
-		///
 		public class AddOrDeletePublishItem
 		{
-			///
-			///The fully qualified name of the document list that the pending content change is associated with.
-			///
 			public string DocListFQN { get; set; }
 
-			///
-			///The unique identifier of the pending content change or the document.
-			///
 			public string DocumentId { get; set; }
 
-			///
-			///The unique identifier of the scope. For example, if your scope type is site, then this value would be the site id.
-			///
 			public int ScopeId { get; set; }
 
-			///
-			///The type of scope associated with the documentList. For example, if the documentList is pageTemplateContent, the scopeType is Site.Valid values are: "Tenant", "MasterCatalog", and "Site".
-			///
 			public string ScopeType { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Content/Document.cs b/Mozu.Api/Contracts/Content/Document.cs
old mode 100644
new mode 100755
index e0eff266..faa85b0b
--- a/Mozu.Api/Contracts/Content/Document.cs
+++ b/Mozu.Api/Contracts/Content/Document.cs
@@ -20,74 +20,32 @@ namespace Mozu.Api.Contracts.Content
 		///
 		public class Document
 		{
-			///
-			///Mozu.Content.Contracts.Document activeDateRange ApiTypeMember DOCUMENT_HERE 
-			///
 			public ActiveDateRange ActiveDateRange { get; set; }
 
-			///
-			///The character length allowed for the content text.
-			///
 			public long ContentLength { get; set; }
 
-			///
-			///The mime type associated with the document content, if applicable.
-			///
 			public string ContentMimeType { get; set; }
 
-			///
-			///The date and time the most recent content update was made. UTC date/time. System-supplied and read-only.
-			///
 			public DateTime? ContentUpdateDate { get; set; }
 
-			///
-			///Fully qualified name of the document type. 
-			///
 			public string DocumentTypeFQN { get; set; }
 
-			///
-			///If applicable, the file extension associated with the document content. For example, the extension may be .html for an HTML web page.
-			///
 			public string Extension { get; set; }
 
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public string Id { get; set; }
 
-			///
-			///The date and time when a document was added to the document list. System-supplied and read-only.
-			///
 			public DateTime? InsertDate { get; set; }
 
-			///
-			///The fully qualified name of the document list.
-			///
 			public string ListFQN { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
-			///
-			///Collection of property attributes defined for the object. Properties are associated to all objects within , including documents, products, and product types.
-			///
 			public JObject Properties { get; set; }
 
-			///
-			///The name of the publish set that this document belongs to, if any.
-			///
 			public string PublishSetCode { get; set; }
 
-			///
-			///The current state of the document or product definition. States for documents include Active, Draft, or Latest. Active documents are published and cannot be deleted. Querying Latest returns the most recent version of the document, regardless of whether it is published or a draft. States for product include New, Draft, or Live.
-			///
 			public string PublishState { get; set; }
 
-			///
-			///Date and time when the entity was last updated, represented in UTC Date/Time.
-			///
 			public DateTime? UpdateDate { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Content/DocumentCollection.cs b/Mozu.Api/Contracts/Content/DocumentCollection.cs
old mode 100644
new mode 100755
index 3b607263..3a7a6c29
--- a/Mozu.Api/Contracts/Content/DocumentCollection.cs
+++ b/Mozu.Api/Contracts/Content/DocumentCollection.cs
@@ -19,29 +19,14 @@ namespace Mozu.Api.Contracts.Content
 		///
 		public class DocumentCollection
 		{
-			///
-			///An array list of objects in the returned collection.
-			///
 			public List<Document> Items { get; set; }
 
-			///
-			///The number of pages returned based on the startIndex and pageSize values specified. This value is system-supplied and read-only.
-			///
 			public int PageCount { get; set; }
 
-			///
-			///The number of results to display on each page when creating paged results from a query. The maximum value is 200.
-			///
 			public int PageSize { get; set; }
 
-			///
-			///When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.
-			///
 			public int StartIndex { get; set; }
 
-			///
-			///The number of results listed in the query collection, represented by a signed 64-bit (8-byte) integer. This value is system-supplied and read-only.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Content/DocumentDraftSummary.cs b/Mozu.Api/Contracts/Content/DocumentDraftSummary.cs
old mode 100644
new mode 100755
index 4ad15cea..1cb1abb2
--- a/Mozu.Api/Contracts/Content/DocumentDraftSummary.cs
+++ b/Mozu.Api/Contracts/Content/DocumentDraftSummary.cs
@@ -18,69 +18,30 @@ namespace Mozu.Api.Contracts.Content
 		///
 		public class DocumentDraftSummary
 		{
-			///
-			///Detailed information of the date and time for the active update date for the document draft summary. This data is associated to document and content data.
-			///
 			public DateTime? ActiveUpdateDate { get; set; }
 
-			///
-			///The unique identifier of the user that last updated the content or document draft.
-			///
 			public string ActiveUpdatedBy { get; set; }
 
-			///
-			///The unique identifier for the product catalog. Catalogs are part of a master catalog.
-			///
 			public int? CatalogId { get; set; }
 
-			///
-			///Fully qualified name of the document type. 
-			///
 			public string DocumentTypeFQN { get; set; }
 
-			///
-			///Detailed information of the date and time for the draft update date for the document draft summary. This data is associated to document and content data.
-			///
 			public DateTime DraftUpdateDate { get; set; }
 
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public string Id { get; set; }
 
-			///
-			///The fully qualified name of the document list.
-			///
 			public string ListFQN { get; set; }
 
-			///
-			///Unique identifier for the master catalog. 
-			///
 			public int? MasterCatalogId { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
-			///
-			///The unique identifier of the publish set.
-			///
 			public string PublishSetCode { get; set; }
 
-			///
-			///Whether the draft has been published.
-			///
 			public string PublishType { get; set; }
 
-			///
-			///Unique identifier for the site. This ID is used at all levels of a store, catalog, and tenant to associate objects to a site.
-			///
 			public int? SiteId { get; set; }
 
-			///
-			///Unique identifier of the user who last modified the item. This value is system-supplied and read-only.
-			///
 			public string UpdatedBy { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Content/DocumentDraftSummaryPagedCollection.cs b/Mozu.Api/Contracts/Content/DocumentDraftSummaryPagedCollection.cs
old mode 100644
new mode 100755
index 075a29fe..d8dcd8b5
--- a/Mozu.Api/Contracts/Content/DocumentDraftSummaryPagedCollection.cs
+++ b/Mozu.Api/Contracts/Content/DocumentDraftSummaryPagedCollection.cs
@@ -19,29 +19,14 @@ namespace Mozu.Api.Contracts.Content
 		///
 		public class DocumentDraftSummaryPagedCollection
 		{
-			///
-			///An array list of objects in the returned collection.
-			///
 			public List<DocumentDraftSummary> Items { get; set; }
 
-			///
-			///The number of pages returned based on the startIndex and pageSize values specified. This value is system-supplied and read-only.
-			///
 			public int PageCount { get; set; }
 
-			///
-			///The number of results to display on each page when creating paged results from a query. The maximum value is 200.
-			///
 			public int PageSize { get; set; }
 
-			///
-			///When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.
-			///
 			public int StartIndex { get; set; }
 
-			///
-			///The number of results listed in the query collection, represented by a signed 64-bit (8-byte) integer. This value is system-supplied and read-only.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Content/DocumentInstallation.cs b/Mozu.Api/Contracts/Content/DocumentInstallation.cs
old mode 100644
new mode 100755
index 6cf5f0eb..c0d80440
--- a/Mozu.Api/Contracts/Content/DocumentInstallation.cs
+++ b/Mozu.Api/Contracts/Content/DocumentInstallation.cs
@@ -15,29 +15,14 @@
 
 namespace Mozu.Api.Contracts.Content
 {
-		///
-		///	Properties for the document installation package and data. This information details the installation of document content and files within the site. 
-		///
 		public class DocumentInstallation
 		{
-			///
-			///Fully qualified name of the document type. 
-			///
 			public string DocumentTypeFQN { get; set; }
 
-			///
-			///Localized properties for the document installation package and data. This information details the installation of document content and files within the site and is localized based on the `localeCode`.
-			///
 			public string Locale { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
-			///
-			///Collection of property attributes defined for the object. Properties are associated to all objects within , including documents, products, and product types.
-			///
 			public JObject Properties { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Content/DocumentList.cs b/Mozu.Api/Contracts/Content/DocumentList.cs
old mode 100644
new mode 100755
index 9cc78962..12bcee44
--- a/Mozu.Api/Contracts/Content/DocumentList.cs
+++ b/Mozu.Api/Contracts/Content/DocumentList.cs
@@ -21,79 +21,34 @@ namespace Mozu.Api.Contracts.Content
 		///
 		public class DocumentList
 		{
-			///
-			///The type of the document list, containing content for a site. For example, a list type could be web pages.
-			///
 			public string DocumentListType { get; set; }
 
-			///
-			///List of document types associated with this document list.
-			///
 			public List<string> DocumentTypes { get; set; }
 
-			///
-			///If set, documents in this list will only be returned if the date queried for their is within their ActiveDateRange.
-			///
 			public bool? EnableActiveDateRanges { get; set; }
 
-			///
-			///Indicates if the document list and document list type are enabled to publish. If true, publishing of draft documents in this document list/document list type is enabled for the site. If false, all document changes are immediately published in live mode.
-			///
 			public bool? EnablePublishing { get; set; }
 
-			///
-			///The fully qualified name of the document list.
-			///
 			public string ListFQN { get; set; }
 
-			///
-			///Metadata content for entities, used by document lists, document type lists, document type, views, entity lists, and list views.
-			///
 			public JObject Metadata { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
-			///
-			///The namespace for the accessible APIs and source capabilities in the core of  APIs.
-			///
 			public string Namespace { get; set; }
 
-			///
-			///The unique identifier of the scope. For example, if your scope type is site, then this value would be the site id.
-			///
 			public int? ScopeId { get; set; }
 
-			///
-			///The type of scope associated with the documentList. For example, if the documentList is pageTemplateContent, the scopeType is Site.Valid values are: "Tenant", "MasterCatalog", and "Site".
-			///
 			public string ScopeType { get; set; }
 
-			///
-			///Indicates the security level for the document content as public, administrator, or owner.
-			///
 			public string Security { get; set; }
 
-			///
-			///Determines if the documentList will support ranges of dates that documents are considered 'active'. This field defaults to false and cannot be updated. If the documentList is based on a documentListType, then this value will be derived from the documentListType.
-			///
 			public bool? SupportsActiveDateRanges { get; set; }
 
-			///
-			///Indicates if modified documents are published automatically or saved to publish at a later time. If true, changed documents in this list can be saved as drafts until they are published to the site. If false, all document changes are immediately published in live mode. System-supplied and read only.
-			///
 			public bool? SupportsPublishing { get; set; }
 
-			///
-			///A string array that determines where the document or entity list displays. The options are , for displaying content in the Custom Schema page in  , and , for displaying content in the site tree in Site Builder (applies only to document lists). The following example demonstrates how to display content across both options:
-			///
 			public List<string> Usages { get; set; }
 
-			///
-			///The view in the site used by associated entities or document lists/list types.
-			///
 			public List<View> Views { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Content/DocumentListCollection.cs b/Mozu.Api/Contracts/Content/DocumentListCollection.cs
old mode 100644
new mode 100755
index 3e992774..99009849
--- a/Mozu.Api/Contracts/Content/DocumentListCollection.cs
+++ b/Mozu.Api/Contracts/Content/DocumentListCollection.cs
@@ -19,29 +19,14 @@ namespace Mozu.Api.Contracts.Content
 		///
 		public class DocumentListCollection
 		{
-			///
-			///An array list of objects in the returned collection.
-			///
 			public List<DocumentList> Items { get; set; }
 
-			///
-			///The number of pages returned based on the startIndex and pageSize values specified. This value is system-supplied and read-only.
-			///
 			public int PageCount { get; set; }
 
-			///
-			///The number of results to display on each page when creating paged results from a query. The maximum value is 200.
-			///
 			public int PageSize { get; set; }
 
-			///
-			///When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.
-			///
 			public int StartIndex { get; set; }
 
-			///
-			///The number of results listed in the query collection, represented by a signed 64-bit (8-byte) integer. This value is system-supplied and read-only.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Content/DocumentListType.cs b/Mozu.Api/Contracts/Content/DocumentListType.cs
old mode 100644
new mode 100755
index 5c088fe0..9b46299e
--- a/Mozu.Api/Contracts/Content/DocumentListType.cs
+++ b/Mozu.Api/Contracts/Content/DocumentListType.cs
@@ -16,84 +16,36 @@
 
 namespace Mozu.Api.Contracts.Content
 {
-		///
-		///	Properties for the document list type. Document lists contain documents with an associated document type, such as web pages.
-		///
 		public class DocumentListType
 		{
-			///
-			///Definition of any documents to create with a document list is created. 
-			///
 			public List<DocumentInstallation> DefaultDocuments { get; set; }
 
-			///
-			///The fully qualified name for the document list type for content. 
-			///
 			public string DocumentListTypeFQN { get; set; }
 
-			///
-			///List of fully qualified names for the document type.
-			///
 			public List<string> DocumentTypeFQNs { get; set; }
 
-			///
-			///Determines if documentLists belonging to this documentListType have ActiveDateRanges turned on or off. Each documentList created from the documentListType will use this value, but it can be overridden in an individual documentList.
-			///
 			public bool? EnableActiveDateRanges { get; set; }
 
-			///
-			///Indicates if the document list and document list type are enabled to publish. If true, publishing of draft documents in this document list/document list type is enabled for the site. If false, all document changes are immediately published in live mode.
-			///
 			public bool? EnablePublishing { get; set; }
 
-			///
-			///The package of document lists and content documents to be installed.
-			///
 			public string InstallationPackage { get; set; }
 
-			///
-			///Metadata content for entities, used by document lists, document type lists, document type, views, entity lists, and list views.
-			///
 			public JObject Metadata { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
-			///
-			///The namespace for the accessible APIs and source capabilities in the core of  APIs.
-			///
 			public string Namespace { get; set; }
 
-			///
-			///The type of scope associated with the documentList. For example, if the documentList is pageTemplateContent, the scopeType is Site.Valid values are: "Tenant", "MasterCatalog", and "Site".
-			///
 			public string ScopeType { get; set; }
 
-			///
-			///Determines if documentLists belonging to this documentListType will support drafting and ActiveDateRanges documents. This field defaults to false and cannot be updated. Each documentList created from the documentListType will use this value.
-			///
 			public bool SupportsActiveDateRanges { get; set; }
 
-			///
-			///Indicates if modified documents are published automatically or saved to publish at a later time. If true, changed documents in this list can be saved as drafts until they are published to the site. If false, all document changes are immediately published in live mode. System-supplied and read only.
-			///
 			public bool SupportsPublishing { get; set; }
 
-			///
-			///A string array that determines where the document or entity list displays. The options are , for displaying content in the Custom Schema page in  , and , for displaying content in the site tree in Site Builder (applies only to document lists). The following example demonstrates how to display content across both options:
-			///
 			public List<string> Usages { get; set; }
 
-			///
-			///The current version number of the order, wish list, document list, or document type list.
-			///
 			public string Version { get; set; }
 
-			///
-			///The view in the site used by associated entities or document lists/list types.
-			///
 			public List<View> Views { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Content/DocumentListTypeCollection.cs b/Mozu.Api/Contracts/Content/DocumentListTypeCollection.cs
old mode 100644
new mode 100755
index 8c6b509e..063a2735
--- a/Mozu.Api/Contracts/Content/DocumentListTypeCollection.cs
+++ b/Mozu.Api/Contracts/Content/DocumentListTypeCollection.cs
@@ -14,34 +14,16 @@
 
 namespace Mozu.Api.Contracts.Content
 {
-		///
-		///	Mozu.Content.Contracts.DocumentListTypeCollection ApiType DOCUMENT_HERE 
-		///
 		public class DocumentListTypeCollection
 		{
-			///
-			///A list of requested items. All returned data is provided in an items array.For a failed request, the returned response may be success with an empty item array.
-			///
 			public List<DocumentListType> Items { get; set; }
 
-			///
-			///The total number of pages of the results divided per the `pageSize`.
-			///
 			public int PageCount { get; set; }
 
-			///
-			///The number of results to display on each page when creating paged results from a query. The amount is divided and displayed on the `pageCount `amount of pages. The default is 20 and maximum value is 200 per page.
-			///
 			public int PageSize { get; set; }
 
-			///
-			///When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a `pageSize `of 25, to get the 51st through the 75th items, use `startIndex=50`.
-			///
 			public int StartIndex { get; set; }
 
-			///
-			///The total number of items in the list.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Content/DocumentType.cs b/Mozu.Api/Contracts/Content/DocumentType.cs
old mode 100644
new mode 100755
index ea595b1d..43388bd3
--- a/Mozu.Api/Contracts/Content/DocumentType.cs
+++ b/Mozu.Api/Contracts/Content/DocumentType.cs
@@ -21,44 +21,20 @@ namespace Mozu.Api.Contracts.Content
 		///
 		public class DocumentType
 		{
-			///
-			///The administrator name associated with the object/data.
-			///
 			public string AdminName { get; set; }
 
-			///
-			///Fully qualified name of the document type. 
-			///
 			public string DocumentTypeFQN { get; set; }
 
-			///
-			///The package of document lists and content documents to be installed.
-			///
 			public string InstallationPackage { get; set; }
 
-			///
-			///Metadata content for entities, used by document lists, document type lists, document type, views, entity lists, and list views.
-			///
 			public JObject Metadata { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
-			///
-			///The namespace for the accessible APIs and source capabilities in the core of  APIs.
-			///
 			public string Namespace { get; set; }
 
-			///
-			///Collection of property attributes defined for the object. Properties are associated to all objects within , including documents, products, and product types.
-			///
 			public List<Property> Properties { get; set; }
 
-			///
-			///The current version number of the order, wish list, document list, or document type list.
-			///
 			public string Version { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Content/DocumentTypeCollection.cs b/Mozu.Api/Contracts/Content/DocumentTypeCollection.cs
old mode 100644
new mode 100755
index 0eef8ae3..3dfcf252
--- a/Mozu.Api/Contracts/Content/DocumentTypeCollection.cs
+++ b/Mozu.Api/Contracts/Content/DocumentTypeCollection.cs
@@ -19,29 +19,14 @@ namespace Mozu.Api.Contracts.Content
 		///
 		public class DocumentTypeCollection
 		{
-			///
-			///An array list of objects in the returned collection.
-			///
 			public List<DocumentType> Items { get; set; }
 
-			///
-			///The number of pages returned based on the startIndex and pageSize values specified. This value is system-supplied and read-only.
-			///
 			public int PageCount { get; set; }
 
-			///
-			///The number of results to display on each page when creating paged results from a query. The maximum value is 200.
-			///
 			public int PageSize { get; set; }
 
-			///
-			///When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.
-			///
 			public int StartIndex { get; set; }
 
-			///
-			///The number of results listed in the query collection, represented by a signed 64-bit (8-byte) integer. This value is system-supplied and read-only.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Content/Facet.cs b/Mozu.Api/Contracts/Content/Facet.cs
old mode 100644
new mode 100755
index 8d1b371f..d17d80cf
--- a/Mozu.Api/Contracts/Content/Facet.cs
+++ b/Mozu.Api/Contracts/Content/Facet.cs
@@ -18,14 +18,8 @@ namespace Mozu.Api.Contracts.Content
 		///
 		public class Facet
 		{
-			///
-			///The total number of associated items.
-			///
 			public int Count { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Content/Property.cs b/Mozu.Api/Contracts/Content/Property.cs
old mode 100644
new mode 100755
index cbfb8d6a..81284436
--- a/Mozu.Api/Contracts/Content/Property.cs
+++ b/Mozu.Api/Contracts/Content/Property.cs
@@ -13,29 +13,14 @@
 
 namespace Mozu.Api.Contracts.Content
 {
-		///
-		///	Provides details and data for properties for content in the site.
-		///
 		public class Property
 		{
-			///
-			///If true, the attribute can have more than one value.
-			///
 			public bool IsMultiValued { get; set; }
 
-			///
-			///Indicates if the property, attribute, product option, or product extra is required. If true, the object must have a defined value.
-			///
 			public bool IsRequired { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
-			///
-			///Property type available for content. Property types are like templates that can be reused.
-			///
 			public PropertyType PropertyType { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Content/PropertyType.cs b/Mozu.Api/Contracts/Content/PropertyType.cs
old mode 100644
new mode 100755
index 234fce82..cca39e34
--- a/Mozu.Api/Contracts/Content/PropertyType.cs
+++ b/Mozu.Api/Contracts/Content/PropertyType.cs
@@ -18,54 +18,24 @@ namespace Mozu.Api.Contracts.Content
 		///
 		public class PropertyType
 		{
-			///
-			///The administrator name associated with the object/data.
-			///
 			public string AdminName { get; set; }
 
-			///
-			///The data type of the source product property, typically of type Bool, DateTime, Number, or String.
-			///
 			public string DataType { get; set; }
 
-			///
-			///The package of document lists and content documents to be installed.
-			///
 			public string InstallationPackage { get; set; }
 
-			///
-			///If true, this entity can be grouped.
-			///
 			public bool? IsAggregatable { get; set; }
 
-			///
-			///Indicates if the entity can be located and returned in a search, used for fields and property types. If true, the entity can be searched. 
-			///
 			public bool? IsQueryable { get; set; }
 
-			///
-			///Indicates if the fields or property types are sortable on the page. If true, the property type results are sortable. If false, the property type results cannot be sorted by any options.
-			///
 			public bool? IsSortable { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
-			///
-			///The namespace for the accessible APIs and source capabilities in the core of  APIs.
-			///
 			public string Namespace { get; set; }
 
-			///
-			///The fully qualified name for the property type for content.
-			///
 			public string PropertyTypeFQN { get; set; }
 
-			///
-			///The current version number of the order, wish list, document list, or document type list.
-			///
 			public string Version { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Content/PropertyTypeCollection.cs b/Mozu.Api/Contracts/Content/PropertyTypeCollection.cs
old mode 100644
new mode 100755
index a667d05f..8dc9267a
--- a/Mozu.Api/Contracts/Content/PropertyTypeCollection.cs
+++ b/Mozu.Api/Contracts/Content/PropertyTypeCollection.cs
@@ -19,29 +19,14 @@ namespace Mozu.Api.Contracts.Content
 		///
 		public class PropertyTypeCollection
 		{
-			///
-			///An array list of objects in the returned collection.
-			///
 			public List<PropertyType> Items { get; set; }
 
-			///
-			///The number of pages returned based on the startIndex and pageSize values specified. This value is system-supplied and read-only.
-			///
 			public int PageCount { get; set; }
 
-			///
-			///The number of results to display on each page when creating paged results from a query. The maximum value is 200.
-			///
 			public int PageSize { get; set; }
 
-			///
-			///When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.
-			///
 			public int StartIndex { get; set; }
 
-			///
-			///The number of results listed in the query collection, represented by a signed 64-bit (8-byte) integer. This value is system-supplied and read-only.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Content/PublishSetSummary.cs b/Mozu.Api/Contracts/Content/PublishSetSummary.cs
old mode 100644
new mode 100755
index 30643b51..c3097154
--- a/Mozu.Api/Contracts/Content/PublishSetSummary.cs
+++ b/Mozu.Api/Contracts/Content/PublishSetSummary.cs
@@ -13,19 +13,10 @@
 
 namespace Mozu.Api.Contracts.Content
 {
-		///
-		///	Mozu.Content.Contracts.PublishSetSummary ApiType DOCUMENT_HERE 
-		///
 		public class PublishSetSummary
 		{
-			///
-			///The total number of associated items.
-			///
 			public int Count { get; set; }
 
-			///
-			///The unique identifier of the content publish set.
-			///
 			public string PublishSetCode { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Content/PublishSetSummaryPagedCollection.cs b/Mozu.Api/Contracts/Content/PublishSetSummaryPagedCollection.cs
old mode 100644
new mode 100755
index 04bdf8ce..ca5dfa3a
--- a/Mozu.Api/Contracts/Content/PublishSetSummaryPagedCollection.cs
+++ b/Mozu.Api/Contracts/Content/PublishSetSummaryPagedCollection.cs
@@ -14,34 +14,16 @@
 
 namespace Mozu.Api.Contracts.Content
 {
-		///
-		///	Mozu.Content.Contracts.PublishSetSummaryPagedCollection ApiType DOCUMENT_HERE 
-		///
 		public class PublishSetSummaryPagedCollection
 		{
-			///
-			///A list of requested items. All returned data is provided in an items array.For a failed request, the returned response may be success with an empty item array.
-			///
 			public List<PublishSetSummary> Items { get; set; }
 
-			///
-			///The total number of pages of the results divided per the `pageSize`.
-			///
 			public int PageCount { get; set; }
 
-			///
-			///The number of results to display on each page when creating paged results from a query. The amount is divided and displayed on the `pageCount `amount of pages. The default is 20 and maximum value is 200 per page.
-			///
 			public int PageSize { get; set; }
 
-			///
-			///When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a `pageSize `of 25, to get the 51st through the 75th items, use `startIndex=50`.
-			///
 			public int StartIndex { get; set; }
 
-			///
-			///The total number of items in the list.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Content/View.cs b/Mozu.Api/Contracts/Content/View.cs
old mode 100644
new mode 100755
index e497a821..38fd924b
--- a/Mozu.Api/Contracts/Content/View.cs
+++ b/Mozu.Api/Contracts/Content/View.cs
@@ -16,14 +16,8 @@
 
 namespace Mozu.Api.Contracts.Content
 {
-		///
-		///	A view can select which fields are returned from a document query.
-		///
 		public class View
 		{
-			///
-			///The list of fields to display for a view or an associated schema. For example, the address schema would display fields for postal addresses.
-			///
 			public List<ViewField> Fields { get; set; }
 
 			///
@@ -31,34 +25,16 @@ public class View
 			///
 			public string Filter { get; set; }
 
-			///
-			///Specifies how to filter views based on the status of a document.You can specify the following values for this property: or null—all documents return in the view.—only documents within the active date range (or documents without an active date range specified) return in the view.—only documents with an active date range set in the future return in the view.—only scheduled and active documents return in the view.—only documents with an active date range set in the past return in the view.
-			///
 			public string IncludeInactiveMode { get; set; }
 
-			///
-			///If , specifies that the view is the default view for a documentList or documentListType when viewed in . If no view is specified as default, then the first view in the documentList or documentListType is default. Only one view within a documentList or documentListType can have this value set to .
-			///
 			public bool? IsAdminDefault { get; set; }
 
-			///
-			///The isVisibleInStorefront field indicates whether documents in the view can be accessed from the  storefront application. If true, the storefront application and storefront client application (javascript tier) can GET documents from the view.
-			///
 			public bool? IsVisibleInStorefront { get; set; }
 
-			///
-			///Metadata content for entities, used by document lists, document type lists, document type, views, entity lists, and list views.
-			///
 			public JObject Metadata { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
-			///
-			///A string array that determines where the document or entity list displays. The options are , for displaying content in the Custom Schema page in  , and , for displaying content in the site tree in Site Builder (applies only to document lists). The following example demonstrates how to display content across both options:
-			///
 			public List<string> Usages { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Content/ViewField.cs b/Mozu.Api/Contracts/Content/ViewField.cs
old mode 100644
new mode 100755
index 98c492be..7039c387
--- a/Mozu.Api/Contracts/Content/ViewField.cs
+++ b/Mozu.Api/Contracts/Content/ViewField.cs
@@ -13,19 +13,10 @@
 
 namespace Mozu.Api.Contracts.Content
 {
-		///
-		///	Field within a view of the content.
-		///
 		public class ViewField
 		{
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
-			///
-			///Targets represent the object, such as an item to apply discounts to(products or orders) or a view field for content. Targets are the dot notations that link to the source document property. For example, firstitem for the direct level or firstitem.seconditem.thirditem for a deeper property.
-			///
 			public string Target { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Core/Address.cs b/Mozu.Api/Contracts/Core/Address.cs
old mode 100644
new mode 100755
index d8760450..cd38c8b8
--- a/Mozu.Api/Contracts/Core/Address.cs
+++ b/Mozu.Api/Contracts/Core/Address.cs
@@ -18,54 +18,24 @@ namespace Mozu.Api.Contracts.Core
 		///
 		public class Address
 		{
-			///
-			///Physical or mailing address line one. Usually includes the street number and street name or it could be a P.O. Box. Max length: 200.
-			///
 			public string Address1 { get; set; }
 
-			///
-			///Physical or mailing address line two. Usually supplements the main street address with apartment, floor, suite, building, or unit information. Max length: 200.
-			///
 			public string Address2 { get; set; }
 
-			///
-			///Physical or mailing address line three. Max length: 200.
-			///
 			public string Address3 { get; set; }
 
-			///
-			///Physical or mailing address line four. Max length: 200.
-			///
 			public string Address4 { get; set; }
 
-			///
-			///The type of address, which is commercial or residential.
-			///
 			public string AddressType { get; set; }
 
-			///
-			///City or town for the physical or mailing address. The maximum character length is 100.
-			///
 			public string CityOrTown { get; set; }
 
-			///
-			///The 2-letter geographic code representing the country for the physical or mailing address. Currently limited to the US.
-			///
 			public string CountryCode { get; set; }
 
-			///
-			///Indicates if the address has been validated. If true, the address has been verified by an address validation service.
-			///
 			public bool? IsValidated { get; set; }
 
-			///
-			///The postal or zip code for the address. For example, a USPS-approved ZIP code standard is ZIP+4: 12345-6789. The maximum character length is 100.
-			///
 			public string PostalOrZipCode { get; set; }
 
-			///
-			///The two-letter geographic code representing the state for the physical or mailing address. This is currently limited to the US.
-			///
 			public string StateOrProvince { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Core/AuditInfo.cs b/Mozu.Api/Contracts/Core/AuditInfo.cs
old mode 100644
new mode 100755
index 9fca921b..f2dceaf9
--- a/Mozu.Api/Contracts/Core/AuditInfo.cs
+++ b/Mozu.Api/Contracts/Core/AuditInfo.cs
@@ -13,29 +13,14 @@
 
 namespace Mozu.Api.Contracts.Core
 {
-		///
-		///	Identifier and datetime stamp information recorded when a user or application creates, updates, or deletes a resource entity. This value is system-supplied and read-only.
-		///
 		public class AuditInfo
 		{
-			///
-			///Unique identifier of the user created the resource entity. This value is system-supplied and read-only.
-			///
 			public string CreateBy { get; set; }
 
-			///
-			///Date and time when the entity was created, represented in UTC Date/Time.
-			///
 			public DateTime? CreateDate { get; set; }
 
-			///
-			///Unique identifier of the user who last modified the item. This value is system-supplied and read-only.
-			///
 			public string UpdateBy { get; set; }
 
-			///
-			///Date and time when the entity was last updated, represented in UTC Date/Time.
-			///
 			public DateTime? UpdateDate { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Core/Behavior.cs b/Mozu.Api/Contracts/Core/Behavior.cs
old mode 100644
new mode 100755
index ddee7ad7..afd9df20
--- a/Mozu.Api/Contracts/Core/Behavior.cs
+++ b/Mozu.Api/Contracts/Core/Behavior.cs
@@ -15,33 +15,18 @@
 namespace Mozu.Api.Contracts.Core
 {
 		///
-		///	Properties of an application's behavior.
+		///	Properties of an application behavior.
 		///
 		public class Behavior
 		{
-			///
-			///Unique identifier of a category. 
-			///
 			public int CategoryId { get; set; }
 
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public int Id { get; set; }
 
-			///
-			///If true, this application behavior is not part of the public  API.
-			///
 			public bool IsPrivate { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
-			///
-			///For validation purposes, the integer value must be a list of behavior IDs.
-			///
 			public List<int> RequiresBehaviorIds { get; set; }
 
 			///
@@ -49,9 +34,6 @@ public class Behavior
 			///
 			public List<string> SystemRoles { get; set; }
 
-			///
-			///The user types that are valid for this behavior.
-			///
 			public List<string> ValidUserTypes { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Core/BehaviorCategory.cs b/Mozu.Api/Contracts/Core/BehaviorCategory.cs
old mode 100644
new mode 100755
index 85be5f78..7b915afb
--- a/Mozu.Api/Contracts/Core/BehaviorCategory.cs
+++ b/Mozu.Api/Contracts/Core/BehaviorCategory.cs
@@ -18,14 +18,8 @@ namespace Mozu.Api.Contracts.Core
 		///
 		public class BehaviorCategory
 		{
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public int Id { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Core/BehaviorCategoryCollection.cs b/Mozu.Api/Contracts/Core/BehaviorCategoryCollection.cs
old mode 100644
new mode 100755
index b29c8aca..78130063
--- a/Mozu.Api/Contracts/Core/BehaviorCategoryCollection.cs
+++ b/Mozu.Api/Contracts/Core/BehaviorCategoryCollection.cs
@@ -19,14 +19,8 @@ namespace Mozu.Api.Contracts.Core
 		///
 		public class BehaviorCategoryCollection
 		{
-			///
-			///An array list of objects in the returned collection.
-			///
 			public List<BehaviorCategory> Items { get; set; }
 
-			///
-			///The number of results listed in the query collection, represented by a signed 64-bit (8-byte) integer. This value is system-supplied and read-only.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Core/BehaviorCollection.cs b/Mozu.Api/Contracts/Core/BehaviorCollection.cs
old mode 100644
new mode 100755
index c17a115c..83a0aecb
--- a/Mozu.Api/Contracts/Core/BehaviorCollection.cs
+++ b/Mozu.Api/Contracts/Core/BehaviorCollection.cs
@@ -19,14 +19,8 @@ namespace Mozu.Api.Contracts.Core
 		///
 		public class BehaviorCollection
 		{
-			///
-			///An array list of objects in the returned collection.
-			///
 			public List<Behavior> Items { get; set; }
 
-			///
-			///The number of results listed in the query collection, represented by a signed 64-bit (8-byte) integer. This value is system-supplied and read-only.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Core/Contact.cs b/Mozu.Api/Contracts/Core/Contact.cs
old mode 100644
new mode 100755
index 21fad548..622eaacd
--- a/Mozu.Api/Contracts/Core/Contact.cs
+++ b/Mozu.Api/Contracts/Core/Contact.cs
@@ -18,44 +18,20 @@ namespace Mozu.Api.Contracts.Core
 		///
 		public class Contact
 		{
-			///
-			///Address information to supply for a contact.
-			///
 			public Address Address { get; set; }
 
-			///
-			///The legal or doing business as (DBA) or tradestyle name of the business or organization. The maximum character length is 200.
-			///
 			public string CompanyOrOrganization { get; set; }
 
-			///
-			///The email address of the specified user or the email address associated with the specified entity.
-			///
 			public string Email { get; set; }
 
-			///
-			///The first name of the contact. The maximum character length is 200.
-			///
 			public string FirstName { get; set; }
 
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public int Id { get; set; }
 
-			///
-			///The last name or surname of the contact. The maximum character length is 200.
-			///
 			public string LastNameOrSurname { get; set; }
 
-			///
-			///The middle name or the first initial of the middle name of the contact. The maximum character length is 100.
-			///
 			public string MiddleNameOrInitial { get; set; }
 
-			///
-			///List of phone numbers associated with the customer account contact. The phone numbers include area codes.
-			///
 			public Phone PhoneNumbers { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Core/Extensible/Attribute.cs b/Mozu.Api/Contracts/Core/Extensible/Attribute.cs
old mode 100644
new mode 100755
index fcfb0387..a9ba3d31
--- a/Mozu.Api/Contracts/Core/Extensible/Attribute.cs
+++ b/Mozu.Api/Contracts/Core/Extensible/Attribute.cs
@@ -20,59 +20,29 @@ namespace Mozu.Api.Contracts.Core.Extensible
 		///
 		public class Attribute
 		{
-			///
-			///The administrator name associated with the object/data.
-			///
 			public string AdminName { get; set; }
 
-			///
-			///Merchant-defined code for an extensible attribute. This code may be used to generate an object's fully qualified name, such as for products.
-			///
 			public string AttributeCode { get; set; }
 
-			///
-			///The fully qualified name of the attribute. The attributeDefiniteId may be used to generate this name.
-			///
 			public string AttributeFQN { get; set; }
 
-			///
-			///List of metadata key-value pairs defined for an extensible attribute.
-			///
 			public List<AttributeMetadataItem> AttributeMetadata { get; set; }
 
-			///
-			///Basic audit info about the object, including date, time, and user account. This data may be captured when creating, updating, and removing data.
-			///
 			public AuditInfo AuditInfo { get; set; }
 
-			///
-			///Localizable content (such as a name and/or description) for an attribute. The content may be localized when displayed according to the locale code specified by the master catalog. Content can include descriptive text for product extensible attributes, catalog-level descriptions (displayed if isContentOverriden is true), product bundles, and customer account notes.
-			///
 			public AttributeLocalizedContent Content { get; set; }
 
-			///
-			///The data type of the source product property, typically of type Bool, DateTime, Number, or String.
-			///
 			public string DataType { get; set; }
 
 			///
-			///Whether the customer or order attribute appears in  only, or in both  and the website storefront. Possible values are Admin and AdminAndStorefront.
+			///Whether the customer or order attribute appears in Mozu Admin only, or in both Mozu Admin and the website storefront. Possible values are Admin and AdminAndStorefront.
 			///
 			public string DisplayGroup { get; set; }
 
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public int? Id { get; set; }
 
-			///
-			///The type of input selection used to define a value for the attribute, including Yes/No, Date, DateTime, List, TextBox, or TextArea.
-			///
 			public string InputType { get; set; }
 
-			///
-			///Indicates if the object or feature is active.
-			///
 			public bool? IsActive { get; set; }
 
 			///
@@ -80,13 +50,10 @@ public class Attribute
 			///
 			public bool? IsMultiValued { get; set; }
 
-			///
-			///Flag used to indicate if this attribute definition is read-only. Once an attribute definition is set to read-only this action cannot be undone. 
-			///
 			public bool IsReadOnly { get; set; }
 
 			///
-			///Indicates if the property, attribute, product option, or product extra is required. If true, the object must have a defined value.
+			///If true, the attribute must have a defined value.
 			///
 			public bool? IsRequired { get; set; }
 
@@ -95,29 +62,20 @@ public class Attribute
 			///
 			public bool? IsVisible { get; set; }
 
-			///
-			///The namespace for the accessible APIs and source capabilities in the core of  APIs.
-			///
 			public string Namespace { get; set; }
 
 			///
-			///Integer that represents the sequence order of the attribute.
+			///Integer that represents the sequence of the attribute.
 			///
 			public int? Order { get; set; }
 
-			///
-			///Properties used when validating a value entered for an object, including extensible attributes, products attributes, and database entries.
-			///
 			public AttributeValidation Validation { get; set; }
 
 			///
-			///An attribute value type is either predefined vocabulary by the admin during attribute set up or user-defined with an appropriate type (AdminEntered or ShopperEntered depending on the user). These types are used by products and attributes. The difference between predefined values versus manually entered values is such that the first choice is a set of options to choose from. AdminEntered and ShopperEntered are values that are entered rather than system-supplied and are not stored in the database, but captured during a live commerce operations such as during an order.
+			///An attribute value type is either predefined vocabulary by the admin during attribute set up or it can be "AdminEntered" or "ShopperEntered". The difference between predefined values versus manually entered values is such that the first choice is a set of options to choose from. AdminEntered and ShopperEntered are values that are entered rather than system-supplied and are not stored in the database, but captured during a live commerce operations such as during an order.
 			///
 			public string ValueType { get; set; }
 
-			///
-			///List of valid vocabulary values defined for an attribute.
-			///
 			public List<AttributeVocabularyValue> VocabularyValues { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Core/Extensible/AttributeCollection.cs b/Mozu.Api/Contracts/Core/Extensible/AttributeCollection.cs
old mode 100644
new mode 100755
index 43c7b1dd..1ed6283c
--- a/Mozu.Api/Contracts/Core/Extensible/AttributeCollection.cs
+++ b/Mozu.Api/Contracts/Core/Extensible/AttributeCollection.cs
@@ -19,26 +19,14 @@ namespace Mozu.Api.Contracts.Core.Extensible
 		///
 		public class AttributeCollection
 		{
-			///
-			///An array list of objects in the returned collection.
-			///
 			public List<Attribute> Items { get; set; }
 
-			///
-			///The number of pages returned based on the startIndex and pageSize values specified. This value is system-supplied and read-only.
-			///
 			public int PageCount { get; set; }
 
-			///
-			///The number of results to display on each page when creating paged results from a query. The maximum value is 200.
-			///
 			public int PageSize { get; set; }
 
 			public int StartIndex { get; set; }
 
-			///
-			///The number of results listed in the query collection, represented by a signed 64-bit (8-byte) integer. This value is system-supplied and read-only.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Core/Extensible/AttributeLocalizedContent.cs b/Mozu.Api/Contracts/Core/Extensible/AttributeLocalizedContent.cs
old mode 100644
new mode 100755
index 778ac5d6..5ccf9e7f
--- a/Mozu.Api/Contracts/Core/Extensible/AttributeLocalizedContent.cs
+++ b/Mozu.Api/Contracts/Core/Extensible/AttributeLocalizedContent.cs
@@ -18,13 +18,10 @@ namespace Mozu.Api.Contracts.Core.Extensible
 		///
 		public class AttributeLocalizedContent
 		{
-			///
-			///Language used for the entity. Currently, only "en-US" is supported.
-			///
 			public string LocaleCode { get; set; }
 
 			///
-			///The value of a property, used by numerous objects within  including facets, attributes, products, localized content, metadata, capabilities ( and third-party), location inventory adjustment, and more. The value may be a string, integer, or double. Validation may be run against the entered and saved values depending on the object type.
+			///The localized value defined for the attribute.
 			///
 			public string Value { get; set; }
 
diff --git a/Mozu.Api/Contracts/Core/Extensible/AttributeMetadataItem.cs b/Mozu.Api/Contracts/Core/Extensible/AttributeMetadataItem.cs
old mode 100644
new mode 100755
index 9625f9da..f3583547
--- a/Mozu.Api/Contracts/Core/Extensible/AttributeMetadataItem.cs
+++ b/Mozu.Api/Contracts/Core/Extensible/AttributeMetadataItem.cs
@@ -18,14 +18,8 @@ namespace Mozu.Api.Contracts.Core.Extensible
 		///
 		public class AttributeMetadataItem
 		{
-			///
-			///Key used for metadata defined for objects, including extensible attributes, custom attributes associated with a shipping provider, and search synonyms definitions. This content may be user-defined depending on the object and usage.For search synonym definitions, refer to [Synonym Expansion Types](https://www.mozu.com/docs/Developer/api-guides/search-settings.htm#synonym_expansion_types) for more information about the key usage.
-			///
 			public string Key { get; set; }
 
-			///
-			///The value of a property, used by numerous objects within  including facets, attributes, products, localized content, metadata, capabilities ( and third-party), location inventory adjustment, and more. The value may be a string, integer, or double. Validation may be run against the entered and saved values depending on the object type.
-			///
 			public string Value { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Core/Extensible/AttributeValidation.cs b/Mozu.Api/Contracts/Core/Extensible/AttributeValidation.cs
old mode 100644
new mode 100755
index 539e3bdd..c6130076
--- a/Mozu.Api/Contracts/Core/Extensible/AttributeValidation.cs
+++ b/Mozu.Api/Contracts/Core/Extensible/AttributeValidation.cs
@@ -14,43 +14,22 @@
 namespace Mozu.Api.Contracts.Core.Extensible
 {
 		///
-		///	Validates the attribute configured for the customer in the storefront against the attribute configured in .
+		///	Validates the attribute configured for the customer in the storefront against the attribute configured in Mozu admin.
 		///
 		public class AttributeValidation
 		{
-			///
-			///The latest possible date and time the extensible attribute can be validated.
-			///
 			public DateTime? MaxDateTime { get; set; }
 
-			///
-			///The maximum number that can be entered as a value for an extensible attribute.
-			///
 			public decimal? MaxNumericValue { get; set; }
 
-			///
-			///The maximum character length possible for a string value entered for an extensible attribute.
-			///
 			public int? MaxStringLength { get; set; }
 
-			///
-			///The earliest date and time an extensible attribute can be validated.
-			///
 			public DateTime? MinDateTime { get; set; }
 
-			///
-			///The minimum numeric value required to validate an extensible attribute.
-			///
 			public decimal? MinNumericValue { get; set; }
 
-			///
-			///The minimum character length possible for a string value entered for an extensible attribute.
-			///
 			public int? MinStringLength { get; set; }
 
-			///
-			///Regular expression used to process and validate an extensible attribute value that require special formatting, such as phone numbers.
-			///
 			public string RegularExpression { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Core/Extensible/AttributeValueLocalizedContent.cs b/Mozu.Api/Contracts/Core/Extensible/AttributeValueLocalizedContent.cs
old mode 100644
new mode 100755
index 216acb10..e91a7cde
--- a/Mozu.Api/Contracts/Core/Extensible/AttributeValueLocalizedContent.cs
+++ b/Mozu.Api/Contracts/Core/Extensible/AttributeValueLocalizedContent.cs
@@ -18,14 +18,8 @@ namespace Mozu.Api.Contracts.Core.Extensible
 		///
 		public class AttributeValueLocalizedContent
 		{
-			///
-			///Language used for the entity. Currently, only "en-US" is supported.
-			///
 			public string LocaleCode { get; set; }
 
-			///
-			///The value of a property, used by numerous objects within  including facets, attributes, products, localized content, metadata, capabilities ( and third-party), location inventory adjustment, and more. The value may be a string, integer, or double. Validation may be run against the entered and saved values depending on the object type.
-			///
 			public string Value { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Core/Extensible/AttributeVocabularyValue.cs b/Mozu.Api/Contracts/Core/Extensible/AttributeVocabularyValue.cs
old mode 100644
new mode 100755
index 7bc9e938..323c5a4b
--- a/Mozu.Api/Contracts/Core/Extensible/AttributeVocabularyValue.cs
+++ b/Mozu.Api/Contracts/Core/Extensible/AttributeVocabularyValue.cs
@@ -18,24 +18,15 @@ namespace Mozu.Api.Contracts.Core.Extensible
 		///
 		public class AttributeVocabularyValue
 		{
-			///
-			///Localizable content (such as a name and/or description) for an attribute. The content may be localized when displayed according to the locale code specified by the master catalog. Content can include descriptive text for product extensible attributes, catalog-level descriptions (displayed if isContentOverriden is true), product bundles, and customer account notes.
-			///
 			public AttributeValueLocalizedContent Content { get; set; }
 
 			///
-			///Indicates if the object is hidden or breaks inheritance, primarily used by facets, products, and attribute vocabulary values. For example, if true, the attribute vocabulary value does not appear in the list when defining a value for an attribute.
+			///If true, the attribute vocabulary value does not appear in the list when defining a value for the attribute.
 			///
 			public bool? IsHidden { get; set; }
 
-			///
-			///The numeric order of objects, used by a vocabulary value defined for an extensible attribute, images, and categories.
-			///
 			public int? Sequence { get; set; }
 
-			///
-			///The value of a property, used by numerous objects within  including facets, attributes, products, localized content, metadata, capabilities ( and third-party), location inventory adjustment, and more. The value may be a string, integer, or double. Validation may be run against the entered and saved values depending on the object type.
-			///
 			public string Value { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Core/Measurement.cs b/Mozu.Api/Contracts/Core/Measurement.cs
old mode 100644
new mode 100755
index 547f7fa7..549e2cc2
--- a/Mozu.Api/Contracts/Core/Measurement.cs
+++ b/Mozu.Api/Contracts/Core/Measurement.cs
@@ -18,14 +18,8 @@ namespace Mozu.Api.Contracts.Core
 		///
 		public class Measurement
 		{
-			///
-			///The unit of measurement, such as length or weight.
-			///
 			public string Unit { get; set; }
 
-			///
-			///The value of a property, used by numerous objects within  including facets, attributes, products, localized content, metadata, capabilities ( and third-party), location inventory adjustment, and more. The value may be a string, integer, or double. Validation may be run against the entered and saved values depending on the object type.
-			///
 			public decimal? Value { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Core/Phone.cs b/Mozu.Api/Contracts/Core/Phone.cs
old mode 100644
new mode 100755
index 8ebda3f4..ae943db9
--- a/Mozu.Api/Contracts/Core/Phone.cs
+++ b/Mozu.Api/Contracts/Core/Phone.cs
@@ -18,19 +18,10 @@ namespace Mozu.Api.Contracts.Core
 		///
 		public class Phone
 		{
-			///
-			///Home phone number.
-			///
 			public string Home { get; set; }
 
-			///
-			///Mobile phone number.
-			///
 			public string Mobile { get; set; }
 
-			///
-			///Work phone number.
-			///
 			public string Work { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Core/ThirdParty/ActiveShippingCountry.cs b/Mozu.Api/Contracts/Core/ThirdParty/ActiveShippingCountry.cs
old mode 100644
new mode 100755
index ca39c770..351a9ba2
--- a/Mozu.Api/Contracts/Core/ThirdParty/ActiveShippingCountry.cs
+++ b/Mozu.Api/Contracts/Core/ThirdParty/ActiveShippingCountry.cs
@@ -19,9 +19,6 @@ namespace Mozu.Api.Contracts.Core.ThirdParty
 		///
 		public class ActiveShippingCountry
 		{
-			///
-			///Array list of the active shipping carriers for the country.
-			///
 			public List<string> ActiveCarriers { get; set; }
 
 			public string CountryCode { get; set; }
diff --git a/Mozu.Api/Contracts/Core/ThirdParty/InitializablePropertyValue.cs b/Mozu.Api/Contracts/Core/ThirdParty/InitializablePropertyValue.cs
old mode 100644
new mode 100755
index fc6b8937..07388e88
--- a/Mozu.Api/Contracts/Core/ThirdParty/InitializablePropertyValue.cs
+++ b/Mozu.Api/Contracts/Core/ThirdParty/InitializablePropertyValue.cs
@@ -18,14 +18,8 @@ namespace Mozu.Api.Contracts.Core.ThirdParty
 		///
 		public class InitializablePropertyValue
 		{
-			///
-			///Indicates if an app is initialized and capable of being enabled in the tenant and site. Apps will need to be installed and configured to become initialized, such as validating credentials and/or API keys with a third-party service. If true, the app is initialized and can be enabled for usage.
-			///
 			public bool Initialized { get; set; }
 
-			///
-			///The value of a property, used by numerous objects within  including facets, attributes, products, localized content, metadata, capabilities ( and third-party), location inventory adjustment, and more. The value may be a string, integer, or double. Validation may be run against the entered and saved values depending on the object type.
-			///
 			public string Value { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Core/ThirdParty/InitializableShippingCountryPropertyValue.cs b/Mozu.Api/Contracts/Core/ThirdParty/InitializableShippingCountryPropertyValue.cs
old mode 100644
new mode 100755
index a7f59a6a..31845257
--- a/Mozu.Api/Contracts/Core/ThirdParty/InitializableShippingCountryPropertyValue.cs
+++ b/Mozu.Api/Contracts/Core/ThirdParty/InitializableShippingCountryPropertyValue.cs
@@ -19,19 +19,10 @@ namespace Mozu.Api.Contracts.Core.ThirdParty
 		///
 		public class InitializableShippingCountryPropertyValue
 		{
-			///
-			///Child value in a hierarchy of shipping country properties.
-			///
 			public List<InitializablePropertyValue> Child { get; set; }
 
-			///
-			///Indicates if an app is initialized and capable of being enabled in the tenant and site. Apps will need to be installed and configured to become initialized, such as validating credentials and/or API keys with a third-party service. If true, the app is initialized and can be enabled for usage.
-			///
 			public bool Initialized { get; set; }
 
-			///
-			///The value of a property, used by numerous objects within  including facets, attributes, products, localized content, metadata, capabilities ( and third-party), location inventory adjustment, and more. The value may be a string, integer, or double. Validation may be run against the entered and saved values depending on the object type.
-			///
 			public string Value { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Core/ThirdParty/OperationUrl.cs b/Mozu.Api/Contracts/Core/ThirdParty/OperationUrl.cs
old mode 100644
new mode 100755
index f89d3c96..89e7f274
--- a/Mozu.Api/Contracts/Core/ThirdParty/OperationUrl.cs
+++ b/Mozu.Api/Contracts/Core/ThirdParty/OperationUrl.cs
@@ -18,14 +18,8 @@ namespace Mozu.Api.Contracts.Core.ThirdParty
 		///
 		public class OperationUrl
 		{
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
-			///
-			///The URL endpoint address.
-			///
 			public string Url { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Core/User.cs b/Mozu.Api/Contracts/Core/User.cs
old mode 100644
new mode 100755
index 349b81cf..f0690d59
--- a/Mozu.Api/Contracts/Core/User.cs
+++ b/Mozu.Api/Contracts/Core/User.cs
@@ -15,53 +15,26 @@
 namespace Mozu.Api.Contracts.Core
 {
 		///
-		///	Properties of the user. Users include customers and  users.
+		///	Properties of the user.
 		///
 		public class User
 		{
-			///
-			///The email address of the specified user or the email address associated with the specified entity.
-			///
 			public string EmailAddress { get; set; }
 
-			///
-			///The first name of the contact. The maximum character length is 200.
-			///
 			public string FirstName { get; set; }
 
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public string Id { get; set; }
 
-			///
-			///Indicates if the object or feature is active.
-			///
 			public bool IsActive { get; set; }
 
-			///
-			///The last name or surname of the contact. The maximum character length is 200.
-			///
 			public string LastName { get; set; }
 
-			///
-			///Language used for the entity. Currently, only "en-US" is supported.
-			///
 			public string LocaleCode { get; set; }
 
-			///
-			///The write-only password for the customer account.
-			///
 			public string Password { get; set; }
 
-			///
-			///Collection of roles assigned to the user.
-			///
 			public List<UserRole> Roles { get; set; }
 
-			///
-			///Collection of system-supplied data about the user.
-			///
 			public UserSystemData SystemData { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Core/UserAuthInfo.cs b/Mozu.Api/Contracts/Core/UserAuthInfo.cs
old mode 100644
new mode 100755
index ccf163a4..6c90efaf
--- a/Mozu.Api/Contracts/Core/UserAuthInfo.cs
+++ b/Mozu.Api/Contracts/Core/UserAuthInfo.cs
@@ -18,14 +18,8 @@ namespace Mozu.Api.Contracts.Core
 		///
 		public class UserAuthInfo
 		{
-			///
-			///The email address of the specified user or the email address associated with the specified entity.
-			///
 			public string EmailAddress { get; set; }
 
-			///
-			///The write-only password for the customer account.
-			///
 			public string Password { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Core/UserProfile.cs b/Mozu.Api/Contracts/Core/UserProfile.cs
old mode 100644
new mode 100755
index 9cd8f023..c94245e5
--- a/Mozu.Api/Contracts/Core/UserProfile.cs
+++ b/Mozu.Api/Contracts/Core/UserProfile.cs
@@ -18,28 +18,16 @@ namespace Mozu.Api.Contracts.Core
 		///
 		public class UserProfile
 		{
-			///
-			///The email address of the specified user or the email address associated with the specified entity.
-			///
 			public string EmailAddress { get; set; }
 
-			///
-			///The first name of the contact. The maximum character length is 200.
-			///
 			public string FirstName { get; set; }
 
-			///
-			///The last name or surname of the contact. The maximum character length is 200.
-			///
 			public string LastName { get; set; }
 
-			///
-			///Unique identifier of the customer account (shopper or system user). System-supplied and read-only. If the shopper user is anonymous, the user ID represents a system-generated user ID string.
-			///
 			public string UserId { get; set; }
 
 			///
-			///The user name associated with the user profile. The customer uses the user name to access the account.
+			///The user name associated with the user profile.
 			///
 			public string UserName { get; set; }
 
diff --git a/Mozu.Api/Contracts/Core/UserRole.cs b/Mozu.Api/Contracts/Core/UserRole.cs
old mode 100644
new mode 100755
index daf2c11b..35cc22d7
--- a/Mozu.Api/Contracts/Core/UserRole.cs
+++ b/Mozu.Api/Contracts/Core/UserRole.cs
@@ -18,29 +18,14 @@ namespace Mozu.Api.Contracts.Core
 		///
 		public class UserRole
 		{
-			///
-			///Properties of the developer account or  tenant associated with the user role.
-			///
 			public UserScope AssignedInScope { get; set; }
 
-			///
-			///Identifier and datetime stamp information recorded when a user or application creates, updates, or deletes a resource entity. This value is system-supplied and read-only.
-			///
 			public AuditInfo AuditInfo { get; set; }
 
-			///
-			///Unique identifier of the user role.
-			///
 			public int RoleId { get; set; }
 
-			///
-			///The name of the user role, such as "developer" or "administrator".
-			///
 			public string RoleName { get; set; }
 
-			///
-			///Unique identifier of the customer account (shopper or system user). System-supplied and read-only. If the shopper user is anonymous, the user ID represents a system-generated user ID string.
-			///
 			public string UserId { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Core/UserScope.cs b/Mozu.Api/Contracts/Core/UserScope.cs
old mode 100644
new mode 100755
index 6a6c8664..3b8ceb38
--- a/Mozu.Api/Contracts/Core/UserScope.cs
+++ b/Mozu.Api/Contracts/Core/UserScope.cs
@@ -14,23 +14,14 @@
 namespace Mozu.Api.Contracts.Core
 {
 		///
-		///	Properties of the scope in which a user operates, which represents a developer account or  production tenant.
+		///	Properties of the scope in which a user operates, which represents a developer account or Mozu production tenant.
 		///
 		public class UserScope
 		{
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public int? Id { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
-			///
-			///The type of scope, which is a developer account or production tenant.
-			///
 			public string Type { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Core/UserSystemData.cs b/Mozu.Api/Contracts/Core/UserSystemData.cs
old mode 100644
new mode 100755
index 3e7d97e9..60c52f3d
--- a/Mozu.Api/Contracts/Core/UserSystemData.cs
+++ b/Mozu.Api/Contracts/Core/UserSystemData.cs
@@ -18,54 +18,24 @@ namespace Mozu.Api.Contracts.Core
 		///
 		public class UserSystemData
 		{
-			///
-			///Date and time when the entity was created, represented in UTC Date/Time.
-			///
 			public DateTime? CreatedOn { get; set; }
 
-			///
-			///The total number of failed authentication attempts associated with a customer account attempting access.
-			///
 			public byte FailedLoginAttemptCount { get; set; }
 
-			///
-			///The date and time the initial login was unsuccessful. System-supplied and read only. Each time user authentication fails, an update occurs on this field. The amount of failures is calculated together for `failedLoginAttemptCount`.
-			///
 			public DateTime? FirstFailedLoginAttemptOn { get; set; }
 
-			///
-			///Indicates if a customer account and associated data is locked. If true, the user account is locked due to multiple failed authentication attempts. The user cannot login until the account is unlocked.
-			///
 			public bool IsLocked { get; set; }
 
-			///
-			///Indicates if the customer account must have the password changed on login. If true, the login action requires a password change for increased security. If false, the login does not require a password change.
-			///
 			public bool IsPasswordChangeRequired { get; set; }
 
-			///
-			///Provides date and time data when the customer's account was last locked. System-supplied and read-only.
-			///
 			public DateTime? LastLockedOn { get; set; }
 
-			///
-			///Provides the date and time the customer last logged into the store. System-supplied and read-only.
-			///
 			public DateTime? LastLoginOn { get; set; }
 
-			///
-			///Date and time the customer's password was last modified. System-supplied and read-only.
-			///
 			public DateTime? LastPasswordChangeOn { get; set; }
 
-			///
-			///The number of login attempts remaining for the customer. The user must login successfully before this value reaches zero otherwise the account locks.
-			///
 			public int RemainingLoginAttempts { get; set; }
 
-			///
-			///Date and time when the entity was last updated, represented in UTC Date/Time.
-			///
 			public DateTime? UpdatedOn { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Customer/AccountPasswordInfo.cs b/Mozu.Api/Contracts/Customer/AccountPasswordInfo.cs
old mode 100644
new mode 100755
index cc096ce9..f6923b13
--- a/Mozu.Api/Contracts/Customer/AccountPasswordInfo.cs
+++ b/Mozu.Api/Contracts/Customer/AccountPasswordInfo.cs
@@ -13,24 +13,12 @@
 
 namespace Mozu.Api.Contracts.Customer
 {
-		///
-		///	The details of the account password.
-		///
 		public class AccountPasswordInfo
 		{
-			///
-			///Unique identifier of the customer account generated by the system. Account IDs are generated at account creation.
-			///
 			public int AccountId { get; set; }
 
-			///
-			///The Old and New Password for the Account
-			///
 			public PasswordInfo PasswordInfo { get; set; }
 
-			///
-			///Indicates to unlock the Account
-			///
 			public bool? UnlockAccount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Customer/AccountPasswordInfoCollection.cs b/Mozu.Api/Contracts/Customer/AccountPasswordInfoCollection.cs
old mode 100644
new mode 100755
index 3004d66a..338ace42
--- a/Mozu.Api/Contracts/Customer/AccountPasswordInfoCollection.cs
+++ b/Mozu.Api/Contracts/Customer/AccountPasswordInfoCollection.cs
@@ -14,19 +14,10 @@
 
 namespace Mozu.Api.Contracts.Customer
 {
-		///
-		///	A collection of account password information.
-		///
 		public class AccountPasswordInfoCollection
 		{
-			///
-			///A list of requested items. All returned data is provided in an items array.For a failed request, the returned response may be success with an empty item array.
-			///
 			public List<AccountPasswordInfo> Items { get; set; }
 
-			///
-			///The total number of items in the list.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Customer/AddressValidationRequest.cs b/Mozu.Api/Contracts/Customer/AddressValidationRequest.cs
old mode 100644
new mode 100755
index 66853888..407e5433
--- a/Mozu.Api/Contracts/Customer/AddressValidationRequest.cs
+++ b/Mozu.Api/Contracts/Customer/AddressValidationRequest.cs
@@ -15,13 +15,10 @@
 namespace Mozu.Api.Contracts.Customer
 {
 		///
-		///	Properties of the address used for validation of the account's full address. This content may include multiple lines of an address, city, state/province, zip/postal code, and country.
+		///	Properties of the address to validate.
 		///
 		public class AddressValidationRequest
 		{
-			///
-			///Address information to supply for a contact.
-			///
 			public Address Address { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Customer/AddressValidationResponse.cs b/Mozu.Api/Contracts/Customer/AddressValidationResponse.cs
old mode 100644
new mode 100755
index 2e58aeac..432ce716
--- a/Mozu.Api/Contracts/Customer/AddressValidationResponse.cs
+++ b/Mozu.Api/Contracts/Customer/AddressValidationResponse.cs
@@ -20,9 +20,6 @@ namespace Mozu.Api.Contracts.Customer
 		///
 		public class AddressValidationResponse
 		{
-			///
-			///Array list of possible valid address matches based on the entry supplied in the request.
-			///
 			public List<Address> AddressCandidates { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Customer/Card.cs b/Mozu.Api/Contracts/Customer/Card.cs
old mode 100644
new mode 100755
index fdd16a09..28297e15
--- a/Mozu.Api/Contracts/Customer/Card.cs
+++ b/Mozu.Api/Contracts/Customer/Card.cs
@@ -18,14 +18,8 @@ namespace Mozu.Api.Contracts.Customer
 		///
 		public class Card
 		{
-			///
-			///The masked credit card number part returned from the payment gateway.
-			///
 			public string CardNumberPart { get; set; }
 
-			///
-			///The type of credit card, such as Visa or Amex.
-			///
 			public string CardType { get; set; }
 
 			///
@@ -33,29 +27,14 @@ public class Card
 			///
 			public int ContactId { get; set; }
 
-			///
-			///The two-digit month a credit card expires for a payment method.
-			///
 			public short ExpireMonth { get; set; }
 
-			///
-			///The four-digit year the credit card expires for a payment method.
-			///
 			public short ExpireYear { get; set; }
 
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public string Id { get; set; }
 
-			///
-			///A boolean that signals whether this credit card is the default payment method for this customer account.
-			///
 			public bool IsDefaultPayMethod { get; set; }
 
-			///
-			///The full name printed on a credit card. The name should match what is printed on the card exactly, used in validation during a payment.
-			///
 			public string NameOnCard { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Customer/CardCollection.cs b/Mozu.Api/Contracts/Customer/CardCollection.cs
old mode 100644
new mode 100755
index 213620cd..1f054132
--- a/Mozu.Api/Contracts/Customer/CardCollection.cs
+++ b/Mozu.Api/Contracts/Customer/CardCollection.cs
@@ -19,14 +19,8 @@ namespace Mozu.Api.Contracts.Customer
 		///
 		public class CardCollection
 		{
-			///
-			///An array list of objects in the returned collection.
-			///
 			public List<Card> Items { get; set; }
 
-			///
-			///The number of results listed in the query collection, represented by a signed 64-bit (8-byte) integer. This value is system-supplied and read-only.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Customer/ChangePasswordResult.cs b/Mozu.Api/Contracts/Customer/ChangePasswordResult.cs
old mode 100644
new mode 100755
index b3b982ed..95a135ac
--- a/Mozu.Api/Contracts/Customer/ChangePasswordResult.cs
+++ b/Mozu.Api/Contracts/Customer/ChangePasswordResult.cs
@@ -13,24 +13,12 @@
 
 namespace Mozu.Api.Contracts.Customer
 {
-		///
-		///	Mozu.Customer.Contracts.ChangePasswordResult ApiType DOCUMENT_HERE 
-		///
 		public class ChangePasswordResult
 		{
-			///
-			///Unique identifier of the customer account generated by the system. Account IDs are generated at account creation.
-			///
 			public int AccountId { get; set; }
 
-			///
-			///A message describing why the operation failed.
-			///
 			public string ErrorMessage { get; set; }
 
-			///
-			///TRUE if the operation completes without error.
-			///
 			public bool Succeeded { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Customer/ChangePasswordResultCollection.cs b/Mozu.Api/Contracts/Customer/ChangePasswordResultCollection.cs
old mode 100644
new mode 100755
index deda98c5..c0583f21
--- a/Mozu.Api/Contracts/Customer/ChangePasswordResultCollection.cs
+++ b/Mozu.Api/Contracts/Customer/ChangePasswordResultCollection.cs
@@ -14,19 +14,10 @@
 
 namespace Mozu.Api.Contracts.Customer
 {
-		///
-		///	Mozu.Customer.Contracts.ChangePasswordResultCollection ApiType DOCUMENT_HERE 
-		///
 		public class ChangePasswordResultCollection
 		{
-			///
-			///A list of requested items. All returned data is provided in an items array.For a failed request, the returned response may be success with an empty item array.
-			///
 			public List<ChangePasswordResult> Items { get; set; }
 
-			///
-			///The total number of items in the list.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Customer/CommerceSummary.cs b/Mozu.Api/Contracts/Customer/CommerceSummary.cs
old mode 100644
new mode 100755
index 4425026f..8671802e
--- a/Mozu.Api/Contracts/Customer/CommerceSummary.cs
+++ b/Mozu.Api/Contracts/Customer/CommerceSummary.cs
@@ -18,19 +18,10 @@ namespace Mozu.Api.Contracts.Customer
 		///
 		public class CommerceSummary
 		{
-			///
-			///The date and time the shopper last submitted an order for any site associated with the tenant.
-			///
 			public DateTime? LastOrderDate { get; set; }
 
-			///
-			///The total number of order the shopper submitted across all sites associated with the tenant.
-			///
 			public int OrderCount { get; set; }
 
-			///
-			///The aggregate total amount of all orders the shopper submitted, across all sites associated with the tenant.
-			///
 			public CurrencyAmount TotalOrderAmount { get; set; }
 
 			///
@@ -38,9 +29,6 @@ public class CommerceSummary
 			///
 			public int VisitsCount { get; set; }
 
-			///
-			///The number of wish lists associated with a customer account. This number represents the total number of a shopper's wish lists across all sites associated with a tenant.
-			///
 			public int WishlistCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Customer/ContactType.cs b/Mozu.Api/Contracts/Customer/ContactType.cs
old mode 100644
new mode 100755
index 87f4d152..505e5f0f
--- a/Mozu.Api/Contracts/Customer/ContactType.cs
+++ b/Mozu.Api/Contracts/Customer/ContactType.cs
@@ -19,12 +19,12 @@ namespace Mozu.Api.Contracts.Customer
 		public class ContactType
 		{
 			///
-			///Indicates if the object is primary, used to indicate primary contacts and entities within a tenant. If true, this marker indicates that the object is the primary in a set.
+			///If true, this is the primary contact of this contact type.
 			///
 			public bool IsPrimary { get; set; }
 
 			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
+			///The name of this contact type.
 			///
 			public string Name { get; set; }
 
diff --git a/Mozu.Api/Contracts/Customer/Credit/Credit.cs b/Mozu.Api/Contracts/Customer/Credit/Credit.cs
old mode 100644
new mode 100755
index 5b397cde..b52727c4
--- a/Mozu.Api/Contracts/Customer/Credit/Credit.cs
+++ b/Mozu.Api/Contracts/Customer/Credit/Credit.cs
@@ -50,12 +50,12 @@ public class Credit
 			public decimal? CurrentBalance { get; set; }
 
 			///
-			///Unique identifier of the customer in , used to associate customers with data, orders, returns, and in-store credit.
+			///Unique identifier of the shopper associated with the applied credit. For gift cards, this property is not required.
 			///
 			public int? CustomerId { get; set; }
 
 			///
-			///Date and time in UTC format when a discount, credit, wish list, or cart expires. An expired discount no longer can be redeemed. An expired wish list is no longer available. An expired credit can no longer be redeemed for a purchase. Acart becomes inactive and expired based on a system-calculated interval. For example, if an anonymous shopper has 14 days of inactivity, the cart is considered abandoned after that period of inactivity. System-supplied and read-only.
+			///The date and time the credit expires and can no longer be redeemed.
 			///
 			public DateTime? ExpirationDate { get; set; }
 
diff --git a/Mozu.Api/Contracts/Customer/Credit/CreditAuditEntry.cs b/Mozu.Api/Contracts/Customer/Credit/CreditAuditEntry.cs
old mode 100644
new mode 100755
diff --git a/Mozu.Api/Contracts/Customer/Credit/CreditAuditEntryCollection.cs b/Mozu.Api/Contracts/Customer/Credit/CreditAuditEntryCollection.cs
old mode 100644
new mode 100755
diff --git a/Mozu.Api/Contracts/Customer/Credit/CreditCollection.cs b/Mozu.Api/Contracts/Customer/Credit/CreditCollection.cs
old mode 100644
new mode 100755
diff --git a/Mozu.Api/Contracts/Customer/Credit/CreditTransaction.cs b/Mozu.Api/Contracts/Customer/Credit/CreditTransaction.cs
old mode 100644
new mode 100755
index dae57880..11280674
--- a/Mozu.Api/Contracts/Customer/Credit/CreditTransaction.cs
+++ b/Mozu.Api/Contracts/Customer/Credit/CreditTransaction.cs
@@ -25,12 +25,12 @@ public class CreditTransaction
 			public AuditInfo AuditInfo { get; set; }
 
 			///
-			///Notes entered and saved with an order. These notes may be entered by a shopper on a wishlist or for an order. Comments may also be entered by  Admins on an order that may be visible only to authorized shoppers and users.
+			///Comments entered for a transaction. Depending on the interface, these comments might be visible to authorized shoppers and users.
 			///
 			public string Comments { get; set; }
 
 			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
+			///Unique identifier of the customer credit transaction.
 			///
 			public int? Id { get; set; }
 
@@ -39,13 +39,10 @@ public class CreditTransaction
 			///
 			public decimal? ImpactAmount { get; set; }
 
-			///
-			///Unique identifier of the order associated with the payment.
-			///
 			public string OrderId { get; set; }
 
 			///
-			///Specifies the type of transaction, including customer transactions and credit transactions.Valid values for credit transactions are the following:* —decreases the credit amount* —updates the credit amountValid values for customer transaction types are the following:* * * * 
+			///The type of transaction to perform for the customer credit. To decrease the balance, set this parameter to "Debit". To increase the balance, set this parameter to "Credit".
 			///
 			public string TransactionType { get; set; }
 
diff --git a/Mozu.Api/Contracts/Customer/Credit/CreditTransactionCollection.cs b/Mozu.Api/Contracts/Customer/Credit/CreditTransactionCollection.cs
old mode 100644
new mode 100755
diff --git a/Mozu.Api/Contracts/Customer/CurrencyAmount.cs b/Mozu.Api/Contracts/Customer/CurrencyAmount.cs
old mode 100644
new mode 100755
index 9da5a57f..c5c7a833
--- a/Mozu.Api/Contracts/Customer/CurrencyAmount.cs
+++ b/Mozu.Api/Contracts/Customer/CurrencyAmount.cs
@@ -18,14 +18,8 @@ namespace Mozu.Api.Contracts.Customer
 		///
 		public class CurrencyAmount
 		{
-			///
-			///The monetary amount in the specified currency locale code.
-			///
 			public decimal Amount { get; set; }
 
-			///
-			///3-letter ISO 4217 standard global currency code. Currently, only "USD" (US Dollar) is supported.
-			///
 			public string CurrencyCode { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Customer/CustomerAccount.cs b/Mozu.Api/Contracts/Customer/CustomerAccount.cs
old mode 100644
new mode 100755
index 679cfd77..97f2ea60
--- a/Mozu.Api/Contracts/Customer/CustomerAccount.cs
+++ b/Mozu.Api/Contracts/Customer/CustomerAccount.cs
@@ -20,74 +20,41 @@ namespace Mozu.Api.Contracts.Customer
 		///
 		public class CustomerAccount
 		{
-			///
-			///Indicates if the customer account is opted to receive marketing materials. If true, the customer account is opted in for receiving the content. 
-			///
 			public bool AcceptsMarketing { get; set; }
 
-			///
-			///Collection of attributes that may be paged list or a list, depending on the usage per object and API type. 
-			///
 			public List<CustomerAttribute> Attributes { get; set; }
 
-			///
-			///Identifier and datetime stamp information recorded when a user or application creates, updates, or deletes a resource entity. This value is system-supplied and read-only.
-			///
 			public AuditInfo AuditInfo { get; set; }
 
-			///
-			///Properties of the commerce summary associated with a customer account, which includes details about the shopper's most recent order, wish lists, and total order value over time.
-			///
 			public CommerceSummary CommerceSummary { get; set; }
 
-			///
-			///The legal or doing business as (DBA) or tradestyle name of the business or organization. The maximum character length is 200.
-			///
 			public string CompanyOrOrganization { get; set; }
 
-			///
-			///Contact information, including the contact's name, address, phone numbers, email addresses, and company (if supplied). Also indicates whether this is a billing, shipping, or billing and shipping contact.
-			///
 			public List<CustomerContact> Contacts { get; set; }
 
-			///
-			///customerSet ApiType DOCUMENT_HERE 
-			///
 			public string CustomerSet { get; set; }
 
-			///
-			///This property tracks the customer account creation date. This date can be set manually via the API for customer accounts that are imported into . 
-			///
 			public DateTime? CustomerSinceDate { get; set; }
 
 			///
-			///The email address for the customer account and contact. This email may be used for login to the storefront and for subscription mailing lists.
+			///The email address associated with the customer account.
 			///
 			public string EmailAddress { get; set; }
 
 			///
-			///Unique identifier used by an external program to identify a  order, customer account, or wish list.
+			///Unique identifier an external system uses to identify this customer account.
 			///
 			public string ExternalId { get; set; }
 
 			///
-			///The full first name of a customer or contact name.
+			///The first name associated with the customer account.
 			///
 			public string FirstName { get; set; }
 
-			///
-			///Indicates if an external password is set on this account.
-			///
 			public bool HasExternalPassword { get; set; }
 
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public int Id { get; set; }
 
-			///
-			///Indicates if the object or feature is active.
-			///
 			public bool IsActive { get; set; }
 
 			///
@@ -95,13 +62,10 @@ public class CustomerAccount
 			///
 			public bool IsAnonymous { get; set; }
 
-			///
-			///Indicates if a customer account and associated data is locked. If true, the user account is locked due to multiple failed authentication attempts. The user cannot login until the account is unlocked.
-			///
 			public bool IsLocked { get; set; }
 
 			///
-			///The full last name of a customer or contact name.
+			///The last name associated with the customer account.
 			///
 			public string LastName { get; set; }
 
@@ -110,9 +74,6 @@ public class CustomerAccount
 			///
 			public string LocaleCode { get; set; }
 
-			///
-			///Paged list collection of note content for objects including customers, orders, and returns. 
-			///
 			public List<CustomerNote> Notes { get; set; }
 
 			///
@@ -120,23 +81,14 @@ public class CustomerAccount
 			///
 			public List<CustomerSegment> Segments { get; set; }
 
-			///
-			///If true, this customer account has tax exempt status.
-			///
 			public bool TaxExempt { get; set; }
 
-			///
-			///The tax identification number associated with the customer account.
-			///
 			public string TaxId { get; set; }
 
-			///
-			///Unique identifier of the customer account (shopper or system user). System-supplied and read-only. If the shopper user is anonymous, the user ID represents a system-generated user ID string.
-			///
 			public string UserId { get; set; }
 
 			///
-			///The user name associated with the user profile. The customer uses the user name to access the account.
+			///The user name of the user associated with the customer account.
 			///
 			public string UserName { get; set; }
 
diff --git a/Mozu.Api/Contracts/Customer/CustomerAccountAndAuthInfo.cs b/Mozu.Api/Contracts/Customer/CustomerAccountAndAuthInfo.cs
old mode 100644
new mode 100755
index 1c9803b6..565a60d8
--- a/Mozu.Api/Contracts/Customer/CustomerAccountAndAuthInfo.cs
+++ b/Mozu.Api/Contracts/Customer/CustomerAccountAndAuthInfo.cs
@@ -14,7 +14,7 @@
 namespace Mozu.Api.Contracts.Customer
 {
 		///
-		///	The authentication information associated with a customer account. The data includes the account properties such as the name, username, authorization access, and email address, the required password to match, and indicates if the account was imported from a third party resource. 
+		///	The authentication information associated with a customer account.
 		///
 		public class CustomerAccountAndAuthInfo
 		{
@@ -23,18 +23,15 @@ public class CustomerAccountAndAuthInfo
 			///
 			public CustomerAccount Account { get; set; }
 
-			///
-			///If you are importing existing customer accounts to  or using two customer systems simultaneously, you use this property to store an external password hash that helps you migrate existing customer accounts seamlessly into , without having to require shoppers to create new passwords for the platform.  If you set this property, you must use the [embedded.verifyExternalPassword](https://www.mozu.com/docs/arcjs/commerce-customer/actions/verifyexternalpassword.htm) action to verify that the hashed version of a cleartext password provided by a shopper matches the external password hash specified in this property.
-			///
 			public string ExternalPassword { get; set; }
 
 			///
-			///Indicates if this object/data was imported from an outside source such as a data import or synchronization via an app or service. If true, this data was originally imported into  and accessible through your store database. Examples of imported objects/data include orders and customer accounts.
+			///If true, this customer account and its associated data was imported from an external source.
 			///
 			public bool IsImport { get; set; }
 
 			///
-			///The write-only password for the customer account.
+			///The password required to authenticate this customer account.
 			///
 			public string Password { get; set; }
 
diff --git a/Mozu.Api/Contracts/Customer/CustomerAccountCollection.cs b/Mozu.Api/Contracts/Customer/CustomerAccountCollection.cs
old mode 100644
new mode 100755
index 61f2cc30..d36fec20
--- a/Mozu.Api/Contracts/Customer/CustomerAccountCollection.cs
+++ b/Mozu.Api/Contracts/Customer/CustomerAccountCollection.cs
@@ -19,26 +19,14 @@ namespace Mozu.Api.Contracts.Customer
 		///
 		public class CustomerAccountCollection
 		{
-			///
-			///An array list of objects in the returned collection.
-			///
 			public List<CustomerAccount> Items { get; set; }
 
-			///
-			///The number of pages returned based on the startIndex and pageSize values specified. This value is system-supplied and read-only.
-			///
 			public int PageCount { get; set; }
 
-			///
-			///The number of results to display on each page when creating paged results from a query. The maximum value is 200.
-			///
 			public int PageSize { get; set; }
 
 			public int StartIndex { get; set; }
 
-			///
-			///The number of results listed in the query collection, represented by a signed 64-bit (8-byte) integer. This value is system-supplied and read-only.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Customer/CustomerAttribute.cs b/Mozu.Api/Contracts/Customer/CustomerAttribute.cs
old mode 100644
new mode 100755
index 9015a5b5..c5731d45
--- a/Mozu.Api/Contracts/Customer/CustomerAttribute.cs
+++ b/Mozu.Api/Contracts/Customer/CustomerAttribute.cs
@@ -20,24 +20,12 @@ namespace Mozu.Api.Contracts.Customer
 		///
 		public class CustomerAttribute
 		{
-			///
-			///Unique identifier of the attribute definition.
-			///
 			public int? AttributeDefinitionId { get; set; }
 
-			///
-			///Identifier and datetime stamp information recorded when a user or application creates, updates, or deletes a resource entity. This value is system-supplied and read-only.
-			///
 			public AuditInfo AuditInfo { get; set; }
 
-			///
-			///The fully qualified name of the attribute, which is a user defined attribute identifier.
-			///
 			public string FullyQualifiedName { get; set; }
 
-			///
-			///List of value data for objects.
-			///
 			public List<object> Values { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Customer/CustomerAttributeCollection.cs b/Mozu.Api/Contracts/Customer/CustomerAttributeCollection.cs
old mode 100644
new mode 100755
index 05542104..40efca37
--- a/Mozu.Api/Contracts/Customer/CustomerAttributeCollection.cs
+++ b/Mozu.Api/Contracts/Customer/CustomerAttributeCollection.cs
@@ -19,29 +19,14 @@ namespace Mozu.Api.Contracts.Customer
 		///
 		public class CustomerAttributeCollection
 		{
-			///
-			///An array list of objects in the returned collection.
-			///
 			public List<CustomerAttribute> Items { get; set; }
 
-			///
-			///The number of pages returned based on the startIndex and pageSize values specified. This value is system-supplied and read-only.
-			///
 			public int PageCount { get; set; }
 
-			///
-			///The number of results to display on each page when creating paged results from a query. The maximum value is 200.
-			///
 			public int PageSize { get; set; }
 
-			///
-			///When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.
-			///
 			public int StartIndex { get; set; }
 
-			///
-			///The number of results listed in the query collection, represented by a signed 64-bit (8-byte) integer. This value is system-supplied and read-only.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Customer/CustomerAuditEntry.cs b/Mozu.Api/Contracts/Customer/CustomerAuditEntry.cs
old mode 100644
new mode 100755
index 61457c4c..77d85f9a
--- a/Mozu.Api/Contracts/Customer/CustomerAuditEntry.cs
+++ b/Mozu.Api/Contracts/Customer/CustomerAuditEntry.cs
@@ -13,59 +13,26 @@
 
 namespace Mozu.Api.Contracts.Customer
 {
-		///
-		///	A list of audit details associated with a specific customer account.
-		///
 		public class CustomerAuditEntry
 		{
-			///
-			///Applicattion associated with this entry
-			///
 			public string Application { get; set; }
 
-			///
-			///Unique identifer of the customer account. This ID is used to associate numerous types of data and object with the customer account, including orders, returns, wish lists, and in-store credit.
-			///
 			public int CustomerAccountId { get; set; }
 
-			///
-			///The unique identifier of the audit entry associated with the customer account.
-			///
 			public int CustomerAuditEntryId { get; set; }
 
-			///
-			///The localized description in text for the object, displayed per the locale code. For example, descriptions are used for product descriptions, attributes, and pre-authorization transaction types.
-			///
 			public string Description { get; set; }
 
-			///
-			///The date the audit entries was created.
-			///
 			public DateTime EntryDate { get; set; }
 
-			///
-			///The unique identifier of the user who created the audit entry.
-			///
 			public string EntryUser { get; set; }
 
-			///
-			///The path of the field value that was changed, for example 
-			///
 			public string FieldPath { get; set; }
 
-			///
-			///The field's new value after the audit entry event.
-			///
 			public string NewValue { get; set; }
 
-			///
-			///The field's original value before the audit entry event.
-			///
 			public string OldValue { get; set; }
 
-			///
-			///The site identifier associated with this audit entry.
-			///
 			public string Site { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Customer/CustomerAuditEntryCollection.cs b/Mozu.Api/Contracts/Customer/CustomerAuditEntryCollection.cs
old mode 100644
new mode 100755
index e0be3c31..1be9d377
--- a/Mozu.Api/Contracts/Customer/CustomerAuditEntryCollection.cs
+++ b/Mozu.Api/Contracts/Customer/CustomerAuditEntryCollection.cs
@@ -14,34 +14,16 @@
 
 namespace Mozu.Api.Contracts.Customer
 {
-		///
-		///	A collection of audit entries assocaited with a specific customer acocunt.
-		///
 		public class CustomerAuditEntryCollection
 		{
-			///
-			///A list of requested items. All returned data is provided in an items array.For a failed request, the returned response may be success with an empty item array.
-			///
 			public List<CustomerAuditEntry> Items { get; set; }
 
-			///
-			///The total number of pages of the results divided per the `pageSize`.
-			///
 			public int PageCount { get; set; }
 
-			///
-			///The number of results to display on each page when creating paged results from a query. The amount is divided and displayed on the `pageCount `amount of pages. The default is 20 and maximum value is 200 per page.
-			///
 			public int PageSize { get; set; }
 
-			///
-			///When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a `pageSize `of 25, to get the 51st through the 75th items, use `startIndex=50`.
-			///
 			public int StartIndex { get; set; }
 
-			///
-			///The total number of items in the list.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Customer/CustomerAuthTicket.cs b/Mozu.Api/Contracts/Customer/CustomerAuthTicket.cs
old mode 100644
new mode 100755
index 93a6343f..f7346657
--- a/Mozu.Api/Contracts/Customer/CustomerAuthTicket.cs
+++ b/Mozu.Api/Contracts/Customer/CustomerAuthTicket.cs
@@ -19,12 +19,12 @@ namespace Mozu.Api.Contracts.Customer
 		public class CustomerAuthTicket
 		{
 			///
-			///Alphanumeric string used to authenticate the user in API request headers. The token stores an encrypted list of the application's configured behaviors and authenticates the application.
+			///Access token string that enables authentication for the customer account.
 			///
 			public string AccessToken { get; set; }
 
 			///
-			///The date and time the user access token expires. If the token will expire, a new token will need to be generated and assigned to the account to continue and restore access to the store, data, and account.
+			///The date and time the access token expires.
 			///
 			public DateTime AccessTokenExpiration { get; set; }
 
@@ -34,17 +34,17 @@ public class CustomerAuthTicket
 			public CustomerAccount CustomerAccount { get; set; }
 
 			///
-			///Alphanumeric string used for access tokens. This token refreshes access for accounts by generating a new developer or application account authentication ticket after an access token expires.
+			///Refresh token string used to generate a new access token after expiration for a customer account authentication ticket.
 			///
 			public string RefreshToken { get; set; }
 
 			///
-			///The date and time the developer account or application refresh token expires.
+			///The date and time the refresh token expires.
 			///
 			public DateTime RefreshTokenExpiration { get; set; }
 
 			///
-			///Unique identifier of the customer account (shopper or system user). System-supplied and read-only. If the shopper user is anonymous, the user ID represents a system-generated user ID string.
+			///User ID associated with the customer account authentication ticket.
 			///
 			public string UserId { get; set; }
 
diff --git a/Mozu.Api/Contracts/Customer/CustomerContact.cs b/Mozu.Api/Contracts/Customer/CustomerContact.cs
old mode 100644
new mode 100755
index 56fbb06b..3cb04b68
--- a/Mozu.Api/Contracts/Customer/CustomerContact.cs
+++ b/Mozu.Api/Contracts/Customer/CustomerContact.cs
@@ -20,29 +20,14 @@ namespace Mozu.Api.Contracts.Customer
 		///
 		public class CustomerContact
 		{
-			///
-			///Unique identifier of the customer account generated by the system. Account IDs are generated at account creation.
-			///
 			public int AccountId { get; set; }
 
-			///
-			///Address information to supply for a contact.
-			///
 			public Address Address { get; set; }
 
-			///
-			///Identifier and datetime stamp information recorded when a user or application creates, updates, or deletes a resource entity. This value is system-supplied and read-only.
-			///
 			public AuditInfo AuditInfo { get; set; }
 
-			///
-			///The legal or doing business as (DBA) or tradestyle name of the business or organization. The maximum character length is 200.
-			///
 			public string CompanyOrOrganization { get; set; }
 
-			///
-			///The email address of the specified user or the email address associated with the specified entity.
-			///
 			public string Email { get; set; }
 
 			///
@@ -50,34 +35,16 @@ public class CustomerContact
 			///
 			public string FaxNumber { get; set; }
 
-			///
-			///The first name of the contact. The maximum character length is 200.
-			///
 			public string FirstName { get; set; }
 
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public int Id { get; set; }
 
-			///
-			///Descriptive text used as a label for objects, such as field names, facets, date ranges, contact information, and package information.
-			///
 			public string Label { get; set; }
 
-			///
-			///The last name or surname of the contact. The maximum character length is 200.
-			///
 			public string LastNameOrSurname { get; set; }
 
-			///
-			///The middle name or the first initial of the middle name of the contact. The maximum character length is 100.
-			///
 			public string MiddleNameOrInitial { get; set; }
 
-			///
-			///List of phone numbers associated with the customer account contact. The phone numbers include area codes.
-			///
 			public Phone PhoneNumbers { get; set; }
 
 			///
diff --git a/Mozu.Api/Contracts/Customer/CustomerContactCollection.cs b/Mozu.Api/Contracts/Customer/CustomerContactCollection.cs
old mode 100644
new mode 100755
index 030989bc..e23b9d0b
--- a/Mozu.Api/Contracts/Customer/CustomerContactCollection.cs
+++ b/Mozu.Api/Contracts/Customer/CustomerContactCollection.cs
@@ -19,29 +19,14 @@ namespace Mozu.Api.Contracts.Customer
 		///
 		public class CustomerContactCollection
 		{
-			///
-			///An array list of objects in the returned collection.
-			///
 			public List<CustomerContact> Items { get; set; }
 
-			///
-			///The number of pages returned based on the startIndex and pageSize values specified. This value is system-supplied and read-only.
-			///
 			public int PageCount { get; set; }
 
-			///
-			///The number of results to display on each page when creating paged results from a query. The maximum value is 200.
-			///
 			public int PageSize { get; set; }
 
-			///
-			///When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.
-			///
 			public int StartIndex { get; set; }
 
-			///
-			///The number of results listed in the query collection, represented by a signed 64-bit (8-byte) integer. This value is system-supplied and read-only.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Customer/CustomerLoginInfo.cs b/Mozu.Api/Contracts/Customer/CustomerLoginInfo.cs
old mode 100644
new mode 100755
index f52a0491..97360ee3
--- a/Mozu.Api/Contracts/Customer/CustomerLoginInfo.cs
+++ b/Mozu.Api/Contracts/Customer/CustomerLoginInfo.cs
@@ -19,27 +19,24 @@ namespace Mozu.Api.Contracts.Customer
 		public class CustomerLoginInfo
 		{
 			///
-			///The email address for the customer account and contact. This email may be used for login to the storefront and for subscription mailing lists.
+			///The email address associated with the customer login.
 			///
 			public string EmailAddress { get; set; }
 
-			///
-			///If you are importing existing customer accounts to  or using two customer systems simultaneously, you use this property to store an external password hash that helps you migrate existing customer accounts seamlessly into , without having to require shoppers to create new passwords for the platform.  If you set this property, you must use the [embedded.verifyExternalPassword](https://www.mozu.com/docs/arcjs/commerce-customer/actions/verifyexternalpassword.htm) action to verify that the hashed version of a cleartext password provided by a shopper matches the external password hash specified in this property.
-			///
 			public string ExternalPassword { get; set; }
 
 			///
-			///Indicates if this object/data was imported from an outside source such as a data import or synchronization via an app or service. If true, this data was originally imported into  and accessible through your store database. Examples of imported objects/data include orders and customer accounts.
+			///If true, this customer account data was imported from an external program.
 			///
 			public bool? IsImport { get; set; }
 
 			///
-			///The write-only password for the customer account.
+			///The password associated with the customer login.
 			///
 			public string Password { get; set; }
 
 			///
-			///The user name associated with the user profile. The customer uses the user name to access the account.
+			///The user name associated with the customer login.
 			///
 			public string Username { get; set; }
 
diff --git a/Mozu.Api/Contracts/Customer/CustomerNote.cs b/Mozu.Api/Contracts/Customer/CustomerNote.cs
old mode 100644
new mode 100755
index 19d6d79e..3ff259c7
--- a/Mozu.Api/Contracts/Customer/CustomerNote.cs
+++ b/Mozu.Api/Contracts/Customer/CustomerNote.cs
@@ -19,19 +19,10 @@ namespace Mozu.Api.Contracts.Customer
 		///
 		public class CustomerNote
 		{
-			///
-			///Identifier and datetime stamp information recorded when a user or application creates, updates, or deletes a resource entity. This value is system-supplied and read-only.
-			///
 			public AuditInfo AuditInfo { get; set; }
 
-			///
-			///Localizable content (such as a name and/or description) for an attribute. The content may be localized when displayed according to the locale code specified by the master catalog. Content can include descriptive text for product extensible attributes, catalog-level descriptions (displayed if isContentOverriden is true), product bundles, and customer account notes.
-			///
 			public string Content { get; set; }
 
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public int Id { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Customer/CustomerNoteCollection.cs b/Mozu.Api/Contracts/Customer/CustomerNoteCollection.cs
old mode 100644
new mode 100755
index d85fe54b..91df0d46
--- a/Mozu.Api/Contracts/Customer/CustomerNoteCollection.cs
+++ b/Mozu.Api/Contracts/Customer/CustomerNoteCollection.cs
@@ -19,29 +19,14 @@ namespace Mozu.Api.Contracts.Customer
 		///
 		public class CustomerNoteCollection
 		{
-			///
-			///An array list of objects in the returned collection.
-			///
 			public List<CustomerNote> Items { get; set; }
 
-			///
-			///The number of pages returned based on the startIndex and pageSize values specified. This value is system-supplied and read-only.
-			///
 			public int PageCount { get; set; }
 
-			///
-			///The number of results to display on each page when creating paged results from a query. The maximum value is 200.
-			///
 			public int PageSize { get; set; }
 
-			///
-			///When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.
-			///
 			public int StartIndex { get; set; }
 
-			///
-			///The number of results listed in the query collection, represented by a signed 64-bit (8-byte) integer. This value is system-supplied and read-only.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Customer/CustomerPurchaseOrderAccount.cs b/Mozu.Api/Contracts/Customer/CustomerPurchaseOrderAccount.cs
old mode 100644
new mode 100755
index ee727647..26c452a5
--- a/Mozu.Api/Contracts/Customer/CustomerPurchaseOrderAccount.cs
+++ b/Mozu.Api/Contracts/Customer/CustomerPurchaseOrderAccount.cs
@@ -15,59 +15,26 @@
 
 namespace Mozu.Api.Contracts.Customer
 {
-		///
-		///	The details of a customer's purchase order account.
-		///
 		public class CustomerPurchaseOrderAccount
 		{
-			///
-			///Unique identifier of the customer account generated by the system. Account IDs are generated at account creation.
-			///
 			public int AccountId { get; set; }
 
-			///
-			///Basic audit info about the object, including date, time, and user account. This data may be captured when creating, updating, and removing data.
-			///
 			public AuditInfo AuditInfo { get; set; }
 
-			///
-			///The available balance the customer has on their purchase order account. This balance is the result of the  minus the customer's total amount due.
-			///
 			public decimal AvailableBalance { get; set; }
 
-			///
-			///The total credit limit the customer can spend using purchase orders.
-			///
 			public decimal CreditLimit { get; set; }
 
-			///
-			///The specific payment terms for the customer's purchase order account. Each payment term is associated with a specific site, and you can specify more than one payment term for each site.
-			///
 			public List<CustomerPurchaseOrderPaymentTerm> CustomerPurchaseOrderPaymentTerms { get; set; }
 
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public int Id { get; set; }
 
-			///
-			///Indicates if the object or process is enabled. This indicator is used on external payment workflows and product option values. For product options, if true, the product option value is available for a shopper to choose. During configuration, this property will be false if the option value is invalid with other selected options. For external payment workflows, if true, the workflow is enabled and available for routing payments for the submitted order.
-			///
 			public bool IsEnabled { get; set; }
 
-			///
-			///The total monetary amount the customer can spend over their purchase order . The  controls the units of this amount.
-			///
 			public decimal? OverdraftAllowance { get; set; }
 
-			///
-			///Specifies the type and units of the  amount.The valid values are:*  — specifies that the  amount is a decimal amount.*  — specifies that the  amount is a percentage amount.
-			///
 			public string OverdraftAllowanceType { get; set; }
 
-			///
-			///The total available balance the customer has on their purchase order account. This balance is the result of the  minus the .
-			///
 			public decimal TotalAvailableBalance { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Customer/CustomerPurchaseOrderAccountCollection.cs b/Mozu.Api/Contracts/Customer/CustomerPurchaseOrderAccountCollection.cs
old mode 100644
new mode 100755
index 074dade8..874b6eb9
--- a/Mozu.Api/Contracts/Customer/CustomerPurchaseOrderAccountCollection.cs
+++ b/Mozu.Api/Contracts/Customer/CustomerPurchaseOrderAccountCollection.cs
@@ -14,34 +14,16 @@
 
 namespace Mozu.Api.Contracts.Customer
 {
-		///
-		///	A list of customer purchase order accounts and their details.
-		///
 		public class CustomerPurchaseOrderAccountCollection
 		{
-			///
-			///A list of requested items. All returned data is provided in an items array.For a failed request, the returned response may be success with an empty item array.
-			///
 			public List<CustomerPurchaseOrderAccount> Items { get; set; }
 
-			///
-			///The total number of pages of the results divided per the `pageSize`.
-			///
 			public int PageCount { get; set; }
 
-			///
-			///The number of results to display on each page when creating paged results from a query. The amount is divided and displayed on the `pageCount `amount of pages. The default is 20 and maximum value is 200 per page.
-			///
 			public int PageSize { get; set; }
 
-			///
-			///When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a `pageSize `of 25, to get the 51st through the 75th items, use `startIndex=50`.
-			///
 			public int StartIndex { get; set; }
 
-			///
-			///The total number of items in the list.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Customer/CustomerPurchaseOrderPaymentTerm.cs b/Mozu.Api/Contracts/Customer/CustomerPurchaseOrderPaymentTerm.cs
old mode 100644
new mode 100755
index 88a03514..a731b85a
--- a/Mozu.Api/Contracts/Customer/CustomerPurchaseOrderPaymentTerm.cs
+++ b/Mozu.Api/Contracts/Customer/CustomerPurchaseOrderPaymentTerm.cs
@@ -14,29 +14,14 @@
 
 namespace Mozu.Api.Contracts.Customer
 {
-		///
-		///	The purchase order payment terms that are associated with the specific customer account. Usually the payment terms are an amount of time, such as a certain amount of days the customer has in order to pay the order balance in full.
-		///
 		public class CustomerPurchaseOrderPaymentTerm
 		{
-			///
-			///Basic audit info about the object, including date, time, and user account. This data may be captured when creating, updating, and removing data.
-			///
 			public AuditInfo AuditInfo { get; set; }
 
-			///
-			///The code of the payment term associated with the customer purchase order account. This term must match the payment term code specified in the purchase order site settings.Refer to [Payment Terms](https://www.mozu.com/guides/orders/purchase-order.htm#payment_terms) in the Purchase Order guides topic for more information.
-			///
 			public string Code { get; set; }
 
-			///
-			///The localized description in text for the object, displayed per the locale code. For example, descriptions are used for product descriptions, attributes, and pre-authorization transaction types.
-			///
 			public string Description { get; set; }
 
-			///
-			///Unique identifier for the site. This ID is used at all levels of a store, catalog, and tenant to associate objects to a site.
-			///
 			public int SiteId { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Customer/CustomerSegment.cs b/Mozu.Api/Contracts/Customer/CustomerSegment.cs
old mode 100644
new mode 100755
index ffa742f2..925994a3
--- a/Mozu.Api/Contracts/Customer/CustomerSegment.cs
+++ b/Mozu.Api/Contracts/Customer/CustomerSegment.cs
@@ -27,17 +27,17 @@ public class CustomerSegment
 			public string Code { get; set; }
 
 			///
-			///The localized description in text for the object, displayed per the locale code. For example, descriptions are used for product descriptions, attributes, and pre-authorization transaction types.
+			///Description of the customer segment.
 			///
 			public string Description { get; set; }
 
 			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
+			///Unique identifier of the customer segment. System-supplied and read only.
 			///
 			public int Id { get; set; }
 
 			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
+			///Name of the customer segment.
 			///
 			public string Name { get; set; }
 
diff --git a/Mozu.Api/Contracts/Customer/CustomerSegmentCollection.cs b/Mozu.Api/Contracts/Customer/CustomerSegmentCollection.cs
old mode 100644
new mode 100755
diff --git a/Mozu.Api/Contracts/Customer/CustomerSet.cs b/Mozu.Api/Contracts/Customer/CustomerSet.cs
old mode 100644
new mode 100755
index d58a4a9b..d20b81d4
--- a/Mozu.Api/Contracts/Customer/CustomerSet.cs
+++ b/Mozu.Api/Contracts/Customer/CustomerSet.cs
@@ -15,44 +15,20 @@
 
 namespace Mozu.Api.Contracts.Customer
 {
-		///
-		///	The details of the customer set.
-		///
 		public class CustomerSet
 		{
-			///
-			///A collection of aggregate information about the customer set, including the amount of sites and customers assocaited with the customer set.
-			///
 			public CustomerSetAggregateInfo AggregateInfo { get; set; }
 
-			///
-			///Basic audit info about the object, including date, time, and user account. This data may be captured when creating, updating, and removing data.
-			///
 			public AuditInfo AuditInfo { get; set; }
 
-			///
-			///The unique identifier of the customer set.
-			///
 			public string Code { get; set; }
 
-			///
-			///The localized description in text for the object, displayed per the locale code. For example, descriptions are used for product descriptions, attributes, and pre-authorization transaction types.
-			///
 			public string Description { get; set; }
 
-			///
-			///Indicates if the object is default. This indicator is used for product variations and site search settings. If true, the value/object is the default option.
-			///
 			public bool IsDefault { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
-			///
-			///Collection of sites associated with the tenant.
-			///
 			public List<CustomerSetSite> Sites { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Customer/CustomerSetAggregateInfo.cs b/Mozu.Api/Contracts/Customer/CustomerSetAggregateInfo.cs
old mode 100644
new mode 100755
index 57291728..b6e765a0
--- a/Mozu.Api/Contracts/Customer/CustomerSetAggregateInfo.cs
+++ b/Mozu.Api/Contracts/Customer/CustomerSetAggregateInfo.cs
@@ -13,14 +13,8 @@
 
 namespace Mozu.Api.Contracts.Customer
 {
-		///
-		///	This property is not used.
-		///
 		public class CustomerSetAggregateInfo
 		{
-			///
-			///The amount of customers associated with the customer set.
-			///
 			public int CustomerCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Customer/CustomerSetCollection.cs b/Mozu.Api/Contracts/Customer/CustomerSetCollection.cs
old mode 100644
new mode 100755
index b0f527d5..6cfeb53f
--- a/Mozu.Api/Contracts/Customer/CustomerSetCollection.cs
+++ b/Mozu.Api/Contracts/Customer/CustomerSetCollection.cs
@@ -14,34 +14,16 @@
 
 namespace Mozu.Api.Contracts.Customer
 {
-		///
-		///	A collection of customer sets and their details.
-		///
 		public class CustomerSetCollection
 		{
-			///
-			///A list of requested items. All returned data is provided in an items array.For a failed request, the returned response may be success with an empty item array.
-			///
 			public List<CustomerSet> Items { get; set; }
 
-			///
-			///The total number of pages of the results divided per the `pageSize`.
-			///
 			public int PageCount { get; set; }
 
-			///
-			///The number of results to display on each page when creating paged results from a query. The amount is divided and displayed on the `pageCount `amount of pages. The default is 20 and maximum value is 200 per page.
-			///
 			public int PageSize { get; set; }
 
-			///
-			///When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a `pageSize `of 25, to get the 51st through the 75th items, use `startIndex=50`.
-			///
 			public int StartIndex { get; set; }
 
-			///
-			///The total number of items in the list.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Customer/CustomerSetSite.cs b/Mozu.Api/Contracts/Customer/CustomerSetSite.cs
old mode 100644
new mode 100755
index 47ff0318..47529f90
--- a/Mozu.Api/Contracts/Customer/CustomerSetSite.cs
+++ b/Mozu.Api/Contracts/Customer/CustomerSetSite.cs
@@ -13,24 +13,12 @@
 
 namespace Mozu.Api.Contracts.Customer
 {
-		///
-		///	The site identifier assigned to the customer set.
-		///
 		public class CustomerSetSite
 		{
-			///
-			///The unique code of the customer set.
-			///
 			public string CustomerSetCode { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
-			///
-			///Unique identifier for the site. This ID is used at all levels of a store, catalog, and tenant to associate objects to a site.
-			///
 			public int SiteId { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Customer/CustomerUserAuthInfo.cs b/Mozu.Api/Contracts/Customer/CustomerUserAuthInfo.cs
old mode 100644
new mode 100755
index 944062c6..51a862b0
--- a/Mozu.Api/Contracts/Customer/CustomerUserAuthInfo.cs
+++ b/Mozu.Api/Contracts/Customer/CustomerUserAuthInfo.cs
@@ -19,12 +19,12 @@ namespace Mozu.Api.Contracts.Customer
 		public class CustomerUserAuthInfo
 		{
 			///
-			///The write-only password for the customer account.
+			///The password of the user associated with the customer account.
 			///
 			public string Password { get; set; }
 
 			///
-			///The user name associated with the user profile. The customer uses the user name to access the account.
+			///The user name of the user associated with the customer account.
 			///
 			public string Username { get; set; }
 
diff --git a/Mozu.Api/Contracts/Customer/InStockNotificationSubscription.cs b/Mozu.Api/Contracts/Customer/InStockNotificationSubscription.cs
old mode 100644
new mode 100755
index 8cca722f..c3dae9b7
--- a/Mozu.Api/Contracts/Customer/InStockNotificationSubscription.cs
+++ b/Mozu.Api/Contracts/Customer/InStockNotificationSubscription.cs
@@ -25,7 +25,7 @@ public class InStockNotificationSubscription
 			public AuditInfo AuditInfo { get; set; }
 
 			///
-			///Unique identifier of the customer in , used to associate customers with data, orders, returns, and in-store credit.
+			///Unique identifier of the customer associated with the in-stock notification subscription.
 			///
 			public int? CustomerId { get; set; }
 
@@ -35,12 +35,12 @@ public class InStockNotificationSubscription
 			public string Email { get; set; }
 
 			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
+			///Unique identifier of the customer in-stock notification subscription.
 			///
 			public int? Id { get; set; }
 
 			///
-			///The unique, user-defined code that identifies a location. This location can be the location where the order was entered, location for newly in-stock products, and where products are returned.
+			///Tenant-defined code that identifies the customer in-stock notification subscription.
 			///
 			public string LocationCode { get; set; }
 
diff --git a/Mozu.Api/Contracts/Customer/InStockNotificationSubscriptionCollection.cs b/Mozu.Api/Contracts/Customer/InStockNotificationSubscriptionCollection.cs
old mode 100644
new mode 100755
diff --git a/Mozu.Api/Contracts/Customer/LoginState.cs b/Mozu.Api/Contracts/Customer/LoginState.cs
old mode 100644
new mode 100755
index c647c9ab..795ca13a
--- a/Mozu.Api/Contracts/Customer/LoginState.cs
+++ b/Mozu.Api/Contracts/Customer/LoginState.cs
@@ -24,42 +24,42 @@ public class LoginState
 			public DateTime? CreatedOn { get; set; }
 
 			///
-			///The total number of failed authentication attempts associated with a customer account attempting access.
+			///The total number of times the customer account has unsuccessfully attempted to log in.
 			///
 			public byte FailedLoginAttemptCount { get; set; }
 
 			///
-			///The date and time the initial login was unsuccessful. System-supplied and read only. Each time user authentication fails, an update occurs on this field. The amount of failures is calculated together for `failedLoginAttemptCount`.
+			///The date and time the customer's first unsuccessful attempt to log in was recorded.
 			///
 			public DateTime? FirstFailedLoginAttemptOn { get; set; }
 
 			///
-			///Indicates if a customer account and associated data is locked. If true, the user account is locked due to multiple failed authentication attempts. The user cannot login until the account is unlocked.
+			///If true, the customer account is locked and the customer cannot log in.
 			///
 			public bool IsLocked { get; set; }
 
 			///
-			///Indicates if the customer account must have the password changed on login. If true, the login action requires a password change for increased security. If false, the login does not require a password change.
+			///If true, the customer account user must change the password for the account.
 			///
 			public bool IsPasswordChangeRequired { get; set; }
 
 			///
-			///Provides date and time data when the customer's account was last locked. System-supplied and read-only.
+			///The date and time the customer account was most recently locked.
 			///
 			public DateTime? LastLockedOn { get; set; }
 
 			///
-			///Provides the date and time the customer last logged into the store. System-supplied and read-only.
+			///The date and time the customer account last logged in.
 			///
 			public DateTime? LastLoginOn { get; set; }
 
 			///
-			///Date and time the customer's password was last modified. System-supplied and read-only.
+			///The date and the time the user associated with the customer account last changed the account password.
 			///
 			public DateTime? LastPasswordChangeOn { get; set; }
 
 			///
-			///The number of login attempts remaining for the customer. The user must login successfully before this value reaches zero otherwise the account locks.
+			///The remaining number of login attempts the customer can perform before the system locks the customer account.
 			///
 			public int RemainingLoginAttempts { get; set; }
 
diff --git a/Mozu.Api/Contracts/Customer/PasswordInfo.cs b/Mozu.Api/Contracts/Customer/PasswordInfo.cs
old mode 100644
new mode 100755
index 73b7887c..76d7f9be
--- a/Mozu.Api/Contracts/Customer/PasswordInfo.cs
+++ b/Mozu.Api/Contracts/Customer/PasswordInfo.cs
@@ -18,13 +18,10 @@ namespace Mozu.Api.Contracts.Customer
 		///
 		public class PasswordInfo
 		{
-			///
-			///If you are importing existing customer accounts to  or using two customer systems simultaneously, you use this property to store an external password hash that helps you migrate existing customer accounts seamlessly into , without having to require shoppers to create new passwords for the platform.  If you set this property, you must use the [embedded.verifyExternalPassword](https://www.mozu.com/docs/arcjs/commerce-customer/actions/verifyexternalpassword.htm) action to verify that the hashed version of a cleartext password provided by a shopper matches the external password hash specified in this property.
-			///
 			public string ExternalPassword { get; set; }
 
 			///
-			///The new password entered and saved by the user of the account. 
+			///The new account password value.
 			///
 			public string NewPassword { get; set; }
 
diff --git a/Mozu.Api/Contracts/Customer/PurchaseOrderTransaction.cs b/Mozu.Api/Contracts/Customer/PurchaseOrderTransaction.cs
old mode 100644
new mode 100755
index a6535775..ed98f878
--- a/Mozu.Api/Contracts/Customer/PurchaseOrderTransaction.cs
+++ b/Mozu.Api/Contracts/Customer/PurchaseOrderTransaction.cs
@@ -14,84 +14,36 @@
 
 namespace Mozu.Api.Contracts.Customer
 {
-		///
-		///	The details of the purchase order payment transaction.
-		///
 		public class PurchaseOrderTransaction
 		{
-			///
-			///Additional transaction details or notes associated with the transaction.
-			///
 			public string AdditionalTransactionDetail { get; set; }
 
-			///
-			///Basic audit info about the object, including date, time, and user account. This data may be captured when creating, updating, and removing data.
-			///
 			public AuditInfo AuditInfo { get; set; }
 
-			///
-			///The author of the purchase order transaction.
-			///
 			public string Author { get; set; }
 
-			///
-			///The available balance the customer has on their purchase order account. This balance is the result of the  minus the customer's total amount due.
-			///
 			public decimal AvailableBalance { get; set; }
 
-			///
-			///The total credit limit the customer can spend using purchase orders.
-			///
 			public decimal CreditLimit { get; set; }
 
-			///
-			///The unique identifier of the customer purchase order account.
-			///
 			public int CustomerPurchaseOrderAccountId { get; set; }
 
-			///
-			///Unique identifier used by an external program to identify a  order, customer account, or wish list.
-			///
 			public string ExternalId { get; set; }
 
-			///
-			///Unique identifier of the order associated with the payment.
-			///
 			public string OrderId { get; set; }
 
-			///
-			///The purchase order number.
-			///
 			public string PurchaseOrderNumber { get; set; }
 
-			///
-			///Unique identifier for the site. This ID is used at all levels of a store, catalog, and tenant to associate objects to a site.
-			///
 			public int SiteId { get; set; }
 
-			///
-			///Unique identifier for the tenant.
-			///
 			public int TenantId { get; set; }
 
-			///
-			///The amount of the purchase order transaction.
-			///
 			public decimal TransactionAmount { get; set; }
 
-			///
-			///The date when the purchase order transaction was made on a purchase order account.
-			///
 			public DateTime TransactionDate { get; set; }
 
-			///
-			///A description of the purchase order transaction type.This field is read-only dependent on the value of .* * * * * * 
-			///
 			public string TransactionDescription { get; set; }
 
-			///
-			///The type of the purchase order transaction.The valid values are:*  — Line of Credit Change*  — Payment Requested*  — Payment Collected *  — Payment Voided*  — Payment Refund*  — Manual Adjustment
-			///
 			public int TransactionTypeId { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Customer/PurchaseOrderTransactionCollection.cs b/Mozu.Api/Contracts/Customer/PurchaseOrderTransactionCollection.cs
old mode 100644
new mode 100755
index dc606dd1..c3497fe0
--- a/Mozu.Api/Contracts/Customer/PurchaseOrderTransactionCollection.cs
+++ b/Mozu.Api/Contracts/Customer/PurchaseOrderTransactionCollection.cs
@@ -14,34 +14,16 @@
 
 namespace Mozu.Api.Contracts.Customer
 {
-		///
-		///	A collection of purchase order payment transactions and their details.
-		///
 		public class PurchaseOrderTransactionCollection
 		{
-			///
-			///A list of requested items. All returned data is provided in an items array.For a failed request, the returned response may be success with an empty item array.
-			///
 			public List<PurchaseOrderTransaction> Items { get; set; }
 
-			///
-			///The total number of pages of the results divided per the `pageSize`.
-			///
 			public int PageCount { get; set; }
 
-			///
-			///The number of results to display on each page when creating paged results from a query. The amount is divided and displayed on the `pageCount `amount of pages. The default is 20 and maximum value is 200 per page.
-			///
 			public int PageSize { get; set; }
 
-			///
-			///When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a `pageSize `of 25, to get the 51st through the 75th items, use `startIndex=50`.
-			///
 			public int StartIndex { get; set; }
 
-			///
-			///The total number of items in the list.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Customer/ResetPasswordInfo.cs b/Mozu.Api/Contracts/Customer/ResetPasswordInfo.cs
old mode 100644
new mode 100755
index d7c877a6..33c5cad6
--- a/Mozu.Api/Contracts/Customer/ResetPasswordInfo.cs
+++ b/Mozu.Api/Contracts/Customer/ResetPasswordInfo.cs
@@ -18,9 +18,6 @@ namespace Mozu.Api.Contracts.Customer
 		///
 		public class ResetPasswordInfo
 		{
-			///
-			///The unique code of the customer set.
-			///
 			public string CustomerSetCode { get; set; }
 
 			///
@@ -29,7 +26,7 @@ public class ResetPasswordInfo
 			public string EmailAddress { get; set; }
 
 			///
-			///The user name associated with the user profile. The customer uses the user name to access the account.
+			///User name of the user associated with the customer account.
 			///
 			public string UserName { get; set; }
 
diff --git a/Mozu.Api/Contracts/Customer/Transaction.cs b/Mozu.Api/Contracts/Customer/Transaction.cs
old mode 100644
new mode 100755
index f358fae9..698e21a7
--- a/Mozu.Api/Contracts/Customer/Transaction.cs
+++ b/Mozu.Api/Contracts/Customer/Transaction.cs
@@ -18,39 +18,18 @@ namespace Mozu.Api.Contracts.Customer
 		///
 		public class Transaction
 		{
-			///
-			///If applicable, the amount of the transaction.
-			///
 			public decimal Amount { get; set; }
 
-			///
-			///The localized currency code for the monetary amount. 
-			///
 			public string CurrencyCode { get; set; }
 
-			///
-			///The date and time recording for a customer action including a transaction and storefront visit.
-			///
 			public DateTime Date { get; set; }
 
-			///
-			///The type of payment interaction. The payment can be Capture or CheckReceived. The value also includes customer payment interactions such as Website, Call, Store, or Unknown.
-			///
 			public string InteractionType { get; set; }
 
-			///
-			///The unique identifier of the transaction.
-			///
 			public string TransactionId { get; set; }
 
-			///
-			///Specifies the type of transaction, including customer transactions and credit transactions.Valid values for credit transactions are the following:* —decreases the credit amount* —updates the credit amountValid values for customer transaction types are the following:* * * * 
-			///
 			public string TransactionType { get; set; }
 
-			///
-			///Unique identifier of the customer visit in which the cart was created or last modified.
-			///
 			public string VisitId { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Customer/Visit.cs b/Mozu.Api/Contracts/Customer/Visit.cs
old mode 100644
new mode 100755
index 1618382d..3efc57e4
--- a/Mozu.Api/Contracts/Customer/Visit.cs
+++ b/Mozu.Api/Contracts/Customer/Visit.cs
@@ -19,64 +19,28 @@ namespace Mozu.Api.Contracts.Customer
 		///
 		public class Visit
 		{
-			///
-			///Unique identifier of the customer account generated by the system. Account IDs are generated at account creation.
-			///
 			public int? AccountId { get; set; }
 
-			///
-			///If the customer visit is made online, the location code associated with the website visited.
-			///
 			public string BrowserLocationCode { get; set; }
 
-			///
-			///The date and time recording for a customer action including a transaction and storefront visit.
-			///
 			public DateTime Date { get; set; }
 
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public string Id { get; set; }
 
-			///
-			///The unique, user-defined code that identifies a location. This location can be the location where the order was entered, location for newly in-stock products, and where products are returned.
-			///
 			public string LocationCode { get; set; }
 
-			///
-			///Array list of transactions the customer performed during the visit. A customer can perform multiple transactions in a single visit, or the visit can have no associated transactions.
-			///
 			public List<Transaction> Transactions { get; set; }
 
-			///
-			///The type of customer visit, which is "Website," "Store," "Call," or "Unknown."
-			///
 			public string Type { get; set; }
 
-			///
-			///Unique identifier of the customer account (shopper or system user). System-supplied and read-only. If the shopper user is anonymous, the user ID represents a system-generated user ID string.
-			///
 			public string UserId { get; set; }
 
-			///
-			///The HTTP_Referrer that initiatied the visit started. If the shopper was not referred from another source, this value is null.
-			///
 			public string WebReferrer { get; set; }
 
-			///
-			///Unique identifier of the web session in which the cart, order, return, or wish list was created or last modified.
-			///
 			public string WebSessionId { get; set; }
 
-			///
-			///Unique identifier of the site.
-			///
 			public int? WebSiteId { get; set; }
 
-			///
-			///The user agent string for the browser.
-			///
 			public string WebUserAgent { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Customer/VisitCollection.cs b/Mozu.Api/Contracts/Customer/VisitCollection.cs
old mode 100644
new mode 100755
index 04c2f252..e0a4ff82
--- a/Mozu.Api/Contracts/Customer/VisitCollection.cs
+++ b/Mozu.Api/Contracts/Customer/VisitCollection.cs
@@ -19,29 +19,14 @@ namespace Mozu.Api.Contracts.Customer
 		///
 		public class VisitCollection
 		{
-			///
-			///An array list of objects in the returned collection.
-			///
 			public List<Visit> Items { get; set; }
 
-			///
-			///The number of pages returned based on the startIndex and pageSize values specified. This value is system-supplied and read-only.
-			///
 			public int PageCount { get; set; }
 
-			///
-			///The number of results to display on each page when creating paged results from a query. The maximum value is 200.
-			///
 			public int PageSize { get; set; }
 
-			///
-			///When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.
-			///
 			public int StartIndex { get; set; }
 
-			///
-			///The number of results listed in the query collection, represented by a signed 64-bit (8-byte) integer. This value is system-supplied and read-only.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Event/Event.cs b/Mozu.Api/Contracts/Event/Event.cs
old mode 100644
new mode 100755
index 55e56b22..804fd59e
--- a/Mozu.Api/Contracts/Event/Event.cs
+++ b/Mozu.Api/Contracts/Event/Event.cs
@@ -16,18 +16,12 @@
 namespace Mozu.Api.Contracts.Event
 {
 		///
-		///	Mozu.AppDev.Contracts.Event ApiType DOCUMENT_HERE
+		///	Properties of an event the system creates each time a create, read, update, or delete operation is performed.
 		///
 		public class Event
 		{
-			///
-			///Identifier and datetime stamp information recorded when a user or application creates, updates, or deletes a resource entity. This value is system-supplied and read-only.
-			///
 			public AuditInfo AuditInfo { get; set; }
 
-			///
-			///The unique identifier of the catalog of products used by a site.
-			///
 			public int? CatalogId { get; set; }
 
 			///
@@ -35,43 +29,22 @@ public class Event
 			///
 			public string CorrelationId { get; set; }
 
-			///
-			///The unique identifier of the entity that caused the event. For example, if the event is "product.created", the entity ID value represents the product code of the product that was created.
-			///
 			public string EntityId { get; set; }
 
 			public string EventId { get; set; }
 
-			///
-			///Extended properties. Note: This is purposefully not a CollectionBase type wrapper so consumers start to get used to not having counts returned.
-			///
 			public List<EventExtendedProperty> ExtendedProperties { get; set; }
 
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public string Id { get; set; }
 
-			///
-			///Indicates if the event is a test request or test entity. If true, the generated and captured event record was generated as a test request for an application.
-			///
 			public bool? IsTest { get; set; }
 
-			///
-			///The unique identifier of the master catalog associated with the entity.
-			///
 			public int? MasterCatalogId { get; set; }
 
 			public int? SiteId { get; set; }
 
-			///
-			///Unique identifier of the Mozu tenant.
-			///
 			public int? TenantId { get; set; }
 
-			///
-			///The type of event that was performed, such as "product.created" or "category.deleted".
-			///
 			public string Topic { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Event/EventCollection.cs b/Mozu.Api/Contracts/Event/EventCollection.cs
old mode 100644
new mode 100755
index 61cf2451..94b2f530
--- a/Mozu.Api/Contracts/Event/EventCollection.cs
+++ b/Mozu.Api/Contracts/Event/EventCollection.cs
@@ -19,26 +19,14 @@ namespace Mozu.Api.Contracts.Event
 		///
 		public class EventCollection
 		{
-			///
-			///An array list of objects in the returned collection.
-			///
 			public List<Event> Items { get; set; }
 
-			///
-			///The number of pages returned based on the startIndex and pageSize values specified. This value is system-supplied and read-only.
-			///
 			public int PageCount { get; set; }
 
-			///
-			///The number of results to display on each page when creating paged results from a query. The maximum value is 200.
-			///
 			public int PageSize { get; set; }
 
 			public int StartIndex { get; set; }
 
-			///
-			///The number of results listed in the query collection, represented by a signed 64-bit (8-byte) integer. This value is system-supplied and read-only.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Event/EventDeliveryAttempt.cs b/Mozu.Api/Contracts/Event/EventDeliveryAttempt.cs
old mode 100644
new mode 100755
index 890b7362..c3b5a81b
--- a/Mozu.Api/Contracts/Event/EventDeliveryAttempt.cs
+++ b/Mozu.Api/Contracts/Event/EventDeliveryAttempt.cs
@@ -13,34 +13,16 @@
 
 namespace Mozu.Api.Contracts.Event
 {
-		///
-		///	Properties and information captured for an attempted delivery that failed.
-		///
 		public class EventDeliveryAttempt
 		{
-			///
-			///Status of the delivery process `EventDeliveryStatusType`. System-supplied and read-only.
-			///
 			public string DeliveryStatus { get; set; }
 
-			///
-			///Type of error that occurred, if the delivery was unsuccessful
-			///
 			public string ErrorType { get; set; }
 
-			///
-			///The date that the delivery was attempted
-			///
 			public DateTime? ExecutionDate { get; set; }
 
-			///
-			///The HTTP Status (code and name) returned by the remote endpoint
-			///
 			public HttpStatus HttpStatus { get; set; }
 
-			///
-			///The text of the change message, such as "This product is no longer available." System-supplied and read-only.
-			///
 			public string Message { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Event/EventDeliverySummary.cs b/Mozu.Api/Contracts/Event/EventDeliverySummary.cs
old mode 100644
new mode 100755
index 482ee754..4840a351
--- a/Mozu.Api/Contracts/Event/EventDeliverySummary.cs
+++ b/Mozu.Api/Contracts/Event/EventDeliverySummary.cs
@@ -14,59 +14,26 @@
 
 namespace Mozu.Api.Contracts.Event
 {
-		///
-		///	Data for event deliveries. Returned content details a summary of actions, events, and results for a delivery event.
-		///
 		public class EventDeliverySummary
 		{
-			///
-			///The date and time in UTC format set when the object was created.
-			///
 			public DateTime? CreateDate { get; set; }
 
-			///
-			///Details about each attempted delivery of the event to the endpoint
-			///
 			public List<EventDeliveryAttempt> DeliveryAttempts { get; set; }
 
-			///
-			///Status of the delivery process `EventDeliveryStatusType`. System-supplied and read-only.
-			///
 			public string DeliveryStatus { get; set; }
 
-			///
-			///Event Summary
-			///
 			public EventSummary EventSummary { get; set; }
 
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public int? Id { get; set; }
 
-			///
-			///Indicates whether delivery of the event is currently being attempted at this moment in time
-			///
 			public bool IsRunning { get; set; }
 
-			///
-			///The date that the delivery was last attempted (either successfully or not)
-			///
 			public DateTime LastExecutionDate { get; set; }
 
-			///
-			///The date that the delivery will next be attempted, if the event has not been successfully delivered yet and there are still retries remaining
-			///
 			public DateTime NextExecutionDate { get; set; }
 
-			///
-			///Number of delivery attempts remaining
-			///
 			public int? RetriesRemaining { get; set; }
 
-			///
-			///The date and time in UTC format the object was updated most recently.
-			///
 			public DateTime? UpdateDate { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Event/EventDeliverySummaryCollection.cs b/Mozu.Api/Contracts/Event/EventDeliverySummaryCollection.cs
old mode 100644
new mode 100755
index 85e44c92..2b4068bf
--- a/Mozu.Api/Contracts/Event/EventDeliverySummaryCollection.cs
+++ b/Mozu.Api/Contracts/Event/EventDeliverySummaryCollection.cs
@@ -14,34 +14,16 @@
 
 namespace Mozu.Api.Contracts.Event
 {
-		///
-		///	Collection of data for event deliveries. Returned content details a summary of actions, events, and results for a delivery event.
-		///
 		public class EventDeliverySummaryCollection
 		{
-			///
-			///A list of requested items. All returned data is provided in an items array.For a failed request, the returned response may be success with an empty item array.
-			///
 			public List<EventDeliverySummary> Items { get; set; }
 
-			///
-			///The total number of pages of the results divided per the `pageSize`.
-			///
 			public int PageCount { get; set; }
 
-			///
-			///The number of results to display on each page when creating paged results from a query. The amount is divided and displayed on the `pageCount `amount of pages. The default is 20 and maximum value is 200 per page.
-			///
 			public int PageSize { get; set; }
 
-			///
-			///When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a `pageSize `of 25, to get the 51st through the 75th items, use `startIndex=50`.
-			///
 			public int StartIndex { get; set; }
 
-			///
-			///The total number of items in the list.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Event/EventExtendedProperty.cs b/Mozu.Api/Contracts/Event/EventExtendedProperty.cs
old mode 100644
new mode 100755
index 2c950d1d..b475107e
--- a/Mozu.Api/Contracts/Event/EventExtendedProperty.cs
+++ b/Mozu.Api/Contracts/Event/EventExtendedProperty.cs
@@ -13,19 +13,10 @@
 
 namespace Mozu.Api.Contracts.Event
 {
-		///
-		///	Key and value data for an extended property event.
-		///
 		public class EventExtendedProperty
 		{
-			///
-			///Key used for metadata defined for objects, including extensible attributes, custom attributes associated with a shipping provider, and search synonyms definitions. This content may be user-defined depending on the object and usage.For search synonym definitions, refer to [Synonym Expansion Types](https://www.mozu.com/docs/Developer/api-guides/search-settings.htm#synonym_expansion_types) for more information about the key usage.
-			///
 			public string Key { get; set; }
 
-			///
-			///The value of a property, used by numerous objects within  including facets, attributes, products, localized content, metadata, capabilities ( and third-party), location inventory adjustment, and more. The value may be a string, integer, or double. Validation may be run against the entered and saved values depending on the object type.
-			///
 			public object Value { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Event/EventSummary.cs b/Mozu.Api/Contracts/Event/EventSummary.cs
old mode 100644
new mode 100755
index 96abf338..597835b0
--- a/Mozu.Api/Contracts/Event/EventSummary.cs
+++ b/Mozu.Api/Contracts/Event/EventSummary.cs
@@ -14,49 +14,22 @@
 
 namespace Mozu.Api.Contracts.Event
 {
-		///
-		///	Properties of events as a summary of actions, data, and responses.
-		///
 		public class EventSummary
 		{
-			///
-			///The unique identifier for the product catalog. Catalogs are part of a master catalog.
-			///
 			public int? CatalogId { get; set; }
 
-			///
-			///The unique identifier of the API request associated with the event action, which might contain multiple actions.
-			///
 			public string CorrelationId { get; set; }
 
-			///
-			///The date and time in UTC format set when the object was created.
-			///
 			public DateTime? CreateDate { get; set; }
 
-			///
-			///The unique identifier of the entity that caused the event. For example, if the event is "product.created", the entity ID value represents the product code of the product that was created.
-			///
 			public string EntityId { get; set; }
 
-			///
-			///Unique identifier for the event. 
-			///
 			public string EventId { get; set; }
 
-			///
-			///Extended properties. Note: This is purposefully not a CollectionBase type wrapper so consumers start to get used to not having counts returned.
-			///
 			public List<EventExtendedProperty> ExtendedProperties { get; set; }
 
-			///
-			///Unique identifier for the master catalog. 
-			///
 			public int? MasterCatalogId { get; set; }
 
-			///
-			///Unique identifier for the site. This ID is used at all levels of a store, catalog, and tenant to associate objects to a site.
-			///
 			public int? SiteId { get; set; }
 
 			///
@@ -64,9 +37,6 @@ public class EventSummary
 			///
 			public int? TenantId { get; set; }
 
-			///
-			///The type of event that was performed, such as "product.created" or "category.deleted".
-			///
 			public string Topic { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Event/HttpStatus.cs b/Mozu.Api/Contracts/Event/HttpStatus.cs
old mode 100644
new mode 100755
index b69defb3..a003abd9
--- a/Mozu.Api/Contracts/Event/HttpStatus.cs
+++ b/Mozu.Api/Contracts/Event/HttpStatus.cs
@@ -13,19 +13,10 @@
 
 namespace Mozu.Api.Contracts.Event
 {
-		///
-		///	Properties for the HTTP status for an event.
-		///
 		public class HttpStatus
 		{
-			///
-			///The higher-level integer based HTTP Status Code returned by the remote endpoint
-			///
 			public int Code { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Event/SubscribingSite.cs b/Mozu.Api/Contracts/Event/SubscribingSite.cs
old mode 100644
new mode 100755
index 3526e47a..4a82260f
--- a/Mozu.Api/Contracts/Event/SubscribingSite.cs
+++ b/Mozu.Api/Contracts/Event/SubscribingSite.cs
@@ -14,9 +14,6 @@
 
 namespace Mozu.Api.Contracts.Event
 {
-		///
-		///	Properties for the site associated with a subscription including audit info, if active, and the unique ID for the site.
-		///
 		public class SubscribingSite
 		{
 			///
@@ -25,13 +22,10 @@ public class SubscribingSite
 			public AuditInfo AuditInfo { get; set; }
 
 			///
-			///Indicates if the object or feature is active.
+			///This specifies if the subscription is active at the site level.
 			///
 			public bool? IsActive { get; set; }
 
-			///
-			///Unique identifier for the site. This ID is used at all levels of a store, catalog, and tenant to associate objects to a site.
-			///
 			public int? SiteId { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Event/SubscribingTenant.cs b/Mozu.Api/Contracts/Event/SubscribingTenant.cs
old mode 100644
new mode 100755
index 7e0d9edd..dfca957c
--- a/Mozu.Api/Contracts/Event/SubscribingTenant.cs
+++ b/Mozu.Api/Contracts/Event/SubscribingTenant.cs
@@ -26,7 +26,7 @@ public class SubscribingTenant
 			public AuditInfo AuditInfo { get; set; }
 
 			///
-			///Indicates if the object or feature is active.
+			///This specifies if the subscription is active at the tenant level. If the subscription context is at the tenant level, this property is used over the site level.
 			///
 			public bool? IsActive { get; set; }
 
@@ -41,7 +41,7 @@ public class SubscribingTenant
 			public List<SubscribingSite> SubscribingSites { get; set; }
 
 			///
-			///Unique identifier for the tenant.
+			///This specifies the tenant identifier.
 			///
 			public int? TenantId { get; set; }
 
diff --git a/Mozu.Api/Contracts/Event/Subscription.cs b/Mozu.Api/Contracts/Event/Subscription.cs
old mode 100644
new mode 100755
index 8249610c..c897b831
--- a/Mozu.Api/Contracts/Event/Subscription.cs
+++ b/Mozu.Api/Contracts/Event/Subscription.cs
@@ -14,64 +14,28 @@
 
 namespace Mozu.Api.Contracts.Event
 {
-		///
-		///	The subscription entity used to provide event notifications for third-parties.
-		///
 		public class Subscription
 		{
-			///
-			///ApiVersion
-			///
 			public string ApiVersion { get; set; }
 
-			///
-			///Unique identifier of an app available in your  tenant or within  Dev Center. This ID is unique across all apps installed, initialized, and enabled in the  and those in development through the Dev Center Console.
-			///
 			public string AppId { get; set; }
 
-			///
-			///A boolean value that indicates if the subscription endpoint has been confirmed
-			///
 			public bool? Confirmed { get; set; }
 
-			///
-			///Content type of the payload that will be delivered. This is utilized in combination with the notification delivery type. Example: A HTTP Post (notification delivery type) is performed with a JSON representation of the event data (content type).
-			///
 			public string ContentType { get; set; }
 
-			///
-			///Identifier of the user that created the object. System created and read only.
-			///
 			public string CreateBy { get; set; }
 
-			///
-			///The date and time in UTC format set when the object was created.
-			///
 			public DateTime? CreateDate { get; set; }
 
-			///
-			///The delivery endpoint that will receive notifications when events concerning the specified topics on the subscription occur. The format of the endpoint may differ depending on the notification type. For example, the endpoint may be a URL in some cases and an email address in others if multiple notification types are available.
-			///
 			public string Endpoint { get; set; }
 
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public string Id { get; set; }
 
-			///
-			///Indicates if the object or feature is active.
-			///
 			public bool? IsActive { get; set; }
 
-			///
-			///A boolean value that indicates if events should be delivered that resulted from an API call by the application. If true, any events that occur as a result of a direct API call by the same application will not be delivered. This can prevent an endless loop in certain scenarios.
-			///
 			public bool? NoCallback { get; set; }
 
-			///
-			///Notification delivery type which is a string representation of an enumeration of values. Example: Http (this is case insensitive, so http may also be passed in)
-			///
 			public string NotificationDeliveryType { get; set; }
 
 			///
@@ -79,19 +43,10 @@ public class Subscription
 			///
 			public List<SubscribingTenant> SubscribingTenants { get; set; }
 
-			///
-			///A list of topics that the subscription relates to
-			///
 			public List<string> Topics { get; set; }
 
-			///
-			///Identifier of the user that updated the entity most recently.
-			///
 			public string UpdateBy { get; set; }
 
-			///
-			///The date and time in UTC format the object was updated most recently.
-			///
 			public DateTime? UpdateDate { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Event/SubscriptionCollection.cs b/Mozu.Api/Contracts/Event/SubscriptionCollection.cs
old mode 100644
new mode 100755
index f9635fce..5e47c6d7
--- a/Mozu.Api/Contracts/Event/SubscriptionCollection.cs
+++ b/Mozu.Api/Contracts/Event/SubscriptionCollection.cs
@@ -14,34 +14,16 @@
 
 namespace Mozu.Api.Contracts.Event
 {
-		///
-		///	Paged collection subscription entities used to provide event notifications for third-parties.
-		///
 		public class SubscriptionCollection
 		{
-			///
-			///A list of requested items. All returned data is provided in an items array.For a failed request, the returned response may be success with an empty item array.
-			///
 			public List<Subscription> Items { get; set; }
 
-			///
-			///The total number of pages of the results divided per the `pageSize`.
-			///
 			public int PageCount { get; set; }
 
-			///
-			///The number of results to display on each page when creating paged results from a query. The amount is divided and displayed on the `pageCount `amount of pages. The default is 20 and maximum value is 200 per page.
-			///
 			public int PageSize { get; set; }
 
-			///
-			///When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a `pageSize `of 25, to get the 51st through the 75th items, use `startIndex=50`.
-			///
 			public int StartIndex { get; set; }
 
-			///
-			///The total number of items in the list.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/InstalledApplications/Application.cs b/Mozu.Api/Contracts/InstalledApplications/Application.cs
old mode 100644
new mode 100755
index 591c149b..80fb3862
--- a/Mozu.Api/Contracts/InstalledApplications/Application.cs
+++ b/Mozu.Api/Contracts/InstalledApplications/Application.cs
@@ -15,18 +15,15 @@
 namespace Mozu.Api.Contracts.InstalledApplications
 {
 		///
-		///	Properties of an app installed in a tenant.
+		///	Properties of an application installed in a tenant.
 		///
 		public class Application
 		{
 			///
-			///Unique identifier of an app available in your  tenant or within  Dev Center. This ID is unique across all apps installed, initialized, and enabled in the  and those in development through the Dev Center Console.
+			///The unique identifier of the application in Mozu Dev Center.
 			///
 			public string AppId { get; set; }
 
-			///
-			///Unique identifier of an app or theme available in your  tenant or within  Dev Center. An appKey is composed of Developer Account namespace, app/theme ID, version, and package (e.g., devAccount.helloWorld.1.0.0.Release). 
-			///
 			public string AppKey { get; set; }
 
 			///
@@ -35,27 +32,24 @@ public class Application
 			public List<Capability> Capabilities { get; set; }
 
 			///
-			///Indicates if a capability, function tied to an Arc.js action, application, or price list is enabled for the tenant/site. If true, the capability/application/function/price list is enabled for the tenant. System-supplied and read-only with the exception of functions tied to an Arc.js action and price lists.
+			///If true, the application is enabled for the tenant. System-supplied and read-only.
 			///
 			public bool? Enabled { get; set; }
 
 			///
-			///Indicates if an app is initialized and capable of being enabled in the tenant and site. Apps will need to be installed and configured to become initialized, such as validating credentials and/or API keys with a third-party service. If true, the app is initialized and can be enabled for usage.
+			///If true, the third party application settings have been configured and the application is initialized.
 			///
 			public bool? Initialized { get; set; }
 
 			///
-			///Indicates if the installed application is of type extension. An extension is an application that extends upon the  infrastructure. Examples of extensions include Arc.js applications and applications that integrate third-party services.
+			///If true, the application type is Extension.
 			///
 			public bool? IsExtension { get; set; }
 
-			///
-			///Indicates if an Arc.js application is certified to run on tenants that lack a full installation of the Arc.js framework.
-			///
 			public bool? IsExtensionCertified { get; set; }
 
 			///
-			///The URL defined for the application that represents the configuration website for the capability. This value is used by installed applications or the site.
+			///The URL defined for the application that represents the configuration website for the capability.
 			///
 			public string UiConfigurationUrl { get; set; }
 
diff --git a/Mozu.Api/Contracts/InstalledApplications/Capability.cs b/Mozu.Api/Contracts/InstalledApplications/Capability.cs
old mode 100644
new mode 100755
index f2b98d88..9d3e213e
--- a/Mozu.Api/Contracts/InstalledApplications/Capability.cs
+++ b/Mozu.Api/Contracts/InstalledApplications/Capability.cs
@@ -26,17 +26,17 @@ public class Capability
 			public List<string> ActiveCreditTypes { get; set; }
 
 			///
-			///Array list of the countries (by country code) to which this capability can actively ship. The entered shipping country is validated against a list of supported shipping countries. Messages return if the country code is not supported or duplicated. Supported carriers are also checked per country code.
+			///Array list of the countries to which this capability can actively ship.
 			///
 			public List<ActiveShippingCountry> ActiveShippingCountries { get; set; }
 
 			///
-			///Array list of the countries (by country code) for which this capability can actively shop. All active shopping countries must be in the supported shopping country list. Validation rules determine the supported validity of the entered country against the list.
+			///Array list of the countries for which this capability can actively shop.
 			///
 			public List<string> ActiveShoppingCountries { get; set; }
 
 			///
-			///The enablement mode of the capability, typically read only.
+			///The enablement mode of the capability.
 			///
 			public string CapabilityMode { get; set; }
 
@@ -46,17 +46,17 @@ public class Capability
 			public string CapabilityType { get; set; }
 
 			///
-			///Indicates if a capability, function tied to an Arc.js action, application, or price list is enabled for the tenant/site. If true, the capability/application/function/price list is enabled for the tenant. System-supplied and read-only with the exception of functions tied to an Arc.js action and price lists.
+			///If true, the capability is enabled in the installed tenant.
 			///
 			public bool? Enabled { get; set; }
 
 			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
+			///Unique identifier of the capability.
 			///
 			public string Id { get; set; }
 
 			///
-			///Indicates if an app is initialized and capable of being enabled in the tenant and site. Apps will need to be installed and configured to become initialized, such as validating credentials and/or API keys with a third-party service. If true, the app is initialized and can be enabled for usage.
+			///If true, the application is initialized with the defined settings.
 			///
 			public bool? Initialized { get; set; }
 
@@ -66,12 +66,12 @@ public class Capability
 			public List<OperationUrl> OperationUrls { get; set; }
 
 			///
-			///The unique identifier of the scope. For example, if your scope type is site, then this value would be the site id.
+			///Unique identifier of the developer account or tenant associated for which the capability is entitled.
 			///
 			public int? ScopeId { get; set; }
 
 			///
-			///The type of scope associated with the documentList. For example, if the documentList is pageTemplateContent, the scopeType is Site.Valid values are: "Tenant", "MasterCatalog", and "Site".
+			///The type of scope for which the tenant is entitled, which is developer or tenant.
 			///
 			public string ScopeType { get; set; }
 
diff --git a/Mozu.Api/Contracts/InstalledApplications/CredentialStoreEntry.cs b/Mozu.Api/Contracts/InstalledApplications/CredentialStoreEntry.cs
old mode 100644
new mode 100755
index 043a5a40..57839f8e
--- a/Mozu.Api/Contracts/InstalledApplications/CredentialStoreEntry.cs
+++ b/Mozu.Api/Contracts/InstalledApplications/CredentialStoreEntry.cs
@@ -15,19 +15,10 @@
 
 namespace Mozu.Api.Contracts.InstalledApplications
 {
-		///
-		///	Mozu.InstalledApplications.Contracts.CredentialStoreEntry ApiType DOCUMENT_HERE 
-		///
 		public class CredentialStoreEntry
 		{
-			///
-			///The full name of the credential store entry.
-			///
 			public string FullName { get; set; }
 
-			///
-			///The value of a property, used by numerous objects within  including facets, attributes, products, localized content, metadata, capabilities ( and third-party), location inventory adjustment, and more. The value may be a string, integer, or double. Validation may be run against the entered and saved values depending on the object type.
-			///
 			public JObject Value { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/InstalledApplications/CustomFunction.cs b/Mozu.Api/Contracts/InstalledApplications/CustomFunction.cs
old mode 100644
new mode 100755
index ae4274ed..584ddd85
--- a/Mozu.Api/Contracts/InstalledApplications/CustomFunction.cs
+++ b/Mozu.Api/Contracts/InstalledApplications/CustomFunction.cs
@@ -15,44 +15,20 @@
 
 namespace Mozu.Api.Contracts.InstalledApplications
 {
-		///
-		///	Mozu.InstalledApplications.Contracts.CustomFunction ApiType DOCUMENT_HERE 
-		///
 		public class CustomFunction
 		{
-			///
-			///The Arc.js application key.
-			///
 			public string ApplicationKey { get; set; }
 
-			///
-			///Custom function-level settings specified as key-value pairs.
-			///
 			public JObject Configuration { get; set; }
 
-			///
-			///Indicates if a capability, function tied to an Arc.js action, application, or price list is enabled for the tenant/site. If true, the capability/application/function/price list is enabled for the tenant. System-supplied and read-only with the exception of functions tied to an Arc.js action and price lists.
-			///
 			public bool? Enabled { get; set; }
 
-			///
-			///The behavior to take when an error is encountered. "fault" or "continue". The default is "fault".
-			///
 			public string ExceptionBehavior { get; set; }
 
-			///
-			///The name of the custom function tied to a particular action.
-			///
 			public string FunctionId { get; set; }
 
-			///
-			///The priority level to assign to logs related to a particular function. Possible values mirror Apache's log4net: "all", "debug", "info", "warn", "error", "fatal", and "off".
-			///
 			public string LogLevel { get; set; }
 
-			///
-			///The number of milliseconds that the function waits before timing out. The default is 5000 milliseconds
-			///
 			public int? TimeoutMilliseconds { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/InstalledApplications/CustomFunctionsForAction.cs b/Mozu.Api/Contracts/InstalledApplications/CustomFunctionsForAction.cs
old mode 100644
new mode 100755
index 73019bb7..895abad0
--- a/Mozu.Api/Contracts/InstalledApplications/CustomFunctionsForAction.cs
+++ b/Mozu.Api/Contracts/InstalledApplications/CustomFunctionsForAction.cs
@@ -14,19 +14,10 @@
 
 namespace Mozu.Api.Contracts.InstalledApplications
 {
-		///
-		///	Mozu.InstalledApplications.Contracts.CustomFunctionsForAction ApiType DOCUMENT_HERE 
-		///
 		public class CustomFunctionsForAction
 		{
-			///
-			///The full action ID for a specific action.
-			///
 			public string ActionId { get; set; }
 
-			///
-			///An array of settings for a particular action.
-			///
 			public List<CustomFunctionsForContext> Contexts { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/InstalledApplications/CustomFunctionsForContext.cs b/Mozu.Api/Contracts/InstalledApplications/CustomFunctionsForContext.cs
old mode 100644
new mode 100755
index 420a8ca2..f72ba46e
--- a/Mozu.Api/Contracts/InstalledApplications/CustomFunctionsForContext.cs
+++ b/Mozu.Api/Contracts/InstalledApplications/CustomFunctionsForContext.cs
@@ -14,19 +14,10 @@
 
 namespace Mozu.Api.Contracts.InstalledApplications
 {
-		///
-		///	Mozu.InstalledApplications.Contracts.CustomFunctionsForContext ApiType DOCUMENT_HERE 
-		///
 		public class CustomFunctionsForContext
 		{
-			///
-			///The site ID for the site you want to apply a group of settings to. You do not need to provide this value if you want to apply the same settings to a particular action across all your sites.
-			///
 			public int? Context { get; set; }
 
-			///
-			///An array of custom functions tied to a particular action.
-			///
 			public List<CustomFunction> CustomFunctions { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/InstalledApplications/ExtensionConfiguration.cs b/Mozu.Api/Contracts/InstalledApplications/ExtensionConfiguration.cs
old mode 100644
new mode 100755
index 3f183148..2fd69cdb
--- a/Mozu.Api/Contracts/InstalledApplications/ExtensionConfiguration.cs
+++ b/Mozu.Api/Contracts/InstalledApplications/ExtensionConfiguration.cs
@@ -15,19 +15,10 @@
 
 namespace Mozu.Api.Contracts.InstalledApplications
 {
-		///
-		///	Mozu.InstalledApplications.Contracts.ExtensionConfiguration ApiType DOCUMENT_HERE 
-		///
 		public class ExtensionConfiguration
 		{
-			///
-			///The Arc.js application key.
-			///
 			public string ApplicationKey { get; set; }
 
-			///
-			///Custom application-level settings specified as key-value pairs.
-			///
 			public JObject Configuration { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/InstalledApplications/TenantExtensions.cs b/Mozu.Api/Contracts/InstalledApplications/TenantExtensions.cs
old mode 100644
new mode 100755
index f40fee67..5e538155
--- a/Mozu.Api/Contracts/InstalledApplications/TenantExtensions.cs
+++ b/Mozu.Api/Contracts/InstalledApplications/TenantExtensions.cs
@@ -14,24 +14,12 @@
 
 namespace Mozu.Api.Contracts.InstalledApplications
 {
-		///
-		///	Mozu.InstalledApplications.Contracts.TenantExtensions ApiType DOCUMENT_HERE 
-		///
 		public class TenantExtensions
 		{
-			///
-			///The list of actions configured for the site.
-			///
 			public List<CustomFunctionsForAction> Actions { get; set; }
 
-			///
-			///An array of settings that apply to all actions within the application.
-			///
 			public List<ExtensionConfiguration> Configurations { get; set; }
 
-			///
-			///The priority level to assign to application logs. Possible values mirror Apache's log4net: "all", "debug", "info", "warn", "error", "fatal", and "off".
-			///
 			public string DefaultLogLevel { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Location/Coordinates.cs b/Mozu.Api/Contracts/Location/Coordinates.cs
old mode 100644
new mode 100755
index 65dc5f1e..c31f1d98
--- a/Mozu.Api/Contracts/Location/Coordinates.cs
+++ b/Mozu.Api/Contracts/Location/Coordinates.cs
@@ -18,14 +18,8 @@ namespace Mozu.Api.Contracts.Location
 		///
 		public class Coordinates
 		{
-			///
-			///The latitude coordinate of the location.
-			///
 			public double Lat { get; set; }
 
-			///
-			///The longitude coordinate of the location.
-			///
 			public double Lng { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Location/FulfillmentType.cs b/Mozu.Api/Contracts/Location/FulfillmentType.cs
old mode 100644
new mode 100755
index 0f9ff750..464ea88f
--- a/Mozu.Api/Contracts/Location/FulfillmentType.cs
+++ b/Mozu.Api/Contracts/Location/FulfillmentType.cs
@@ -18,14 +18,8 @@ namespace Mozu.Api.Contracts.Location
 		///
 		public class FulfillmentType
 		{
-			///
-			///The system-supplied code that identifies the fulfillment type, which is "DS" for direct ship or "SP" for in-store pickup.
-			///
 			public string Code { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Location/Hours.cs b/Mozu.Api/Contracts/Location/Hours.cs
old mode 100644
new mode 100755
index 494674e6..4599cb2c
--- a/Mozu.Api/Contracts/Location/Hours.cs
+++ b/Mozu.Api/Contracts/Location/Hours.cs
@@ -18,9 +18,6 @@ namespace Mozu.Api.Contracts.Location
 		///
 		public class Hours
 		{
-			///
-			///Descriptive text used as a label for objects, such as field names, facets, date ranges, contact information, and package information.
-			///
 			public string Label { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Location/Location.cs b/Mozu.Api/Contracts/Location/Location.cs
old mode 100644
new mode 100755
index 0668debd..da8da7e0
--- a/Mozu.Api/Contracts/Location/Location.cs
+++ b/Mozu.Api/Contracts/Location/Location.cs
@@ -20,71 +20,34 @@ namespace Mozu.Api.Contracts.Location
 		///
 		public class Location
 		{
-			///
-			///Address information to supply for a contact.
-			///
 			public Address Address { get; set; }
 
-			///
-			///Allow fullfillment with no (or less) stock
-			///
 			public bool AllowFulfillmentWithNoStock { get; set; }
 
+			public List<LocationAttribute> Attributes { get; set; }
+
 			public AuditInfo AuditInfo { get; set; }
 
-			///
-			///User-defined code to assign to this location.
-			///
 			public string Code { get; set; }
 
-			///
-			///The localized description in text for the object, displayed per the locale code. For example, descriptions are used for product descriptions, attributes, and pre-authorization transaction types.
-			///
 			public string Description { get; set; }
 
-			///
-			///The fax number associated with this location.
-			///
 			public string Fax { get; set; }
 
-			///
-			///List of order fulfillment types associated with this location. The location can have fulfillment types of direct ship (DS), in-store pickup (SP), or both.
-			///
 			public List<FulfillmentType> FulfillmentTypes { get; set; }
 
-			///
-			///The geographical coordinates associated with this location.
-			///
 			public Coordinates Geo { get; set; }
 
-			///
-			///Locations is disabled (soft delete)
-			///
 			public bool IsDisabled { get; set; }
 
-			///
-			///List of location types associated with this location. You can associate individual locations with any number of location types.
-			///
 			public List<LocationType> LocationTypes { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
-			///
-			///User-entered notation content for an object, used to save information such as payment, return, account, and order notes.
-			///
 			public string Note { get; set; }
 
-			///
-			///The phone number associated with this location.
-			///
 			public string Phone { get; set; }
 
-			///
-			///List of standard operating hours for each day of the week this location is open for shopper business.
-			///
 			public RegularHours RegularHours { get; set; }
 
 			///
@@ -92,14 +55,8 @@ public class Location
 			///
 			public ShippingOriginContact ShippingOriginContact { get; set; }
 
-			///
-			///If true, this location maintains its own product inventory. If the location uses the direct ship fulfillment type, it must also support inventory.
-			///
 			public bool SupportsInventory { get; set; }
 
-			///
-			///List of tenant-defined tags associated with this location.
-			///
 			public List<string> Tags { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Location/LocationAttribute.cs b/Mozu.Api/Contracts/Location/LocationAttribute.cs
new file mode 100755
index 00000000..1d51cfef
--- /dev/null
+++ b/Mozu.Api/Contracts/Location/LocationAttribute.cs
@@ -0,0 +1,33 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+
+using Mozu.Api.Contracts.Core;
+using Mozu.Api.Contracts.Core.Extensible;
+
+namespace Mozu.Api.Contracts.Location
+{
+		public class LocationAttribute
+		{
+			public Attribute AttributeDefinition { get; set; }
+
+			public int? AttributeDefinitionId { get; set; }
+
+			public AuditInfo AuditInfo { get; set; }
+
+			public string FullyQualifiedName { get; set; }
+
+			public List<object> Values { get; set; }
+
+		}
+
+}
\ No newline at end of file
diff --git a/Mozu.Api/Contracts/Location/LocationCollection.cs b/Mozu.Api/Contracts/Location/LocationCollection.cs
old mode 100644
new mode 100755
index ab612ce7..eb0e5229
--- a/Mozu.Api/Contracts/Location/LocationCollection.cs
+++ b/Mozu.Api/Contracts/Location/LocationCollection.cs
@@ -19,29 +19,14 @@ namespace Mozu.Api.Contracts.Location
 		///
 		public class LocationCollection
 		{
-			///
-			///An array list of objects in the returned collection.
-			///
 			public List<Location> Items { get; set; }
 
-			///
-			///The number of pages returned based on the startIndex and pageSize values specified. This value is system-supplied and read-only.
-			///
 			public int PageCount { get; set; }
 
-			///
-			///The number of results to display on each page when creating paged results from a query. The maximum value is 200.
-			///
 			public int PageSize { get; set; }
 
-			///
-			///When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.
-			///
 			public int StartIndex { get; set; }
 
-			///
-			///The number of results listed in the query collection, represented by a signed 64-bit (8-byte) integer. This value is system-supplied and read-only.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Location/LocationType.cs b/Mozu.Api/Contracts/Location/LocationType.cs
old mode 100644
new mode 100755
index 0af26ad8..776de4e4
--- a/Mozu.Api/Contracts/Location/LocationType.cs
+++ b/Mozu.Api/Contracts/Location/LocationType.cs
@@ -21,14 +21,8 @@ public class LocationType
 		{
 			public AuditInfo AuditInfo { get; set; }
 
-			///
-			///User-defined identifying code for the location type.
-			///
 			public string Code { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Location/LocationUsage.cs b/Mozu.Api/Contracts/Location/LocationUsage.cs
old mode 100644
new mode 100755
index 74d834f6..67c80ee2
--- a/Mozu.Api/Contracts/Location/LocationUsage.cs
+++ b/Mozu.Api/Contracts/Location/LocationUsage.cs
@@ -22,19 +22,10 @@ public class LocationUsage
 		{
 			public AuditInfo AuditInfo { get; set; }
 
-			///
-			///List of location codes to associate with the location usage. At this time, you can only specify one location code in the request for the direct ship location usage type.
-			///
 			public List<string> LocationCodes { get; set; }
 
-			///
-			///List of location type codes associated with the location usage. The location service identifies the locations of the designated type. The in-store pickup (SP) and store finder (storeFinder) location usage types allow specification or multiple location type codes.
-			///
 			public List<string> LocationTypeCodes { get; set; }
 
-			///
-			///The system-defined code used to identify the location usage type, which is "DS" for direct ship, "SP" for in-store pickup, or "storeFinder".
-			///
 			public string LocationUsageTypeCode { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Location/LocationUsageCollection.cs b/Mozu.Api/Contracts/Location/LocationUsageCollection.cs
old mode 100644
new mode 100755
index 8b81d404..2a49536a
--- a/Mozu.Api/Contracts/Location/LocationUsageCollection.cs
+++ b/Mozu.Api/Contracts/Location/LocationUsageCollection.cs
@@ -19,14 +19,8 @@ namespace Mozu.Api.Contracts.Location
 		///
 		public class LocationUsageCollection
 		{
-			///
-			///An array list of objects in the returned collection.
-			///
 			public List<LocationUsage> Items { get; set; }
 
-			///
-			///The number of results listed in the query collection, represented by a signed 64-bit (8-byte) integer. This value is system-supplied and read-only.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Location/RegularHours.cs b/Mozu.Api/Contracts/Location/RegularHours.cs
old mode 100644
new mode 100755
index f33e5138..64b79083
--- a/Mozu.Api/Contracts/Location/RegularHours.cs
+++ b/Mozu.Api/Contracts/Location/RegularHours.cs
@@ -18,39 +18,18 @@ namespace Mozu.Api.Contracts.Location
 		///
 		public class RegularHours
 		{
-			///
-			///The Friday label array describes the range of hours this location is normally open on Fridays. For example: {"Label": "10:00 AM - 6:00 PM"}.
-			///
 			public Hours Friday { get; set; }
 
-			///
-			///The Monday label array describes the range of hours this location is normally open on Mondays. For example: {"Label": "10:00 AM - 6:00 PM"}.
-			///
 			public Hours Monday { get; set; }
 
-			///
-			///The Saturday label array describes the range of hours this location is normally open on Saturdays. For example: {"Label": "10:00 AM - 6:00 PM"}.
-			///
 			public Hours Saturday { get; set; }
 
-			///
-			///The Sunday label array describes the range of hours this location is normally open on Sundays. For example: {"Label": "10:00 AM - 6:00 PM"}.
-			///
 			public Hours Sunday { get; set; }
 
-			///
-			///The Thursday label array describes the range of hours this location is normally open on Thursdays. For example: {"Label": "10:00 AM - 6:00 PM"}.
-			///
 			public Hours Thursday { get; set; }
 
-			///
-			///The Tuesday label array describes the range of hours this location is normally open on Tuesdays. For example: {"Label": "10:00 AM - 6:00 PM"}.
-			///
 			public Hours Tuesday { get; set; }
 
-			///
-			///The Wednesday label array describes the range of hours this location is normally open on Wednesdays. For example: {"Label": "10:00 AM - 6:00 PM"}.
-			///
 			public Hours Wednesday { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Location/ShippingOriginContact.cs b/Mozu.Api/Contracts/Location/ShippingOriginContact.cs
old mode 100644
new mode 100755
index 31aaa46a..cda3e02a
--- a/Mozu.Api/Contracts/Location/ShippingOriginContact.cs
+++ b/Mozu.Api/Contracts/Location/ShippingOriginContact.cs
@@ -29,17 +29,17 @@ public class ShippingOriginContact
 			public string Email { get; set; }
 
 			///
-			///The full first name of a customer or contact name.
+			///The first name of the shipping origin contact.
 			///
 			public string FirstName { get; set; }
 
 			///
-			///The full last name or surname of a customer or contact name.
+			///The last name of the shipping origin contact.
 			///
 			public string LastNameOrSurname { get; set; }
 
 			///
-			///Character string of the middle name or initial for the customer.
+			///The middle name or middle initial of the shipping origin contact.
 			///
 			public string MiddleNameOrInitial { get; set; }
 
diff --git a/Mozu.Api/Contracts/MZDB/EntityCollection.cs b/Mozu.Api/Contracts/MZDB/EntityCollection.cs
old mode 100644
new mode 100755
index e88912d2..24558007
--- a/Mozu.Api/Contracts/MZDB/EntityCollection.cs
+++ b/Mozu.Api/Contracts/MZDB/EntityCollection.cs
@@ -16,34 +16,16 @@
 
 namespace Mozu.Api.Contracts.MZDB
 {
-		///
-		///	Paged collection of entities.
-		///
 		public class EntityCollection
 		{
-			///
-			///A list of requested items. All returned data is provided in an items array.For a failed request, the returned response may be success with an empty item array.
-			///
 			public List<JObject> Items { get; set; }
 
-			///
-			///The total number of pages of the results divided per the `pageSize`.
-			///
 			public int PageCount { get; set; }
 
-			///
-			///The number of results to display on each page when creating paged results from a query. The amount is divided and displayed on the `pageCount `amount of pages. The default is 20 and maximum value is 200 per page.
-			///
 			public int PageSize { get; set; }
 
-			///
-			///When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a `pageSize `of 25, to get the 51st through the 75th items, use `startIndex=50`.
-			///
 			public int StartIndex { get; set; }
 
-			///
-			///The total number of items in the list.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/MZDB/EntityContainer.cs b/Mozu.Api/Contracts/MZDB/EntityContainer.cs
old mode 100644
new mode 100755
index 679f45fd..99b85962
--- a/Mozu.Api/Contracts/MZDB/EntityContainer.cs
+++ b/Mozu.Api/Contracts/MZDB/EntityContainer.cs
@@ -15,39 +15,18 @@
 
 namespace Mozu.Api.Contracts.MZDB
 {
-		///
-		///	Properties of the EntityContainer within a specific tenant and site.
-		///
 		public class EntityContainer
 		{
-			///
-			///The unique identifier for the product catalog. Catalogs are part of a master catalog.
-			///
 			public int? CatalogId { get; set; }
 
-			///
-			///Identifier of the user that created the object. System created and read only.
-			///
 			public string CreateBy { get; set; }
 
-			///
-			///The date and time in UTC format set when the object was created.
-			///
 			public DateTime CreateDate { get; set; }
 
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public string Id { get; set; }
 
-			///
-			///The entity in JSON format.
-			///
 			public JObject Item { get; set; }
 
-			///
-			///The nameSpace and name for the EntityList in the format name@nameSpace.
-			///
 			public string ListFullName { get; set; }
 
 			///
@@ -55,14 +34,8 @@ public class EntityContainer
 			///
 			public string LocaleCode { get; set; }
 
-			///
-			///Unique identifier for the master catalog. 
-			///
 			public int? MasterCatalogId { get; set; }
 
-			///
-			///Unique identifier for the site. This ID is used at all levels of a store, catalog, and tenant to associate objects to a site.
-			///
 			public int? SiteId { get; set; }
 
 			///
@@ -70,19 +43,10 @@ public class EntityContainer
 			///
 			public int TenantId { get; set; }
 
-			///
-			///Identifier of the user that updated the entity most recently.
-			///
 			public string UpdateBy { get; set; }
 
-			///
-			///The date and time in UTC format the object was updated most recently.
-			///
 			public DateTime UpdateDate { get; set; }
 
-			///
-			///Unique identifier of the customer account (shopper or system user). System-supplied and read-only. If the shopper user is anonymous, the user ID represents a system-generated user ID string.
-			///
 			public string UserId { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/MZDB/EntityContainerCollection.cs b/Mozu.Api/Contracts/MZDB/EntityContainerCollection.cs
old mode 100644
new mode 100755
index 75f69edb..6d8c836d
--- a/Mozu.Api/Contracts/MZDB/EntityContainerCollection.cs
+++ b/Mozu.Api/Contracts/MZDB/EntityContainerCollection.cs
@@ -14,34 +14,16 @@
 
 namespace Mozu.Api.Contracts.MZDB
 {
-		///
-		///	Paged collection of EntityContainers within a specific tenant and site. 
-		///
 		public class EntityContainerCollection
 		{
-			///
-			///A list of requested items. All returned data is provided in an items array.For a failed request, the returned response may be success with an empty item array.
-			///
 			public List<EntityContainer> Items { get; set; }
 
-			///
-			///The total number of pages of the results divided per the `pageSize`.
-			///
 			public int PageCount { get; set; }
 
-			///
-			///The number of results to display on each page when creating paged results from a query. The amount is divided and displayed on the `pageCount `amount of pages. The default is 20 and maximum value is 200 per page.
-			///
 			public int PageSize { get; set; }
 
-			///
-			///When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a `pageSize `of 25, to get the 51st through the 75th items, use `startIndex=50`.
-			///
 			public int StartIndex { get; set; }
 
-			///
-			///The total number of items in the list.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/MZDB/EntityList.cs b/Mozu.Api/Contracts/MZDB/EntityList.cs
old mode 100644
new mode 100755
index 86916a66..2645319d
--- a/Mozu.Api/Contracts/MZDB/EntityList.cs
+++ b/Mozu.Api/Contracts/MZDB/EntityList.cs
@@ -16,79 +16,34 @@
 
 namespace Mozu.Api.Contracts.MZDB
 {
-		///
-		///	The definition of an MZDB EntityList which describes the characteristics of the EntityList on a per tenant basis. EntityLists are created at the tenant level, but instances of the EntityLists are implicitly created at the appropriate context level as entities are added or removed from the EntityList.
-		///
 		public class EntityList
 		{
-			///
-			///At which context level are entities stored in the list. Possible values are "tenant", "site", "masterCatalog" or "catalog". Each list instance will exist at this context level for the tenant.
-			///
 			public string ContextLevel { get; set; }
 
-			///
-			///The date and time in UTC format set when the object was created.
-			///
 			public DateTime CreateDate { get; set; }
 
-			///
-			///An IndexedProperty defintion which indicates the property on every entity provided should be used as the unique identifier for the document. Within an EntityList instance each entity must have a unique identifier.
-			///
 			public IndexedProperty IdProperty { get; set; }
 
-			///
-			///An IndexedProperty defintion which indicates a property on every entity provided that should be indexed to enable querying and sorting. Non-indexed properties may be used in queries as long as at least one indexed property is also provided in the query.
-			///
 			public IndexedProperty IndexA { get; set; }
 
-			///
-			///An IndexedProperty defintion which indicates a property on every entity provided that should be indexed to enable querying and sorting. Non-indexed properties may be used in queries as long as at least one indexed property is also provided in the query.
-			///
 			public IndexedProperty IndexB { get; set; }
 
-			///
-			///An IndexedProperty defintion which indicates a property on every entity provided that should be indexed to enable querying and sorting. Non-indexed properties may be used in queries as long as at least one indexed property is also provided in the query.
-			///
 			public IndexedProperty IndexC { get; set; }
 
-			///
-			///An IndexedProperty defintion which indicates a property on every entity provided that should be indexed to enable querying and sorting. Non-indexed properties may be used in queries as long as at least one indexed property is also provided in the query.
-			///
 			public IndexedProperty IndexD { get; set; }
 
-			///
-			///Indicates whether MZDB should store entities in the EntityList instance specific to the localeCode provided. If true, all operations on the EntityList will be filtered by the provided localeCode on the request or using the defautLocaleCode for the context. All entities created in the EntityList will be stored with the localeCode provided on the request or the defautLocaleCode for the context as an additional implicit key. The default value is false.
-			///
 			public bool IsLocaleSpecific { get; set; }
 
-			///
-			///Indicates whether MZDB should clone all of the Entities in the EntityList when cloning an existing sandbox for which this list is already defined. The default value is false.
-			///
 			public bool IsSandboxDataCloningSupported { get; set; }
 
-			///
-			///Indicates whether MZDB should store entities in the EntityList instance specific to the current shopper on the request. If true, all operations on the EntityList will be filtered by the id of the shopper from the shopper claims provided on the request. All entities created in the EntityList will be stored with the id of the shopper from the shopper claims provided on the request as an additional implicit key. The default value is false.
-			///
 			public bool IsShopperSpecific { get; set; }
 
-			///
-			///Indicates whether Enitities in the EntityList are allowed to be accessed from a  storefront.
-			///
 			public bool IsVisibleInStorefront { get; set; }
 
-			///
-			///Metadata content for entities, used by document lists, document type lists, document type, views, entity lists, and list views.
-			///
 			public JObject Metadata { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
-			///
-			///The namespace for the accessible APIs and source capabilities in the core of  APIs.
-			///
 			public string NameSpace { get; set; }
 
 			///
@@ -96,24 +51,12 @@ public class EntityList
 			///
 			public int TenantId { get; set; }
 
-			///
-			///The date and time in UTC format the object was updated most recently.
-			///
 			public DateTime UpdateDate { get; set; }
 
-			///
-			///A string array that determines where the document or entity list displays. The options are , for displaying content in the Custom Schema page in  , and , for displaying content in the site tree in Site Builder (applies only to document lists). The following example demonstrates how to display content across both options:
-			///
 			public List<string> Usages { get; set; }
 
-			///
-			///Indicates whether or not  should assign a generated identifier for each entity in the list or whether a unique identifier will be provided for each identity. If set to false, then a value must be provided for the IdProperty for the list.
-			///
 			public bool UseSystemAssignedId { get; set; }
 
-			///
-			///The view in the site used by associated entities or document lists/list types.
-			///
 			public List<ListView> Views { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/MZDB/EntityListCollection.cs b/Mozu.Api/Contracts/MZDB/EntityListCollection.cs
old mode 100644
new mode 100755
index e8761eb1..a125c4a6
--- a/Mozu.Api/Contracts/MZDB/EntityListCollection.cs
+++ b/Mozu.Api/Contracts/MZDB/EntityListCollection.cs
@@ -14,34 +14,16 @@
 
 namespace Mozu.Api.Contracts.MZDB
 {
-		///
-		///	Paged collection of EntityLists. EntityLists are created at the tenant level, but instances of the EntityLists are implicitly created at the appropriate context level as entities are added or removed from the EntityList.
-		///
 		public class EntityListCollection
 		{
-			///
-			///A list of requested items. All returned data is provided in an items array.For a failed request, the returned response may be success with an empty item array.
-			///
 			public List<EntityList> Items { get; set; }
 
-			///
-			///The total number of pages of the results divided per the `pageSize`.
-			///
 			public int PageCount { get; set; }
 
-			///
-			///The number of results to display on each page when creating paged results from a query. The amount is divided and displayed on the `pageCount `amount of pages. The default is 20 and maximum value is 200 per page.
-			///
 			public int PageSize { get; set; }
 
-			///
-			///When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a `pageSize `of 25, to get the 51st through the 75th items, use `startIndex=50`.
-			///
 			public int StartIndex { get; set; }
 
-			///
-			///The total number of items in the list.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/MZDB/IndexedProperty.cs b/Mozu.Api/Contracts/MZDB/IndexedProperty.cs
old mode 100644
new mode 100755
index e04d5e9e..b6e7bf8d
--- a/Mozu.Api/Contracts/MZDB/IndexedProperty.cs
+++ b/Mozu.Api/Contracts/MZDB/IndexedProperty.cs
@@ -13,19 +13,10 @@
 
 namespace Mozu.Api.Contracts.MZDB
 {
-		///
-		///	Data for indexed properties within the database.
-		///
 		public class IndexedProperty
 		{
-			///
-			///The data type of the source product property, typically of type Bool, DateTime, Number, or String.
-			///
 			public string DataType { get; set; }
 
-			///
-			///A JPath query indicating the property that should be indexed to enable querying and sorting. Non-indexed properties may be used in queries as long as at least one indexed property is also provided in the query.
-			///
 			public string PropertyName { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/MZDB/ListView.cs b/Mozu.Api/Contracts/MZDB/ListView.cs
old mode 100644
new mode 100755
index f213e5e6..96c74ed5
--- a/Mozu.Api/Contracts/MZDB/ListView.cs
+++ b/Mozu.Api/Contracts/MZDB/ListView.cs
@@ -16,19 +16,10 @@
 
 namespace Mozu.Api.Contracts.MZDB
 {
-		///
-		///	Properties for the list view that specifies what fields and content display per page load. All associated fields in the list view correspond with object data.
-		///
 		public class ListView
 		{
-			///
-			///Sets the default sorting for content. Sort does not use AND in determining the order.
-			///
 			public string DefaultSort { get; set; }
 
-			///
-			///The list of fields to display for a view or an associated schema. For example, the address schema would display fields for postal addresses.
-			///
 			public List<ListViewField> Fields { get; set; }
 
 			///
@@ -36,24 +27,12 @@ public class ListView
 			///
 			public string Filter { get; set; }
 
-			///
-			///Metadata content for entities, used by document lists, document type lists, document type, views, entity lists, and list views.
-			///
 			public JObject MetaData { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
-			///
-			///Indicates the security level for the document content as public, administrator, or owner.
-			///
 			public string Security { get; set; }
 
-			///
-			///A string array that determines where the document or entity list displays. The options are , for displaying content in the Custom Schema page in  , and , for displaying content in the site tree in Site Builder (applies only to document lists). The following example demonstrates how to display content across both options:
-			///
 			public List<string> Usages { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/MZDB/ListViewCollection.cs b/Mozu.Api/Contracts/MZDB/ListViewCollection.cs
old mode 100644
new mode 100755
index a155b719..01f8f921
--- a/Mozu.Api/Contracts/MZDB/ListViewCollection.cs
+++ b/Mozu.Api/Contracts/MZDB/ListViewCollection.cs
@@ -14,34 +14,16 @@
 
 namespace Mozu.Api.Contracts.MZDB
 {
-		///
-		///	Paged collection of ListViews. Properties for the list view specify what fields and content display per page load. All associated fields in the list view correspond with object data.
-		///
 		public class ListViewCollection
 		{
-			///
-			///A list of requested items. All returned data is provided in an items array.For a failed request, the returned response may be success with an empty item array.
-			///
 			public List<ListView> Items { get; set; }
 
-			///
-			///The total number of pages of the results divided per the `pageSize`.
-			///
 			public int PageCount { get; set; }
 
-			///
-			///The number of results to display on each page when creating paged results from a query. The amount is divided and displayed on the `pageCount `amount of pages. The default is 20 and maximum value is 200 per page.
-			///
 			public int PageSize { get; set; }
 
-			///
-			///When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a `pageSize `of 25, to get the 51st through the 75th items, use `startIndex=50`.
-			///
 			public int StartIndex { get; set; }
 
-			///
-			///The total number of items in the list.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/MZDB/ListViewField.cs b/Mozu.Api/Contracts/MZDB/ListViewField.cs
old mode 100644
new mode 100755
index 0b479afb..ed8ef6fe
--- a/Mozu.Api/Contracts/MZDB/ListViewField.cs
+++ b/Mozu.Api/Contracts/MZDB/ListViewField.cs
@@ -13,24 +13,12 @@
 
 namespace Mozu.Api.Contracts.MZDB
 {
-		///
-		///	Properties for the field associated to a view.
-		///
 		public class ListViewField
 		{
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
-			///
-			///Targets represent the object, such as an item to apply discounts to(products or orders) or a view field for content. Targets are the dot notations that link to the source document property. For example, firstitem for the direct level or firstitem.seconditem.thirditem for a deeper property.
-			///
 			public string Target { get; set; }
 
-			///
-			///The datatype of the field. Valid values are "string", "integer", "decimal", "date", "bool".
-			///
 			public string Type { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/PaymentService/Address.cs b/Mozu.Api/Contracts/PaymentService/Address.cs
old mode 100644
new mode 100755
index 35adcec7..b8852333
--- a/Mozu.Api/Contracts/PaymentService/Address.cs
+++ b/Mozu.Api/Contracts/PaymentService/Address.cs
@@ -13,49 +13,22 @@
 
 namespace Mozu.Api.Contracts.PaymentService
 {
-		///
-		///	Address information to supply for a contact.
-		///
 		public class Address
 		{
-			///
-			///The associated city.
-			///
 			public string City { get; set; }
 
-			///
-			///The company name associated to this address object.
-			///
 			public string CompanyName { get; set; }
 
-			///
-			///The associated country
-			///
 			public string Country { get; set; }
 
-			///
-			///Address 1
-			///
 			public string Line1 { get; set; }
 
-			///
-			///Address 2
-			///
 			public string Line2 { get; set; }
 
-			///
-			///Address 3
-			///
 			public string Line3 { get; set; }
 
-			///
-			///The associated postal code.
-			///
 			public string PostalCode { get; set; }
 
-			///
-			///The associated state.
-			///
 			public string State { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/PaymentService/Contact.cs b/Mozu.Api/Contracts/PaymentService/Contact.cs
old mode 100644
new mode 100755
index 6946dc8d..a4420910
--- a/Mozu.Api/Contracts/PaymentService/Contact.cs
+++ b/Mozu.Api/Contracts/PaymentService/Contact.cs
@@ -13,34 +13,16 @@
 
 namespace Mozu.Api.Contracts.PaymentService
 {
-		///
-		///	Contact information for an account.
-		///
 		public class Contact
 		{
-			///
-			///Mozu.PaymentService.Contracts.Contact country ApiTypeMember DOCUMENT_HERE 
-			///
 			public string Country { get; set; }
 
-			///
-			///The email address for the customer account and contact. This email may be used for login to the storefront, receiving in-stock product notifications, and subscription mailing lists.
-			///
 			public string Email { get; set; }
 
-			///
-			///The full first name of a customer or contact name.
-			///
 			public string Firstname { get; set; }
 
-			///
-			///The full last name of a customer or contact name.
-			///
 			public string Lastname { get; set; }
 
-			///
-			///The associated contact's phone number.
-			///
 			public string Phone { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/PaymentService/CustomData.cs b/Mozu.Api/Contracts/PaymentService/CustomData.cs
old mode 100644
new mode 100755
index 43523ae3..ef2d7101
--- a/Mozu.Api/Contracts/PaymentService/CustomData.cs
+++ b/Mozu.Api/Contracts/PaymentService/CustomData.cs
@@ -13,19 +13,10 @@
 
 namespace Mozu.Api.Contracts.PaymentService
 {
-		///
-		///	Mozu.PaymentService.Contracts.CustomData ApiType DOCUMENT_HERE 
-		///
 		public class CustomData
 		{
-			///
-			///Key used for metadata defined for objects, including extensible attributes, custom attributes associated with a shipping provider, and search synonyms definitions. This content may be user-defined depending on the object and usage.For search synonym definitions, refer to [Synonym Expansion Types](https://www.mozu.com/docs/Developer/api-guides/search-settings.htm#synonym_expansion_types) for more information about the key usage.
-			///
 			public string Key { get; set; }
 
-			///
-			///The value of a property, used by numerous objects within  including facets, attributes, products, localized content, metadata, capabilities ( and third-party), location inventory adjustment, and more. The value may be a string, integer, or double. Validation may be run against the entered and saved values depending on the object type.
-			///
 			public string Value { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/PaymentService/Extensibility/V1/AdapterContext.cs b/Mozu.Api/Contracts/PaymentService/Extensibility/V1/AdapterContext.cs
new file mode 100755
index 00000000..7262d335
--- /dev/null
+++ b/Mozu.Api/Contracts/PaymentService/Extensibility/V1/AdapterContext.cs
@@ -0,0 +1,27 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+
+
+namespace Mozu.Api.Contracts.PaymentService.Extensibility.V1
+{
+		public class AdapterContext
+		{
+			public List<KeyValueTuple> Configuration { get; set; }
+
+			public List<KeyValueTuple> Settings { get; set; }
+
+			public Transaction Transaction { get; set; }
+
+		}
+
+}
\ No newline at end of file
diff --git a/Mozu.Api/Contracts/PaymentService/Extensibility/V1/Address.cs b/Mozu.Api/Contracts/PaymentService/Extensibility/V1/Address.cs
new file mode 100755
index 00000000..7cf8cbf1
--- /dev/null
+++ b/Mozu.Api/Contracts/PaymentService/Extensibility/V1/Address.cs
@@ -0,0 +1,36 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+
+
+namespace Mozu.Api.Contracts.PaymentService.Extensibility.V1
+{
+		public class Address
+		{
+			public string City { get; set; }
+
+			public string CompanyName { get; set; }
+
+			public string Country { get; set; }
+
+			public string Line1 { get; set; }
+
+			public string Line2 { get; set; }
+
+			public string Line3 { get; set; }
+
+			public string PostalCode { get; set; }
+
+			public string State { get; set; }
+
+		}
+
+}
\ No newline at end of file
diff --git a/Mozu.Api/Contracts/PaymentService/Extensibility/V1/CaptureRequest.cs b/Mozu.Api/Contracts/PaymentService/Extensibility/V1/CaptureRequest.cs
new file mode 100755
index 00000000..33966550
--- /dev/null
+++ b/Mozu.Api/Contracts/PaymentService/Extensibility/V1/CaptureRequest.cs
@@ -0,0 +1,34 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+
+
+namespace Mozu.Api.Contracts.PaymentService.Extensibility.V1
+{
+		public class CaptureRequest
+		{
+			public object AdditionalData { get; set; }
+
+			public decimal Amount { get; set; }
+
+			public string ApiVersion { get; set; }
+
+			public CardInformation Card { get; set; }
+
+			public AdapterContext Context { get; set; }
+
+			public string MethodName { get; set; }
+
+			public CustomerInformation Shopper { get; set; }
+
+		}
+
+}
\ No newline at end of file
diff --git a/Mozu.Api/Contracts/PaymentService/Extensibility/V1/CardInformation.cs b/Mozu.Api/Contracts/PaymentService/Extensibility/V1/CardInformation.cs
new file mode 100755
index 00000000..d5f975b4
--- /dev/null
+++ b/Mozu.Api/Contracts/PaymentService/Extensibility/V1/CardInformation.cs
@@ -0,0 +1,42 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+
+
+namespace Mozu.Api.Contracts.PaymentService.Extensibility.V1
+{
+		public class CardInformation
+		{
+			public string CardHolderName { get; set; }
+
+			public int CardIssueMonth { get; set; }
+
+			public string CardIssueNumber { get; set; }
+
+			public int CardIssueYear { get; set; }
+
+			public string Cvv { get; set; }
+
+			public int ExpireMonth { get; set; }
+
+			public int ExpireYear { get; set; }
+
+			public string Id { get; set; }
+
+			public string NumberPart { get; set; }
+
+			public bool PersistCard { get; set; }
+
+			public string Type { get; set; }
+
+		}
+
+}
\ No newline at end of file
diff --git a/Mozu.Api/Contracts/PaymentService/Extensibility/V1/Contact.cs b/Mozu.Api/Contracts/PaymentService/Extensibility/V1/Contact.cs
new file mode 100755
index 00000000..b73e691e
--- /dev/null
+++ b/Mozu.Api/Contracts/PaymentService/Extensibility/V1/Contact.cs
@@ -0,0 +1,30 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+
+
+namespace Mozu.Api.Contracts.PaymentService.Extensibility.V1
+{
+		public class Contact
+		{
+			public string Country { get; set; }
+
+			public string Email { get; set; }
+
+			public string Firstname { get; set; }
+
+			public string Lastname { get; set; }
+
+			public string Phone { get; set; }
+
+		}
+
+}
\ No newline at end of file
diff --git a/Mozu.Api/Contracts/PaymentService/Extensibility/V1/CustomerInformation.cs b/Mozu.Api/Contracts/PaymentService/Extensibility/V1/CustomerInformation.cs
new file mode 100755
index 00000000..b3f0176c
--- /dev/null
+++ b/Mozu.Api/Contracts/PaymentService/Extensibility/V1/CustomerInformation.cs
@@ -0,0 +1,39 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+
+
+namespace Mozu.Api.Contracts.PaymentService.Extensibility.V1
+{
+		public class CustomerInformation
+		{
+			public Address Address { get; set; }
+
+			public Contact Contact { get; set; }
+
+			public string CurrencyCode { get; set; }
+
+			public string CustomerId { get; set; }
+
+			public List<KeyValueTuple> ExtendedInfo { get; set; }
+
+			public string PhoneNumber { get; set; }
+
+			public string RequestorIp { get; set; }
+
+			public string RequestorUrl { get; set; }
+
+			public string RequestorUserAgent { get; set; }
+
+		}
+
+}
\ No newline at end of file
diff --git a/Mozu.Api/Contracts/PaymentService/Extensibility/V1/GatewayAuthorizationRequest.cs b/Mozu.Api/Contracts/PaymentService/Extensibility/V1/GatewayAuthorizationRequest.cs
new file mode 100755
index 00000000..1328cc02
--- /dev/null
+++ b/Mozu.Api/Contracts/PaymentService/Extensibility/V1/GatewayAuthorizationRequest.cs
@@ -0,0 +1,38 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+
+
+namespace Mozu.Api.Contracts.PaymentService.Extensibility.V1
+{
+		public class GatewayAuthorizationRequest
+		{
+			public object AdditionalData { get; set; }
+
+			public decimal Amount { get; set; }
+
+			public string ApiVersion { get; set; }
+
+			public CardInformation Card { get; set; }
+
+			public AdapterContext Context { get; set; }
+
+			public string MethodName { get; set; }
+
+			public bool PreAuth { get; set; }
+
+			public string RecurringType { get; set; }
+
+			public CustomerInformation Shopper { get; set; }
+
+		}
+
+}
\ No newline at end of file
diff --git a/Mozu.Api/Contracts/PaymentService/Extensibility/V1/GatewayAuthorizeResponse.cs b/Mozu.Api/Contracts/PaymentService/Extensibility/V1/GatewayAuthorizeResponse.cs
new file mode 100755
index 00000000..c93f1480
--- /dev/null
+++ b/Mozu.Api/Contracts/PaymentService/Extensibility/V1/GatewayAuthorizeResponse.cs
@@ -0,0 +1,39 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+
+
+namespace Mozu.Api.Contracts.PaymentService.Extensibility.V1
+{
+		public class GatewayAuthorizeResponse
+		{
+			public string AuthCode { get; set; }
+
+			public string AvsCodes { get; set; }
+
+			public string CvV2Codes { get; set; }
+
+			public bool IsDeclined { get; set; }
+
+			public ConnectionStatuses RemoteConnectionStatus { get; set; }
+
+			public string ResponseCode { get; set; }
+
+			public List<KeyValueTuple> ResponseData { get; set; }
+
+			public string ResponseText { get; set; }
+
+			public string TransactionId { get; set; }
+
+		}
+
+}
\ No newline at end of file
diff --git a/Mozu.Api/Contracts/PaymentService/Extensibility/V1/GatewayCaptureResponse.cs b/Mozu.Api/Contracts/PaymentService/Extensibility/V1/GatewayCaptureResponse.cs
new file mode 100755
index 00000000..2e4910f4
--- /dev/null
+++ b/Mozu.Api/Contracts/PaymentService/Extensibility/V1/GatewayCaptureResponse.cs
@@ -0,0 +1,39 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+
+
+namespace Mozu.Api.Contracts.PaymentService.Extensibility.V1
+{
+		public class GatewayCaptureResponse
+		{
+			public string AuthCode { get; set; }
+
+			public string AvsCodes { get; set; }
+
+			public string CvV2Codes { get; set; }
+
+			public bool IsDeclined { get; set; }
+
+			public ConnectionStatuses RemoteConnectionStatus { get; set; }
+
+			public string ResponseCode { get; set; }
+
+			public List<KeyValueTuple> ResponseData { get; set; }
+
+			public string ResponseText { get; set; }
+
+			public string TransactionId { get; set; }
+
+		}
+
+}
\ No newline at end of file
diff --git a/Mozu.Api/Contracts/PaymentService/Extensibility/V1/GatewayCreditResponse.cs b/Mozu.Api/Contracts/PaymentService/Extensibility/V1/GatewayCreditResponse.cs
new file mode 100755
index 00000000..7c90b14a
--- /dev/null
+++ b/Mozu.Api/Contracts/PaymentService/Extensibility/V1/GatewayCreditResponse.cs
@@ -0,0 +1,33 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+
+
+namespace Mozu.Api.Contracts.PaymentService.Extensibility.V1
+{
+		public class GatewayCreditResponse
+		{
+			public bool IsDeclined { get; set; }
+
+			public ConnectionStatuses RemoteConnectionStatus { get; set; }
+
+			public string ResponseCode { get; set; }
+
+			public List<KeyValueTuple> ResponseData { get; set; }
+
+			public string ResponseText { get; set; }
+
+			public string TransactionId { get; set; }
+
+		}
+
+}
\ No newline at end of file
diff --git a/Mozu.Api/Contracts/PaymentService/Extensibility/V1/GatewayInteraction.cs b/Mozu.Api/Contracts/PaymentService/Extensibility/V1/GatewayInteraction.cs
new file mode 100755
index 00000000..07a748eb
--- /dev/null
+++ b/Mozu.Api/Contracts/PaymentService/Extensibility/V1/GatewayInteraction.cs
@@ -0,0 +1,37 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+
+
+namespace Mozu.Api.Contracts.PaymentService.Extensibility.V1
+{
+		public class GatewayInteraction
+		{
+			public decimal Amount { get; set; }
+
+			public string CardId { get; set; }
+
+			public DateTime CreatedOn { get; set; }
+
+			public int? Id { get; set; }
+
+			public bool IsDeleted { get; set; }
+
+			public bool IsSuccessful { get; set; }
+
+			public List<KeyValueTuple> ResponseData { get; set; }
+
+			public TransactionType TransactionType { get; set; }
+
+		}
+
+}
\ No newline at end of file
diff --git a/Mozu.Api/Contracts/PaymentService/Extensibility/V1/GatewayVoidResponse.cs b/Mozu.Api/Contracts/PaymentService/Extensibility/V1/GatewayVoidResponse.cs
new file mode 100755
index 00000000..984a87f0
--- /dev/null
+++ b/Mozu.Api/Contracts/PaymentService/Extensibility/V1/GatewayVoidResponse.cs
@@ -0,0 +1,33 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+
+
+namespace Mozu.Api.Contracts.PaymentService.Extensibility.V1
+{
+		public class GatewayVoidResponse
+		{
+			public bool IsDeclined { get; set; }
+
+			public ConnectionStatuses RemoteConnectionStatus { get; set; }
+
+			public string ResponseCode { get; set; }
+
+			public List<KeyValueTuple> ResponseData { get; set; }
+
+			public string ResponseText { get; set; }
+
+			public string TransactionId { get; set; }
+
+		}
+
+}
\ No newline at end of file
diff --git a/Mozu.Api/Contracts/PaymentService/Extensibility/V1/KeyValueTuple.cs b/Mozu.Api/Contracts/PaymentService/Extensibility/V1/KeyValueTuple.cs
new file mode 100755
index 00000000..36593566
--- /dev/null
+++ b/Mozu.Api/Contracts/PaymentService/Extensibility/V1/KeyValueTuple.cs
@@ -0,0 +1,24 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+
+
+namespace Mozu.Api.Contracts.PaymentService.Extensibility.V1
+{
+		public class KeyValueTuple
+		{
+			public string Key { get; set; }
+
+			public object Value { get; set; }
+
+		}
+
+}
\ No newline at end of file
diff --git a/Mozu.Api/Contracts/PaymentService/Extensibility/V1/Transaction.cs b/Mozu.Api/Contracts/PaymentService/Extensibility/V1/Transaction.cs
new file mode 100755
index 00000000..0e527bcc
--- /dev/null
+++ b/Mozu.Api/Contracts/PaymentService/Extensibility/V1/Transaction.cs
@@ -0,0 +1,35 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+
+
+namespace Mozu.Api.Contracts.PaymentService.Extensibility.V1
+{
+		public class Transaction
+		{
+			public string ActiveCardId { get; set; }
+
+			public DateTime CreatedOn { get; set; }
+
+			public string CurrencyCode { get; set; }
+
+			public List<GatewayInteraction> GatewayInteractions { get; set; }
+
+			public string Id { get; set; }
+
+			public bool IsRecurring { get; set; }
+
+			public string KiboTransactionId { get; set; }
+
+		}
+
+}
\ No newline at end of file
diff --git a/Mozu.Api/Contracts/PaymentService/FraudScreenResponseData.cs b/Mozu.Api/Contracts/PaymentService/FraudScreenResponseData.cs
old mode 100644
new mode 100755
index 8f6d5c44..2a596b7e
--- a/Mozu.Api/Contracts/PaymentService/FraudScreenResponseData.cs
+++ b/Mozu.Api/Contracts/PaymentService/FraudScreenResponseData.cs
@@ -13,19 +13,10 @@
 
 namespace Mozu.Api.Contracts.PaymentService
 {
-		///
-		///	Mozu.PaymentService.Contracts.FraudScreenResponseData ApiType DOCUMENT_HERE 
-		///
 		public class FraudScreenResponseData
 		{
-			///
-			///Key used for metadata defined for objects, including extensible attributes, custom attributes associated with a shipping provider, and search synonyms definitions. This content may be user-defined depending on the object and usage.For search synonym definitions, refer to [Synonym Expansion Types](https://www.mozu.com/docs/Developer/api-guides/search-settings.htm#synonym_expansion_types) for more information about the key usage.
-			///
 			public string Key { get; set; }
 
-			///
-			///The value of a property, used by numerous objects within  including facets, attributes, products, localized content, metadata, capabilities ( and third-party), location inventory adjustment, and more. The value may be a string, integer, or double. Validation may be run against the entered and saved values depending on the object type.
-			///
 			public string Value { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/PaymentService/GatewayAccount.cs b/Mozu.Api/Contracts/PaymentService/GatewayAccount.cs
old mode 100644
new mode 100755
index 1b5af95c..d75bd283
--- a/Mozu.Api/Contracts/PaymentService/GatewayAccount.cs
+++ b/Mozu.Api/Contracts/PaymentService/GatewayAccount.cs
@@ -19,31 +19,20 @@ namespace Mozu.Api.Contracts.PaymentService
 		///
 		public class GatewayAccount
 		{
-			///
-			///The 2-letter geographic code representing the country for the physical or mailing address. Currently limited to the US.
-			///
+			public List<string> BinPatterns { get; set; }
+
 			public string CountryCode { get; set; }
 
-			///
-			///List of credential fields for the payment gateway account.
-			///
 			public List<GatewayCredentialFieldValue> CredentialFields { get; set; }
 
-			///
-			///Identifier of the payment gateway.
-			///
 			public string GatewayDefinitionId { get; set; }
 
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public string Id { get; set; }
 
-			///
-			///Indicates if the object or feature is active.
-			///
 			public bool IsActive { get; set; }
 
+			public string Name { get; set; }
+
 		}
 
 }
\ No newline at end of file
diff --git a/Mozu.Api/Contracts/PaymentService/GatewayCredentialFieldDefinition.cs b/Mozu.Api/Contracts/PaymentService/GatewayCredentialFieldDefinition.cs
old mode 100644
new mode 100755
index 910951aa..3d4421bc
--- a/Mozu.Api/Contracts/PaymentService/GatewayCredentialFieldDefinition.cs
+++ b/Mozu.Api/Contracts/PaymentService/GatewayCredentialFieldDefinition.cs
@@ -18,24 +18,12 @@ namespace Mozu.Api.Contracts.PaymentService
 		///
 		public class GatewayCredentialFieldDefinition
 		{
-			///
-			///The sequential display order of the gateway in .
-			///
 			public int AdminDisplayOrder { get; set; }
 
-			///
-			///The name that displays for the payment gateway or third-party credentials field. 
-			///
 			public string DisplayName { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
-			///
-			///The name of the Volusion store.
-			///
 			public string VolusionStoreName { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/PaymentService/GatewayCredentialFieldValue.cs b/Mozu.Api/Contracts/PaymentService/GatewayCredentialFieldValue.cs
old mode 100644
new mode 100755
index ab81ced4..8af8ef30
--- a/Mozu.Api/Contracts/PaymentService/GatewayCredentialFieldValue.cs
+++ b/Mozu.Api/Contracts/PaymentService/GatewayCredentialFieldValue.cs
@@ -18,14 +18,10 @@ namespace Mozu.Api.Contracts.PaymentService
 		///
 		public class GatewayCredentialFieldValue
 		{
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
+			public bool IsValueSet { get; set; }
+
 			public string Name { get; set; }
 
-			///
-			///The value of a property, used by numerous objects within  including facets, attributes, products, localized content, metadata, capabilities ( and third-party), location inventory adjustment, and more. The value may be a string, integer, or double. Validation may be run against the entered and saved values depending on the object type.
-			///
 			public string Value { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/PaymentService/GatewayDefinition.cs b/Mozu.Api/Contracts/PaymentService/GatewayDefinition.cs
old mode 100644
new mode 100755
index e81c6a65..4e5aba5e
--- a/Mozu.Api/Contracts/PaymentService/GatewayDefinition.cs
+++ b/Mozu.Api/Contracts/PaymentService/GatewayDefinition.cs
@@ -10,7 +10,9 @@
 
 using System;
 using System.Collections.Generic;
+using Newtonsoft.Json.Linq;
 
+using Mozu.Api.Contracts.Core;
 
 namespace Mozu.Api.Contracts.PaymentService
 {
@@ -19,49 +21,24 @@ namespace Mozu.Api.Contracts.PaymentService
 		///
 		public class GatewayDefinition
 		{
-			///
-			///The 2-letter geographic code representing the country for the physical or mailing address. Currently limited to the US.
-			///
+			public JObject AdministationUi { get; set; }
+
 			public string CountryCode { get; set; }
 
-			///
-			///Credential fields for the payment gateway. For security purposes,  does not return these credential fields.
-			///
 			public List<GatewayCredentialFieldDefinition> CredentialDefinitions { get; set; }
 
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public string Id { get; set; }
 
-			///
-			///The implementing type name of the integration with the payment gateway.
-			///
 			public string IntegrationImplTypeName { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
-			///
-			///Definition of the preauthorization gateway.
-			///
 			public PreAuthorizeDefinition PreAuthorizeDefinition { get; set; }
 
-			///
-			///URL of the production payment service.
-			///
 			public string ProdServiceURL { get; set; }
 
-			///
-			///The types of credit cards supported by the payment gateway.
-			///
 			public List<SupportedCard> SupportedCards { get; set; }
 
-			///
-			///URL of the test payment service environment.
-			///
 			public string TestServiceURL { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/PaymentService/OrderItem.cs b/Mozu.Api/Contracts/PaymentService/OrderItem.cs
old mode 100644
new mode 100755
index f349161f..cd2308f5
--- a/Mozu.Api/Contracts/PaymentService/OrderItem.cs
+++ b/Mozu.Api/Contracts/PaymentService/OrderItem.cs
@@ -14,44 +14,20 @@
 
 namespace Mozu.Api.Contracts.PaymentService
 {
-		///
-		///	Mozu.PaymentService.Contracts.OrderItem ApiType DOCUMENT_HERE 
-		///
 		public class OrderItem
 		{
-			///
-			///customData ApiType DOCUMENT_HERE 
-			///
 			public List<CustomData> CustomData { get; set; }
 
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public string Id { get; set; }
 
-			///
-			///The properties of a product, referenced and used by carts, orders, wish lists, and returns.
-			///
 			public Product Product { get; set; }
 
-			///
-			///The specified quantity of objects and items. This property is used for numerous object types including products, options, components within a product bundle, cart and order items, returned items, shipping line items, items in a digital product. and items associated with types and reservations.
-			///
 			public int Quantity { get; set; }
 
-			///
-			///Mozu.PaymentService.Contracts.OrderItem taxAmount ApiTypeMember DOCUMENT_HERE 
-			///
 			public decimal? TaxAmount { get; set; }
 
-			///
-			///Mozu.PaymentService.Contracts.OrderItem totalAmount ApiTypeMember DOCUMENT_HERE 
-			///
 			public decimal? TotalAmount { get; set; }
 
-			///
-			///Properties of the price per unit of a product, associated with cart and order items. This price is not used for wish lists at this time.
-			///
 			public decimal? UnitPrice { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/PaymentService/PreAuthorizeDefinition.cs b/Mozu.Api/Contracts/PaymentService/PreAuthorizeDefinition.cs
old mode 100644
new mode 100755
index 11d54917..6e8b2675
--- a/Mozu.Api/Contracts/PaymentService/PreAuthorizeDefinition.cs
+++ b/Mozu.Api/Contracts/PaymentService/PreAuthorizeDefinition.cs
@@ -18,24 +18,12 @@ namespace Mozu.Api.Contracts.PaymentService
 		///
 		public class PreAuthorizeDefinition
 		{
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public int Id { get; set; }
 
-			///
-			///The product environment URL associated with the preauthorization gateway.
-			///
 			public string PreAuthorizeProdUrl { get; set; }
 
-			///
-			///The test environment URL associated with the preauthorization gateway.
-			///
 			public string PreAuthorizeTestUrl { get; set; }
 
-			///
-			///The type of preauthorization gateway.
-			///
 			public PreAuthorizeTransactionTypeDataContract Type { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/PaymentService/PreAuthorizeTransactionTypeDataContract.cs b/Mozu.Api/Contracts/PaymentService/PreAuthorizeTransactionTypeDataContract.cs
old mode 100644
new mode 100755
index 68250bd4..abcca42a
--- a/Mozu.Api/Contracts/PaymentService/PreAuthorizeTransactionTypeDataContract.cs
+++ b/Mozu.Api/Contracts/PaymentService/PreAuthorizeTransactionTypeDataContract.cs
@@ -18,19 +18,10 @@ namespace Mozu.Api.Contracts.PaymentService
 		///
 		public class PreAuthorizeTransactionTypeDataContract
 		{
-			///
-			///The localized description in text for the object, displayed per the locale code. For example, descriptions are used for product descriptions, attributes, and pre-authorization transaction types.
-			///
 			public string Description { get; set; }
 
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public int Id { get; set; }
 
-			///
-			///The type of preauthorization transaction.
-			///
 			public string Type { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/PaymentService/Product.cs b/Mozu.Api/Contracts/PaymentService/Product.cs
old mode 100644
new mode 100755
index 85d5dfb6..b4524d51
--- a/Mozu.Api/Contracts/PaymentService/Product.cs
+++ b/Mozu.Api/Contracts/PaymentService/Product.cs
@@ -13,24 +13,12 @@
 
 namespace Mozu.Api.Contracts.PaymentService
 {
-		///
-		///	The properties of a product, referenced and used by carts, orders, wish lists, and returns.
-		///
 		public class Product
 		{
-			///
-			///The unique, user-defined product code of a product, used throughout  to reference and associate to a product.
-			///
 			public string ProductCode { get; set; }
 
-			///
-			///The name of the product that represents a line item in a taxable order or product bundle.
-			///
 			public string ProductName { get; set; }
 
-			///
-			///Mozu.PaymentService.Contracts.Product variantProductCode ApiTypeMember DOCUMENT_HERE 
-			///
 			public string VariantProductCode { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/PaymentService/PublicCard.cs b/Mozu.Api/Contracts/PaymentService/PublicCard.cs
old mode 100644
new mode 100755
index 84a0df64..c775b966
--- a/Mozu.Api/Contracts/PaymentService/PublicCard.cs
+++ b/Mozu.Api/Contracts/PaymentService/PublicCard.cs
@@ -13,54 +13,24 @@
 
 namespace Mozu.Api.Contracts.PaymentService
 {
-		///
-		///	Mozu.PaymentService.Contracts.PublicCard ApiType DOCUMENT_HERE 
-		///
 		public class PublicCard
 		{
-			///
-			///Mozu.PaymentService.Contracts.PublicCard cardHolderName ApiTypeMember DOCUMENT_HERE 
-			///
 			public string CardHolderName { get; set; }
 
-			///
-			///Mozu.PaymentService.Contracts.PublicCard cardIssueMonth ApiTypeMember DOCUMENT_HERE 
-			///
 			public int CardIssueMonth { get; set; }
 
-			///
-			///For Amex Cards, this is an additional field for verification that is used in conjunction with a CVV
-			///
 			public string CardIssueNumber { get; set; }
 
-			///
-			///Mozu.PaymentService.Contracts.PublicCard cardIssueYear ApiTypeMember DOCUMENT_HERE 
-			///
 			public int CardIssueYear { get; set; }
 
-			///
-			///This is the full number of the card.
-			///
 			public string CardNumber { get; set; }
 
-			///
-			///Mozu.PaymentService.Contracts.PublicCard cardType ApiTypeMember DOCUMENT_HERE 
-			///
 			public string CardType { get; set; }
 
-			///
-			///Mozu.PaymentService.Contracts.PublicCard cvv ApiTypeMember DOCUMENT_HERE 
-			///
 			public string Cvv { get; set; }
 
-			///
-			///The two-digit month a credit card expires for a payment method.
-			///
 			public int ExpireMonth { get; set; }
 
-			///
-			///The four-digit year the credit card expires for a payment method.
-			///
 			public int ExpireYear { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/PaymentService/Request/FraudScreenRequest.cs b/Mozu.Api/Contracts/PaymentService/Request/FraudScreenRequest.cs
old mode 100644
new mode 100755
index 149a9b27..1aa41526
--- a/Mozu.Api/Contracts/PaymentService/Request/FraudScreenRequest.cs
+++ b/Mozu.Api/Contracts/PaymentService/Request/FraudScreenRequest.cs
@@ -15,139 +15,58 @@
 
 namespace Mozu.Api.Contracts.PaymentService.Request
 {
-		///
-		///	Mozu.PaymentService.Contracts.Request.FraudScreenRequest ApiType DOCUMENT_HERE 
-		///
 		public class FraudScreenRequest
 		{
-			///
-			///Mozu.PaymentService.Contracts.Request.FraudScreenRequest avsCodes ApiTypeMember DOCUMENT_HERE 
-			///
 			public string AvsCodes { get; set; }
 
-			///
-			///Mozu.PaymentService.Contracts.Request.FraudScreenRequest billingAddress ApiTypeMember DOCUMENT_HERE 
-			///
 			public Address BillingAddress { get; set; }
 
-			///
-			///Mozu.PaymentService.Contracts.Request.FraudScreenRequest billingContact ApiTypeMember DOCUMENT_HERE 
-			///
 			public Contact BillingContact { get; set; }
 
-			///
-			///Mozu.PaymentService.Contracts.Request.FraudScreenRequest cardId ApiTypeMember DOCUMENT_HERE 
-			///
 			public string CardId { get; set; }
 
-			///
-			///Mozu.PaymentService.Contracts.Request.FraudScreenRequest cardNumberPart ApiTypeMember DOCUMENT_HERE 
-			///
 			public string CardNumberPart { get; set; }
 
-			///
-			///The 2-letter geographic code representing the country for the physical or mailing address. Currently limited to the US.
-			///
 			public string CountryCode { get; set; }
 
-			///
-			///Mozu.PaymentService.Contracts.Request.FraudScreenRequest credentialFieldsOverride ApiTypeMember DOCUMENT_HERE 
-			///
 			public List<GatewayCredentialFieldValue> CredentialFieldsOverride { get; set; }
 
-			///
-			///The localized currency code for the monetary amount. 
-			///
 			public string CurrencyCode { get; set; }
 
-			///
-			///Mozu.PaymentService.Contracts.Request.FraudScreenRequest customData ApiTypeMember DOCUMENT_HERE 
-			///
 			public List<CustomData> CustomData { get; set; }
 
-			///
-			///Unique identifier of the customer in , used to associate customers with data, orders, returns, and in-store credit.
-			///
 			public string CustomerId { get; set; }
 
-			///
-			///Mozu.PaymentService.Contracts.Request.FraudScreenRequest cvV2Codes ApiTypeMember DOCUMENT_HERE 
-			///
 			public string CvV2Codes { get; set; }
 
-			///
-			///The two-digit month a credit card expires for a payment method.
-			///
 			public int ExpireMonth { get; set; }
 
-			///
-			///The four-digit year the credit card expires for a payment method.
-			///
 			public int ExpireYear { get; set; }
 
-			///
-			///Mozu.PaymentService.Contracts.Request.FraudScreenRequest gatewayAccountId ApiTypeMember DOCUMENT_HERE 
-			///
 			public string GatewayAccountId { get; set; }
 
-			///
-			///Mozu.PaymentService.Contracts.Request.FraudScreenRequest merchantTransactionId ApiTypeMember DOCUMENT_HERE 
-			///
 			public string MerchantTransactionId { get; set; }
 
-			///
-			///Mozu.PaymentService.Contracts.Request.FraudScreenRequest orderItems ApiTypeMember DOCUMENT_HERE 
-			///
 			public List<OrderItem> OrderItems { get; set; }
 
-			///
-			///Mozu.PaymentService.Contracts.Request.FraudScreenRequest orderNumber ApiTypeMember DOCUMENT_HERE 
-			///
 			public int OrderNumber { get; set; }
 
-			///
-			///Mozu.PaymentService.Contracts.Request.FraudScreenRequest paymentTransactionId ApiTypeMember DOCUMENT_HERE 
-			///
 			public string PaymentTransactionId { get; set; }
 
-			///
-			///The type of payment, such as credit card, check, or PayPal Express. Additional payment types will be supported in future releases.
-			///
 			public string PaymentType { get; set; }
 
-			///
-			///Mozu.PaymentService.Contracts.Request.FraudScreenRequest requestorIp ApiTypeMember DOCUMENT_HERE 
-			///
 			public string RequestorIp { get; set; }
 
-			///
-			///Mozu.PaymentService.Contracts.Request.FraudScreenRequest requestorUrl ApiTypeMember DOCUMENT_HERE 
-			///
 			public string RequestorUrl { get; set; }
 
-			///
-			///Mozu.PaymentService.Contracts.Request.FraudScreenRequest requestorUserAgent ApiTypeMember DOCUMENT_HERE 
-			///
 			public string RequestorUserAgent { get; set; }
 
-			///
-			///Mozu.PaymentService.Contracts.Request.FraudScreenRequest shippingAddress ApiTypeMember DOCUMENT_HERE 
-			///
 			public Address ShippingAddress { get; set; }
 
-			///
-			///Mozu.PaymentService.Contracts.Request.FraudScreenRequest shippingContact ApiTypeMember DOCUMENT_HERE 
-			///
 			public Contact ShippingContact { get; set; }
 
-			///
-			///Mozu.PaymentService.Contracts.Request.FraudScreenRequest shipType ApiTypeMember DOCUMENT_HERE 
-			///
 			public string ShipType { get; set; }
 
-			///
-			///Total is used to indicate the monetary, estimated total amount of the cart or order, including items, sales tax, shipping costs, and other fees. Totals are not estimated for wish lists at this time.
-			///
 			public decimal Total { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/PaymentService/Response/FraudScreen.cs b/Mozu.Api/Contracts/PaymentService/Response/FraudScreen.cs
old mode 100644
new mode 100755
index 004da273..b0828253
--- a/Mozu.Api/Contracts/PaymentService/Response/FraudScreen.cs
+++ b/Mozu.Api/Contracts/PaymentService/Response/FraudScreen.cs
@@ -15,29 +15,14 @@
 
 namespace Mozu.Api.Contracts.PaymentService.Response
 {
-		///
-		///	Mozu.PaymentService.Contracts.Response.FraudScreen ApiType DOCUMENT_HERE 
-		///
 		public class FraudScreen
 		{
-			///
-			///Mozu.PaymentService.Contracts.Response.FraudScreen fraudScreenResponseData ApiTypeMember DOCUMENT_HERE 
-			///
 			public List<FraudScreenResponseData> FraudScreenResponseData { get; set; }
 
-			///
-			///Unique identifier of the payment interaction from the payment gateway.
-			///
 			public int? GatewayInteractionId { get; set; }
 
-			///
-			///The current status of the object.This value is read only. Valid values for this field are: "Active", "Expired", and "Inactive".
-			///
 			public string Status { get; set; }
 
-			///
-			///Mozu.PaymentService.Contracts.Response.FraudScreen transactionId ApiTypeMember DOCUMENT_HERE 
-			///
 			public string TransactionId { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/PaymentService/Response/SyncResponse.cs b/Mozu.Api/Contracts/PaymentService/Response/SyncResponse.cs
old mode 100644
new mode 100755
index 07499ec5..db82fb9a
--- a/Mozu.Api/Contracts/PaymentService/Response/SyncResponse.cs
+++ b/Mozu.Api/Contracts/PaymentService/Response/SyncResponse.cs
@@ -13,24 +13,12 @@
 
 namespace Mozu.Api.Contracts.PaymentService.Response
 {
-		///
-		///	Mozu.PaymentService.Contracts.Response.SyncResponse ApiType DOCUMENT_HERE 
-		///
 		public class SyncResponse
 		{
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public string Id { get; set; }
 
-			///
-			///Mozu.PaymentService.Contracts.Response.SyncResponse isSuccessful ApiTypeMember DOCUMENT_HERE 
-			///
 			public bool IsSuccessful { get; set; }
 
-			///
-			///Credit card Number Part
-			///
 			public string NumberPart { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/PaymentService/SupportedCard.cs b/Mozu.Api/Contracts/PaymentService/SupportedCard.cs
old mode 100644
new mode 100755
index e304f620..ebc69dac
--- a/Mozu.Api/Contracts/PaymentService/SupportedCard.cs
+++ b/Mozu.Api/Contracts/PaymentService/SupportedCard.cs
@@ -18,14 +18,8 @@ namespace Mozu.Api.Contracts.PaymentService
 		///
 		public class SupportedCard
 		{
-			///
-			///Company-defined friendly name that identifies the supported card.
-			///
 			public string FriendlyName { get; set; }
 
-			///
-			///The card type of the supported payment card, such as Visa or Amex.
-			///
 			public string Type { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/PricingRuntime/AppliedDiscount.cs b/Mozu.Api/Contracts/PricingRuntime/AppliedDiscount.cs
new file mode 100755
index 00000000..8b639662
--- /dev/null
+++ b/Mozu.Api/Contracts/PricingRuntime/AppliedDiscount.cs
@@ -0,0 +1,28 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+
+
+namespace Mozu.Api.Contracts.PricingRuntime
+{
+		public class AppliedDiscount
+		{
+			public string CouponCode { get; set; }
+
+			public int? CouponSetId { get; set; }
+
+			public Discount Discount { get; set; }
+
+			public decimal Impact { get; set; }
+
+		}
+
+}
\ No newline at end of file
diff --git a/Mozu.Api/Contracts/PricingRuntime/AppliedLineItemProductDiscount.cs b/Mozu.Api/Contracts/PricingRuntime/AppliedLineItemProductDiscount.cs
new file mode 100755
index 00000000..8c13c0f0
--- /dev/null
+++ b/Mozu.Api/Contracts/PricingRuntime/AppliedLineItemProductDiscount.cs
@@ -0,0 +1,38 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+
+
+namespace Mozu.Api.Contracts.PricingRuntime
+{
+		public class AppliedLineItemProductDiscount
+		{
+			public bool AppliesToSalePrice { get; set; }
+
+			public string CouponCode { get; set; }
+
+			public int? CouponSetId { get; set; }
+
+			public Discount Discount { get; set; }
+
+			public decimal Impact { get; set; }
+
+			public decimal ImpactPerUnit { get; set; }
+
+			public bool IsForced { get; set; }
+
+			public decimal NormalizedImpact { get; set; }
+
+			public int Quantity { get; set; }
+
+		}
+
+}
\ No newline at end of file
diff --git a/Mozu.Api/Contracts/PricingRuntime/AppliedLineItemShippingDiscount.cs b/Mozu.Api/Contracts/PricingRuntime/AppliedLineItemShippingDiscount.cs
new file mode 100755
index 00000000..27da5ffc
--- /dev/null
+++ b/Mozu.Api/Contracts/PricingRuntime/AppliedLineItemShippingDiscount.cs
@@ -0,0 +1,38 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+
+
+namespace Mozu.Api.Contracts.PricingRuntime
+{
+		public class AppliedLineItemShippingDiscount
+		{
+			public string CouponCode { get; set; }
+
+			public int? CouponSetId { get; set; }
+
+			public Discount Discount { get; set; }
+
+			public decimal Impact { get; set; }
+
+			public decimal ImpactPerUnit { get; set; }
+
+			public bool IsForced { get; set; }
+
+			public decimal NormalizedImpact { get; set; }
+
+			public int Quantity { get; set; }
+
+			public string ShippingMethodCode { get; set; }
+
+		}
+
+}
\ No newline at end of file
diff --git a/Mozu.Api/Contracts/PricingRuntime/AppliedOrderShippingDiscount.cs b/Mozu.Api/Contracts/PricingRuntime/AppliedOrderShippingDiscount.cs
new file mode 100755
index 00000000..f93d0b2c
--- /dev/null
+++ b/Mozu.Api/Contracts/PricingRuntime/AppliedOrderShippingDiscount.cs
@@ -0,0 +1,30 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+
+
+namespace Mozu.Api.Contracts.PricingRuntime
+{
+		public class AppliedOrderShippingDiscount
+		{
+			public string CouponCode { get; set; }
+
+			public int? CouponSetId { get; set; }
+
+			public Discount Discount { get; set; }
+
+			public decimal Impact { get; set; }
+
+			public string ShippingMethodCode { get; set; }
+
+		}
+
+}
\ No newline at end of file
diff --git a/Mozu.Api/Contracts/PricingRuntime/Discount.cs b/Mozu.Api/Contracts/PricingRuntime/Discount.cs
new file mode 100755
index 00000000..57413c5e
--- /dev/null
+++ b/Mozu.Api/Contracts/PricingRuntime/Discount.cs
@@ -0,0 +1,63 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+
+
+namespace Mozu.Api.Contracts.PricingRuntime
+{
+		public class Discount
+		{
+			public decimal Amount { get; set; }
+
+			public string AmountType { get; set; }
+
+			public DiscountCondition Condition { get; set; }
+
+			public int DiscountId { get; set; }
+
+			public bool? DoesNotApplyToMultiShipToOrders { get; set; }
+
+			public bool DoesNotApplyToProductsWithSalePrice { get; set; }
+
+			public DateTime? ExpirationDate { get; set; }
+
+			public string FriendlyDescription { get; set; }
+
+			public List<string> IncludedPriceLists { get; set; }
+
+			public decimal? MaxDiscountValuePerRedemption { get; set; }
+
+			public decimal? MaximumDiscountValuePerOrder { get; set; }
+
+			public int? MaximumRedemptionsPerOrder { get; set; }
+
+			public int? MaximumUsesPerUser { get; set; }
+
+			public int? MaxRedemptions { get; set; }
+
+			public string Name { get; set; }
+
+			public int Redemptions { get; set; }
+
+			public bool RequiresAuthenticatedUser { get; set; }
+
+			public string Scope { get; set; }
+
+			public int StackingLayer { get; set; }
+
+			public DiscountTarget Target { get; set; }
+
+			public string Type { get; set; }
+
+		}
+
+}
\ No newline at end of file
diff --git a/Mozu.Api/Contracts/PricingRuntime/DiscountCondition.cs b/Mozu.Api/Contracts/PricingRuntime/DiscountCondition.cs
new file mode 100755
index 00000000..4425d341
--- /dev/null
+++ b/Mozu.Api/Contracts/PricingRuntime/DiscountCondition.cs
@@ -0,0 +1,51 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+
+
+namespace Mozu.Api.Contracts.PricingRuntime
+{
+		public class DiscountCondition
+		{
+			public string CouponCode { get; set; }
+
+			public List<int> CustomerSegmentIds { get; set; }
+
+			public List<int> ExcludedCategoryIds { get; set; }
+
+			public List<string> ExcludedProductCodes { get; set; }
+
+			public DateTime? ExpirationDate { get; set; }
+
+			public List<int> IncludedCategoryIds { get; set; }
+
+			public List<string> IncludedProductCodes { get; set; }
+
+			public decimal? MinimumCategorySubtotalBeforeDiscounts { get; set; }
+
+			public decimal? MinimumLifetimeValueAmount { get; set; }
+
+			public decimal? MinimumOrderAmount { get; set; }
+
+			public int? MinimumQuantityProductsRequiredInCategories { get; set; }
+
+			public int? MinimumQuantityRequiredProducts { get; set; }
+
+			public List<string> PaymentWorkflows { get; set; }
+
+			public bool RequiresCoupon { get; set; }
+
+			public DateTime? StartDate { get; set; }
+
+		}
+
+}
\ No newline at end of file
diff --git a/Mozu.Api/Contracts/PricingRuntime/DiscountTarget.cs b/Mozu.Api/Contracts/PricingRuntime/DiscountTarget.cs
new file mode 100755
index 00000000..9662725b
--- /dev/null
+++ b/Mozu.Api/Contracts/PricingRuntime/DiscountTarget.cs
@@ -0,0 +1,41 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+
+
+namespace Mozu.Api.Contracts.PricingRuntime
+{
+		public class DiscountTarget
+		{
+			public string ExcludedCategoriesOperator { get; set; }
+
+			public List<int> ExcludedCategoryIds { get; set; }
+
+			public List<string> ExcludedProductCodes { get; set; }
+
+			public bool IncludeAllProducts { get; set; }
+
+			public string IncludedCategoriesOperator { get; set; }
+
+			public List<int> IncludedCategoryIds { get; set; }
+
+			public List<string> IncludedProductCodes { get; set; }
+
+			public List<string> ShippingMethods { get; set; }
+
+			public List<string> ShippingZones { get; set; }
+
+			public string Type { get; set; }
+
+		}
+
+}
\ No newline at end of file
diff --git a/Mozu.Api/Contracts/PricingRuntime/ItemTaxContext.cs b/Mozu.Api/Contracts/PricingRuntime/ItemTaxContext.cs
old mode 100644
new mode 100755
index 9f3fc5ea..49c38d05
--- a/Mozu.Api/Contracts/PricingRuntime/ItemTaxContext.cs
+++ b/Mozu.Api/Contracts/PricingRuntime/ItemTaxContext.cs
@@ -20,34 +20,16 @@ namespace Mozu.Api.Contracts.PricingRuntime
 		///
 		public class ItemTaxContext
 		{
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public string Id { get; set; }
 
-			///
-			///The unique, user-defined product code of a product, used throughout  to reference and associate to a product.
-			///
 			public string ProductCode { get; set; }
 
-			///
-			///The specified quantity of objects and items. This property is used for numerous object types including products, options, components within a product bundle, cart and order items, returned items, shipping line items, items in a digital product. and items associated with types and reservations.
-			///
 			public int Quantity { get; set; }
 
-			///
-			///Amount of tax applied to shipping costs for line items in and entire orders.
-			///
 			public decimal ShippingTax { get; set; }
 
-			///
-			///The total tax amount applied to the line item in the order, minus any shipping taxes.
-			///
 			public decimal Tax { get; set; }
 
-			///
-			///Leverage this property within a [tax Arc.js action](https://www.mozu.com/docs/arcjs/commerce-catalog-storefront-tax/commerce-catalog-storefront-tax.htm) to supplement the tax information for this item or object with custom JSON data.
-			///
 			public JObject TaxData { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/PricingRuntime/OrderTaxContext.cs b/Mozu.Api/Contracts/PricingRuntime/OrderTaxContext.cs
old mode 100644
new mode 100755
index cd7d32c2..71db1a9d
--- a/Mozu.Api/Contracts/PricingRuntime/OrderTaxContext.cs
+++ b/Mozu.Api/Contracts/PricingRuntime/OrderTaxContext.cs
@@ -21,29 +21,14 @@ namespace Mozu.Api.Contracts.PricingRuntime
 		///
 		public class OrderTaxContext
 		{
-			///
-			///Tax amount applied to the handling fee defined for orders on this site.
-			///
 			public decimal HandlingFeeTax { get; set; }
 
-			///
-			///Properties of the tax context applicable for line items in an order.
-			///
 			public List<ItemTaxContext> ItemTaxContexts { get; set; }
 
-			///
-			///Tax amount applied to the order.
-			///
 			public decimal OrderTax { get; set; }
 
-			///
-			///Amount of tax applied to shipping costs for line items in and entire orders.
-			///
 			public decimal ShippingTax { get; set; }
 
-			///
-			///Leverage this property within a [tax Arc.js action](https://www.mozu.com/docs/arcjs/commerce-catalog-storefront-tax/commerce-catalog-storefront-tax.htm) to supplement the tax information for this item or object with custom JSON data.
-			///
 			public JObject TaxData { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/PricingRuntime/ProductAttribute.cs b/Mozu.Api/Contracts/PricingRuntime/ProductAttribute.cs
old mode 100644
new mode 100755
index 0e8805fa..45577ed5
--- a/Mozu.Api/Contracts/PricingRuntime/ProductAttribute.cs
+++ b/Mozu.Api/Contracts/PricingRuntime/ProductAttribute.cs
@@ -18,29 +18,14 @@ namespace Mozu.Api.Contracts.PricingRuntime
 		///
 		public class ProductAttribute
 		{
-			///
-			///The data type of the source product property, typically of type Bool, DateTime, Number, or String.
-			///
 			public string DataType { get; set; }
 
-			///
-			///The localized description in text for the object, displayed per the locale code. For example, descriptions are used for product descriptions, attributes, and pre-authorization transaction types.
-			///
 			public string Description { get; set; }
 
-			///
-			///The type of input selection used to define a value for the attribute, including Yes/No, Date, DateTime, List, TextBox, or TextArea.
-			///
 			public string InputType { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
-			///
-			///An attribute value type is either predefined vocabulary by the admin during attribute set up or user-defined with an appropriate type (AdminEntered or ShopperEntered depending on the user). These types are used by products and attributes. The difference between predefined values versus manually entered values is such that the first choice is a set of options to choose from. AdminEntered and ShopperEntered are values that are entered rather than system-supplied and are not stored in the database, but captured during a live commerce operations such as during an order.
-			///
 			public string ValueType { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/PricingRuntime/ProductProperty.cs b/Mozu.Api/Contracts/PricingRuntime/ProductProperty.cs
old mode 100644
new mode 100755
index ec80d833..aac20df1
--- a/Mozu.Api/Contracts/PricingRuntime/ProductProperty.cs
+++ b/Mozu.Api/Contracts/PricingRuntime/ProductProperty.cs
@@ -19,29 +19,14 @@ namespace Mozu.Api.Contracts.PricingRuntime
 		///
 		public class ProductProperty
 		{
-			///
-			///The product attribute details common between all attribute types - properties, options, and extras.
-			///
 			public ProductAttribute AttributeDetail { get; set; }
 
-			///
-			///The fully qualified name of the attribute, which is a user defined attribute identifier.
-			///
 			public string AttributeFQN { get; set; }
 
-			///
-			///Indicates if the object is hidden or breaks inheritance, primarily used by facets, products, and attribute vocabulary values. For example, if true, the attribute vocabulary value does not appear in the list when defining a value for an attribute.
-			///
 			public bool? IsHidden { get; set; }
 
-			///
-			///Indicates if the object has or can have multiple properties or values. If true, the object can have more than one value, selectable by shoppers through the storefront or configurable through the catalogs. 
-			///
 			public bool? IsMultiValue { get; set; }
 
-			///
-			///List of value data for objects.
-			///
 			public List<ProductPropertyValue> Values { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/PricingRuntime/ProductPropertyValue.cs b/Mozu.Api/Contracts/PricingRuntime/ProductPropertyValue.cs
old mode 100644
new mode 100755
index edc7a5fd..3b510f0c
--- a/Mozu.Api/Contracts/PricingRuntime/ProductPropertyValue.cs
+++ b/Mozu.Api/Contracts/PricingRuntime/ProductPropertyValue.cs
@@ -18,14 +18,8 @@ namespace Mozu.Api.Contracts.PricingRuntime
 		///
 		public class ProductPropertyValue
 		{
-			///
-			///If the object value is a String, this value provides that string value, used by vocabulary property values, products, and options.
-			///
 			public string StringValue { get; set; }
 
-			///
-			///The value of a property, used by numerous objects within  including facets, attributes, products, localized content, metadata, capabilities ( and third-party), location inventory adjustment, and more. The value may be a string, integer, or double. Validation may be run against the entered and saved values depending on the object type.
-			///
 			public object Value { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/PricingRuntime/TaxAttribute.cs b/Mozu.Api/Contracts/PricingRuntime/TaxAttribute.cs
old mode 100644
new mode 100755
index 20992944..93439e82
--- a/Mozu.Api/Contracts/PricingRuntime/TaxAttribute.cs
+++ b/Mozu.Api/Contracts/PricingRuntime/TaxAttribute.cs
@@ -14,24 +14,12 @@
 
 namespace Mozu.Api.Contracts.PricingRuntime
 {
-		///
-		///	Mozu.PricingRuntime.Contracts.TaxAttribute ApiType DOCUMENT_HERE 
-		///
 		public class TaxAttribute
 		{
-			///
-			///Unique identifier of the attribute definition.
-			///
 			public int? AttributeDefinitionId { get; set; }
 
-			///
-			///Fully qualified name of the attribute for the order or customer.
-			///
 			public string FullyQualifiedName { get; set; }
 
-			///
-			///List of value data for objects.
-			///
 			public List<object> Values { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/PricingRuntime/TaxContext.cs b/Mozu.Api/Contracts/PricingRuntime/TaxContext.cs
old mode 100644
new mode 100755
index 7762b5f5..0cb06c06
--- a/Mozu.Api/Contracts/PricingRuntime/TaxContext.cs
+++ b/Mozu.Api/Contracts/PricingRuntime/TaxContext.cs
@@ -19,29 +19,14 @@ namespace Mozu.Api.Contracts.PricingRuntime
 		///
 		public class TaxContext
 		{
-			///
-			///Unique identifier of the customer in , used to associate customers with data, orders, returns, and in-store credit.
-			///
 			public string CustomerId { get; set; }
 
-			///
-			///The physical address orders are sent to as a shipping destination. This address may contain multiple lines, city, state/province, country, and zip/postal code. The destination is used to calculate shipping costs.
-			///
 			public Address DestinationAddress { get; set; }
 
-			///
-			///The physical address from which the order or shipment will ship.
-			///
 			public Address OriginAddress { get; set; }
 
-			///
-			///Unique identifier of the tax context.
-			///
 			public string TaxContextId { get; set; }
 
-			///
-			///If the order is exempt from sales tax, the unique identifier of the tax exempt entity.
-			///
 			public string TaxExemptId { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/PricingRuntime/TaxableLineItem.cs b/Mozu.Api/Contracts/PricingRuntime/TaxableLineItem.cs
old mode 100644
new mode 100755
index 8ab72efc..4e543d77
--- a/Mozu.Api/Contracts/PricingRuntime/TaxableLineItem.cs
+++ b/Mozu.Api/Contracts/PricingRuntime/TaxableLineItem.cs
@@ -21,59 +21,52 @@ namespace Mozu.Api.Contracts.PricingRuntime
 		///
 		public class TaxableLineItem
 		{
-			///
-			///Custom data for a given vendor set within the commerce process.
-			///
 			public JObject Data { get; set; }
 
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
+			public Address DestinationAddress { get; set; }
+
+			public decimal? DiscountedTotal { get; set; }
+
+			public decimal? DiscountTotal { get; set; }
+
+			public decimal? FeeTotal { get; set; }
+
+			public decimal? HandlingAmount { get; set; }
+
 			public string Id { get; set; }
 
-			///
-			///Indicates if the item is subject to taxation, used by products, options, extras, cart and order items, line items, and wish lists. If true, the entity is subject to tax based on the relevant tax rate and rules.
-			///
 			public bool? IsTaxable { get; set; }
 
-			///
-			///The sale price of the line item in the order.
-			///
 			public decimal LineItemPrice { get; set; }
 
-			///
-			///Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.
-			///
+			public Address OriginAddress { get; set; }
+
 			public string ProductCode { get; set; }
 
+			public AppliedLineItemProductDiscount ProductDiscount { get; set; }
+
+			public List<AppliedLineItemProductDiscount> ProductDiscounts { get; set; }
+
 			///
-			///The name of the product that represents a line item in a taxable order or product bundle.
+			///The name of the product that represents a line item in a taxable order.
 			///
 			public string ProductName { get; set; }
 
-			///
-			///Properties of the product that represents the line item in the order.
-			///
 			public List<ProductProperty> ProductProperties { get; set; }
 
-			///
-			///The specified quantity of objects and items. This property is used for numerous object types including products, options, components within a product bundle, cart and order items, returned items, shipping line items, items in a digital product. and items associated with types and reservations.
-			///
 			public int Quantity { get; set; }
 
 			///
-			///The reason description for an action, including item return, coupon not valid, and item is taxed. 
+			///The reason the item is either taxed or returned.
 			///
 			public string Reason { get; set; }
 
-			///
-			///The calculated monetary amount of shipping for a line items within and an entire order.
-			///
 			public decimal ShippingAmount { get; set; }
 
-			///
-			///For configurable products, the unique identifier of the product variation that has been selected.
-			///
+			public AppliedLineItemShippingDiscount ShippingDiscount { get; set; }
+
+			public List<AppliedLineItemShippingDiscount> ShippingDiscounts { get; set; }
+
 			public string VariantProductCode { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/PricingRuntime/TaxableOrder.cs b/Mozu.Api/Contracts/PricingRuntime/TaxableOrder.cs
old mode 100644
new mode 100755
index f7bdc574..b7a42604
--- a/Mozu.Api/Contracts/PricingRuntime/TaxableOrder.cs
+++ b/Mozu.Api/Contracts/PricingRuntime/TaxableOrder.cs
@@ -17,43 +17,32 @@
 namespace Mozu.Api.Contracts.PricingRuntime
 {
 		///
-		///	Properties of an order to calculate tax against. When a tax capability is enabled for a tenant,  sends the `TaxableOrder `properties to the capability as read-only, system-supplied information.
+		///	Properties of an order for which to calculate tax. When a tax capability is enabled for a tenant, Mozu sends the TaxableOrder properties to the capability as read-only, system-supplied information.
 		///
 		public class TaxableOrder
 		{
-			///
-			///Collection of attributes that may be paged list or a list, depending on the usage per object and API type.
-			///
 			public List<TaxAttribute> Attributes { get; set; }
 
-			///
-			///3-letter ISO 4217 standard global currency code. Currently, only "USD" (US Dollar) is supported.
-			///
 			public string CurrencyCode { get; set; }
 
-			///
-			///Custom data for a given vendor set within the commerce process.
-			///
 			public JObject Data { get; set; }
 
-			///
-			///The combined price for all handling costs calculated together for shipped orders, not for digital or in-store pickup. This includes all handling costs per the product line items and options, excluding taxes and discounts. 
-			///
+			public AppliedDiscount HandlingDiscount { get; set; }
+
+			public List<AppliedDiscount> HandlingDiscounts { get; set; }
+
 			public decimal HandlingFee { get; set; }
 
-			///
-			///List of line items associated with the order.
-			///
 			public List<TaxableLineItem> LineItems { get; set; }
 
-			///
-			///The date and time the order was submitted for purchase. 
-			///
 			public DateTime OrderDate { get; set; }
 
-			///
-			///The order number that the customer sees on the storefront when they place the order.
-			///
+			public AppliedDiscount OrderDiscount { get; set; }
+
+			public List<AppliedDiscount> OrderDiscounts { get; set; }
+
+			public string OrderId { get; set; }
+
 			public int? OrderNumber { get; set; }
 
 			///
@@ -62,22 +51,24 @@ public class TaxableOrder
 			public string OriginalDocumentCode { get; set; }
 
 			///
-			///The date and time the original order was placed. This date is set when the order is submitted with payment. 
+			///The date and time the original order was placed.
 			///
 			public DateTime OriginalOrderDate { get; set; }
 
-			///
-			///The calculated monetary amount of shipping for a line items within and an entire order.
-			///
 			public decimal ShippingAmount { get; set; }
 
-			///
-			///The tax properties associated with the order.
-			///
+			public AppliedOrderShippingDiscount ShippingDiscount { get; set; }
+
+			public List<AppliedOrderShippingDiscount> ShippingDiscounts { get; set; }
+
+			public string ShippingMethodCode { get; set; }
+
+			public string ShippingMethodName { get; set; }
+
 			public TaxContext TaxContext { get; set; }
 
 			///
-			///The type of request for which to tax this entity, which is Order or Return.
+			///The type of request for which to tax this entity, which is "Order" or "Return."
 			///
 			public string TaxRequestType { get; set; }
 
diff --git a/Mozu.Api/Contracts/PricingRuntime/ThirdParty/ItemTaxContext.cs b/Mozu.Api/Contracts/PricingRuntime/ThirdParty/ItemTaxContext.cs
old mode 100644
new mode 100755
index 28033ba8..526a53e6
--- a/Mozu.Api/Contracts/PricingRuntime/ThirdParty/ItemTaxContext.cs
+++ b/Mozu.Api/Contracts/PricingRuntime/ThirdParty/ItemTaxContext.cs
@@ -19,7 +19,7 @@ namespace Mozu.Api.Contracts.PricingRuntime.ThirdParty
 		public class ItemTaxContext
 		{
 			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
+			///Unique identifier of the line item in the order.
 			///
 			public string Id { get; set; }
 
@@ -29,12 +29,12 @@ public class ItemTaxContext
 			public string ProductCode { get; set; }
 
 			///
-			///The specified quantity of objects and items. This property is used for numerous object types including products, options, components within a product bundle, cart and order items, returned items, shipping line items, items in a digital product. and items associated with types and reservations.
+			///Quantity of the line item in the order.
 			///
 			public int Quantity { get; set; }
 
 			///
-			///Amount of tax applied to shipping costs for line items in and entire orders.
+			///Amount of tax applied to shipping costs for the line item in the order.
 			///
 			public decimal ShippingTax { get; set; }
 
diff --git a/Mozu.Api/Contracts/PricingRuntime/ThirdParty/OrderTaxContext.cs b/Mozu.Api/Contracts/PricingRuntime/ThirdParty/OrderTaxContext.cs
old mode 100644
new mode 100755
index 93916010..bd585ba5
--- a/Mozu.Api/Contracts/PricingRuntime/ThirdParty/OrderTaxContext.cs
+++ b/Mozu.Api/Contracts/PricingRuntime/ThirdParty/OrderTaxContext.cs
@@ -35,7 +35,7 @@ public class OrderTaxContext
 			public decimal OrderTax { get; set; }
 
 			///
-			///Amount of tax applied to shipping costs for line items in and entire orders.
+			///Tax amount applied to the shipping costs on the order.
 			///
 			public decimal ShippingTax { get; set; }
 
diff --git a/Mozu.Api/Contracts/PricingRuntime/ThirdParty/TaxContext.cs b/Mozu.Api/Contracts/PricingRuntime/ThirdParty/TaxContext.cs
old mode 100644
new mode 100755
index 9d40c7ae..62e4e623
--- a/Mozu.Api/Contracts/PricingRuntime/ThirdParty/TaxContext.cs
+++ b/Mozu.Api/Contracts/PricingRuntime/ThirdParty/TaxContext.cs
@@ -20,17 +20,17 @@ namespace Mozu.Api.Contracts.PricingRuntime.ThirdParty
 		public class TaxContext
 		{
 			///
-			///Unique identifier of the customer in , used to associate customers with data, orders, returns, and in-store credit.
+			///Unique identifier of the customer.
 			///
 			public string CustomerId { get; set; }
 
 			///
-			///The physical address orders are sent to as a shipping destination. This address may contain multiple lines, city, state/province, country, and zip/postal code. The destination is used to calculate shipping costs.
+			///The address to which item in the order will ship.
 			///
 			public Address DestinationAddress { get; set; }
 
 			///
-			///The physical address from which the order or shipment will ship.
+			///The address from which the item in the order will ship.
 			///
 			public Address OriginAddress { get; set; }
 
diff --git a/Mozu.Api/Contracts/PricingRuntime/ThirdParty/TaxableOrder.cs b/Mozu.Api/Contracts/PricingRuntime/ThirdParty/TaxableOrder.cs
old mode 100644
new mode 100755
index 4d44f5e3..1ab9904a
--- a/Mozu.Api/Contracts/PricingRuntime/ThirdParty/TaxableOrder.cs
+++ b/Mozu.Api/Contracts/PricingRuntime/ThirdParty/TaxableOrder.cs
@@ -16,13 +16,10 @@
 namespace Mozu.Api.Contracts.PricingRuntime.ThirdParty
 {
 		///
-		///	Properties of an order for which to calculate tax. When a tax capability is enabled for a tenant,  sends the `TaxableOrder `properties to the capability as read-only, system-supplied information.
+		///	Properties of an order for which to calculate tax. When a tax capability is enabled for a tenant, Mozu sends the TaxableOrder properties to the capability as read-only, system-supplied information.
 		///
 		public class TaxableOrder
 		{
-			///
-			///Collection of attributes that may be paged list or a list, depending on the usage per object and API type.
-			///
 			public List<TaxAttribute> Attributes { get; set; }
 
 			///
@@ -30,43 +27,63 @@ public class TaxableOrder
 			///
 			public string CurrencyCode { get; set; }
 
+			public AppliedDiscount HandlingDiscount { get; set; }
+
+			public List<AppliedDiscount> HandlingDiscounts { get; set; }
+
 			///
-			///The combined price for all handling costs calculated together for shipped orders, not for digital or in-store pickup. This includes all handling costs per the product line items and options, excluding taxes and discounts. 
+			///Handling fee associated with the order.
 			///
 			public decimal HandlingFee { get; set; }
 
 			///
-			///List of line items associated with the order.
+			///List of line items in a taxable order object.
 			///
 			public List<TaxableLineItem> LineItems { get; set; }
 
 			///
-			///The date and time the order was submitted for purchase. 
+			///The date and time the order was submitted.
 			///
 			public DateTime OrderDate { get; set; }
 
+			public AppliedDiscount OrderDiscount { get; set; }
+
+			public List<AppliedDiscount> OrderDiscounts { get; set; }
+
+			public string OrderId { get; set; }
+
+			public int? OrderNumber { get; set; }
+
 			///
 			///The unique identifier of the original order, used to track order changes for tax purposes.
 			///
 			public string OriginalDocumentCode { get; set; }
 
 			///
-			///The date and time the original order was placed. This date is set when the order is submitted with payment. 
+			///The date and time the original order was placed.
 			///
 			public DateTime OriginalOrderDate { get; set; }
 
 			///
-			///The calculated monetary amount of shipping for a line items within and an entire order.
+			///The total shipping amount calculated for the order.
 			///
 			public decimal ShippingAmount { get; set; }
 
+			public AppliedOrderShippingDiscount ShippingDiscount { get; set; }
+
+			public List<AppliedOrderShippingDiscount> ShippingDiscounts { get; set; }
+
+			public string ShippingMethodCode { get; set; }
+
+			public string ShippingMethodName { get; set; }
+
 			///
 			///The tax properties associated with the order.
 			///
 			public TaxContext TaxContext { get; set; }
 
 			///
-			///The type of request for which to tax this entity, which is Order or Return.
+			///The type of request for which to tax this entity, which is "Order" or "Return."
 			///
 			public string TaxRequestType { get; set; }
 
diff --git a/Mozu.Api/Contracts/ProductAdmin/ActiveDateRange.cs b/Mozu.Api/Contracts/ProductAdmin/ActiveDateRange.cs
old mode 100644
new mode 100755
index 87e5591a..4a098ae4
--- a/Mozu.Api/Contracts/ProductAdmin/ActiveDateRange.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/ActiveDateRange.cs
@@ -13,19 +13,10 @@
 
 namespace Mozu.Api.Contracts.ProductAdmin
 {
-		///
-		///	Specifies a start date and end date for when associated object is on the live site, if  is set to .If  is set to  ignores this property.
-		///
 		public class ActiveDateRange
 		{
-			///
-			///The date that the product is no longer active on the site.
-			///
 			public DateTime? EndDate { get; set; }
 
-			///
-			///The date that the product starts being active on the site.
-			///
 			public DateTime? StartDate { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/AssignedDiscount.cs b/Mozu.Api/Contracts/ProductAdmin/AssignedDiscount.cs
old mode 100644
new mode 100755
index 67d103ec..dd5e3ff1
--- a/Mozu.Api/Contracts/ProductAdmin/AssignedDiscount.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/AssignedDiscount.cs
@@ -14,29 +14,14 @@
 
 namespace Mozu.Api.Contracts.ProductAdmin
 {
-		///
-		///	Mozu.ProductAdmin.Contracts.AssignedDiscount ApiType DOCUMENT_HERE 
-		///
 		public class AssignedDiscount
 		{
-			///
-			///Basic audit info about the object, including date, time, and user account. This data may be captured when creating, updating, and removing data.
-			///
 			public AuditInfo AuditInfo { get; set; }
 
-			///
-			///The unique identifier of the coupon set.
-			///
 			public string CouponSetCode { get; set; }
 
-			///
-			///The unique, system generated id. You can use this value to further identify the coupon set.This value is ready only.
-			///
 			public int CouponSetId { get; set; }
 
-			///
-			///The unique identifier of the discount.
-			///
 			public int DiscountId { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/Attribute.cs b/Mozu.Api/Contracts/ProductAdmin/Attribute.cs
old mode 100644
new mode 100755
index 35c682e1..37523298
--- a/Mozu.Api/Contracts/ProductAdmin/Attribute.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/Attribute.cs
@@ -16,88 +16,40 @@
 namespace Mozu.Api.Contracts.ProductAdmin
 {
 		///
-		///	Properties of an attribute used to describe customers or orders.
+		///	Details of an attribute used to describe individual aspects of a product.
 		///
 		public class Attribute
 		{
-			///
-			///The administrator name associated with the object/data.
-			///
 			public string AdminName { get; set; }
 
-			///
-			///Merchant-defined code for an extensible attribute. This code may be used to generate an object's fully qualified name, such as for products.
-			///
 			public string AttributeCode { get; set; }
 
-			///
-			///Generated sequence that increments for each attribute and data type combination created. This value is system-supplied and read-only.
-			///
 			public int? AttributeDataTypeSequence { get; set; }
 
-			///
-			///The fully qualified name of the attribute, which is a user defined attribute identifier.
-			///
 			public string AttributeFQN { get; set; }
 
-			///
-			///List of metadata key-value pairs defined for an extensible attribute.
-			///
 			public List<AttributeMetadataItem> AttributeMetadata { get; set; }
 
-			///
-			///Generated sequence that increments for each product attribute created. This value is system-supplied and read-only.
-			///
 			public int? AttributeSequence { get; set; }
 
-			///
-			///Identifier and datetime stamp information recorded when a user or application creates, updates, or deletes a resource entity. This value is system-supplied and read-only.
-			///
 			public AuditInfo AuditInfo { get; set; }
 
-			///
-			///Complex type that contains content for a language specified by LocaleCode.
-			///
 			public AttributeLocalizedContent Content { get; set; }
 
-			///
-			///The data type of the source product property, typically of type Bool, DateTime, Number, or String.
-			///
 			public string DataType { get; set; }
 
-			///
-			///The type of input selection used to define a value for the attribute, including Yes/No, Date, DateTime, List, TextBox, or TextArea.
-			///
 			public string InputType { get; set; }
 
-			///
-			///If true, the product attribute is an add-on configuration made by the shopper that does not represent a product variation, such as a monogram.
-			///
 			public bool? IsExtra { get; set; }
 
-			///
-			///If true, the product attribute is a merchant- or shopper-configurable option, such as size or color, that represents a product variation.
-			///
 			public bool? IsOption { get; set; }
 
-			///
-			///If true, the product attribute describes aspects of the product that do not represent an option configurable by the shopper, such as screen resolution or brand.
-			///
 			public bool? IsProperty { get; set; }
 
-			///
-			///The localized content associated with the object.
-			///
 			public List<AttributeLocalizedContent> LocalizedContent { get; set; }
 
-			///
-			///The unique identifier of the master catalog associated with the entity.
-			///
 			public int? MasterCatalogId { get; set; }
 
-			///
-			///The namespace for the accessible APIs and source capabilities in the core of  APIs.
-			///
 			public string Namespace { get; set; }
 
 			///
@@ -105,19 +57,10 @@ public class Attribute
 			///
 			public AttributeSearchSettings SearchSettings { get; set; }
 
-			///
-			///Properties used when validating a value entered for an object, including extensible attributes, products attributes, and database entries.
-			///
 			public AttributeValidation Validation { get; set; }
 
-			///
-			///An attribute value type is either predefined vocabulary by the admin during attribute set up or user-defined with an appropriate type (AdminEntered or ShopperEntered depending on the user). These types are used by products and attributes. The difference between predefined values versus manually entered values is such that the first choice is a set of options to choose from. AdminEntered and ShopperEntered are values that are entered rather than system-supplied and are not stored in the database, but captured during a live commerce operations such as during an order.
-			///
 			public string ValueType { get; set; }
 
-			///
-			///List of valid vocabulary values defined for an attribute.
-			///
 			public List<AttributeVocabularyValue> VocabularyValues { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/AttributeCollection.cs b/Mozu.Api/Contracts/ProductAdmin/AttributeCollection.cs
old mode 100644
new mode 100755
index f0e258c2..94342503
--- a/Mozu.Api/Contracts/ProductAdmin/AttributeCollection.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/AttributeCollection.cs
@@ -15,30 +15,18 @@
 namespace Mozu.Api.Contracts.ProductAdmin
 {
 		///
-		///	Array list of customer or order attributes.
+		///	Paged list of defined product attributes.
 		///
 		public class AttributeCollection
 		{
-			///
-			///An array list of objects in the returned collection.
-			///
 			public List<Attribute> Items { get; set; }
 
-			///
-			///The number of pages returned based on the startIndex and pageSize values specified. This value is system-supplied and read-only.
-			///
 			public int PageCount { get; set; }
 
-			///
-			///The number of results to display on each page when creating paged results from a query. The maximum value is 200.
-			///
 			public int PageSize { get; set; }
 
 			public int StartIndex { get; set; }
 
-			///
-			///The number of results listed in the query collection, represented by a signed 64-bit (8-byte) integer. This value is system-supplied and read-only.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/AttributeInProductType.cs b/Mozu.Api/Contracts/ProductAdmin/AttributeInProductType.cs
old mode 100644
new mode 100755
index 0938bc20..6b366a52
--- a/Mozu.Api/Contracts/ProductAdmin/AttributeInProductType.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/AttributeInProductType.cs
@@ -19,59 +19,26 @@ namespace Mozu.Api.Contracts.ProductAdmin
 		///
 		public class AttributeInProductType
 		{
-			///
-			///The product attribute details common between all attribute types - properties, options, and extras.
-			///
 			public Attribute AttributeDetail { get; set; }
 
-			///
-			///The fully qualified name of the attribute, which is a user defined attribute identifier.
-			///
 			public string AttributeFQN { get; set; }
 
-			///
-			///Defines the intended display of this attribute in the storefront. Options include Drop Down, Image Picker, and Radio Buttons.
-			///
 			public AttributeInProductTypeDisplayInfo DisplayInfo { get; set; }
 
-			///
-			///If true, this property is not available on the storefront. If false, this property will be available on storefront. The IsHiddenProperty hides the property from the customer, but is still available from the API.
-			///
 			public bool? IsAdminOnlyProperty { get; set; }
 
-			///
-			///If true, this property is hidden on the storefront. If false, this property is not hidden from the storefront.
-			///
 			public bool? IsHiddenProperty { get; set; }
 
-			///
-			///If true, this entity is inherited from the base type. If false, this entity is not inherited from the base type.
-			///
 			public bool? IsInheritedFromBaseType { get; set; }
 
-			///
-			///If true, this attribute has more than one possible value.
-			///
 			public bool? IsMultiValueProperty { get; set; }
 
-			///
-			///If True this property will not be returned storefront product listings (Search,GetProduct) it will still be returned on GetProduct, ValidateProduct...)
-			///
 			public bool? IsProductDetailsOnlyProperty { get; set; }
 
-			///
-			///If true, the entity is required by the admin. If false, the entity is not required by the admin.
-			///
 			public bool? IsRequiredByAdmin { get; set; }
 
-			///
-			///Integer that represents the sequence order of the attribute.
-			///
 			public int? Order { get; set; }
 
-			///
-			///List of valid vocabulary values defined for an attribute.
-			///
 			public List<AttributeVocabularyValueInProductType> VocabularyValues { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/AttributeInProductTypeDisplayInfo.cs b/Mozu.Api/Contracts/ProductAdmin/AttributeInProductTypeDisplayInfo.cs
old mode 100644
new mode 100755
index 888bc569..618bba5e
--- a/Mozu.Api/Contracts/ProductAdmin/AttributeInProductTypeDisplayInfo.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/AttributeInProductTypeDisplayInfo.cs
@@ -13,14 +13,8 @@
 
 namespace Mozu.Api.Contracts.ProductAdmin
 {
-		///
-		///	Properties for the intended view of the product attribute in the storefront.
-		///
 		public class AttributeInProductTypeDisplayInfo
 		{
-			///
-			///Defines the intended display of this attribute in the storefront. Options include Drop Down, Image Picker, and Radio Buttons.
-			///
 			public string DisplayIntention { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/AttributeLocalizedContent.cs b/Mozu.Api/Contracts/ProductAdmin/AttributeLocalizedContent.cs
old mode 100644
new mode 100755
index f783996d..cf61906a
--- a/Mozu.Api/Contracts/ProductAdmin/AttributeLocalizedContent.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/AttributeLocalizedContent.cs
@@ -14,23 +14,14 @@
 namespace Mozu.Api.Contracts.ProductAdmin
 {
 		///
-		///	The localized name and description of the attribute, displayed in the locale defined for the master catalog.
+		///	Localized content displayed in the storefront for this attribute.
 		///
 		public class AttributeLocalizedContent
 		{
-			///
-			///The localized description in text for the object, displayed per the locale code. For example, descriptions are used for product descriptions, attributes, and pre-authorization transaction types.
-			///
 			public string Description { get; set; }
 
-			///
-			///Language used for the entity. Currently, only "en-US" is supported.
-			///
 			public string LocaleCode { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/AttributeMetadataItem.cs b/Mozu.Api/Contracts/ProductAdmin/AttributeMetadataItem.cs
old mode 100644
new mode 100755
index 532879c0..4fdc7b95
--- a/Mozu.Api/Contracts/ProductAdmin/AttributeMetadataItem.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/AttributeMetadataItem.cs
@@ -14,18 +14,12 @@
 namespace Mozu.Api.Contracts.ProductAdmin
 {
 		///
-		///	Properties of a metadata item defined for an attribute.
+		///	Item used to define additional key-value pairs of data associated with a product attribute.
 		///
 		public class AttributeMetadataItem
 		{
-			///
-			///Key used for metadata defined for objects, including extensible attributes, custom attributes associated with a shipping provider, and search synonyms definitions. This content may be user-defined depending on the object and usage.For search synonym definitions, refer to [Synonym Expansion Types](https://www.mozu.com/docs/Developer/api-guides/search-settings.htm#synonym_expansion_types) for more information about the key usage.
-			///
 			public string Key { get; set; }
 
-			///
-			///The value of a property, used by numerous objects within  including facets, attributes, products, localized content, metadata, capabilities ( and third-party), location inventory adjustment, and more. The value may be a string, integer, or double. Validation may be run against the entered and saved values depending on the object type.
-			///
 			public string Value { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/AttributeSearchSettings.cs b/Mozu.Api/Contracts/ProductAdmin/AttributeSearchSettings.cs
old mode 100644
new mode 100755
index 57c01ce7..2e1d4c16
--- a/Mozu.Api/Contracts/ProductAdmin/AttributeSearchSettings.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/AttributeSearchSettings.cs
@@ -18,14 +18,8 @@ namespace Mozu.Api.Contracts.ProductAdmin
 		///
 		public class AttributeSearchSettings
 		{
-			///
-			///Indicates whether the attribute should be able to be used in filters, facets, and sorting on the public storefront.
-			///
 			public bool? AllowFilteringAndSortingInStorefront { get; set; }
 
-			///
-			///Specifies whether to create a case-sensitive Solr search index. The default is .
-			///
 			public bool? IndexValueWithCase { get; set; }
 
 			///
@@ -34,12 +28,12 @@ public class AttributeSearchSettings
 			public bool SearchableInAdmin { get; set; }
 
 			///
-			///Indicates if the attribute value is searchable on the public storefront.
+			///Indicates whether the attribute value is searchable on the public storefront.
 			///
 			public bool SearchableInStorefront { get; set; }
 
 			///
-			///Indicates what kind of values search queries and returns. If true, the system indexes the display value of string attributes instead of the canonical value for searching. Always use the canonical value for filtering. This does not apply for non-string attributes.
+			///If true, the system indexs the display value of string attributes instead of the canonical value for searching. Always use the canonical value for filtering. This does not apply for for non-string attributes.
 			///
 			public bool SearchDisplayValue { get; set; }
 
diff --git a/Mozu.Api/Contracts/ProductAdmin/AttributeTypeRule.cs b/Mozu.Api/Contracts/ProductAdmin/AttributeTypeRule.cs
old mode 100644
new mode 100755
index 0c52b142..9a18468a
--- a/Mozu.Api/Contracts/ProductAdmin/AttributeTypeRule.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/AttributeTypeRule.cs
@@ -18,24 +18,12 @@ namespace Mozu.Api.Contracts.ProductAdmin
 		///
 		public class AttributeTypeRule
 		{
-			///
-			///The data type of the attribute. There are four valid data types: "Bool", "DateTime", "Number", "String"
-			///
 			public string AttributeDataType { get; set; }
 
-			///
-			///An attribute's data type would be either "NotSpecified", "Textbox", "Textarea", "Date", "DateTime", "Dropdown", "Listbox", "Radio", "Currency", or "Checkbox" and will be a valid value defined in the type rules resource.
-			///
 			public string AttributeInputType { get; set; }
 
-			///
-			///Describes how an attribute will be used. Valid types are "Extra", "Option", and "Property".
-			///
 			public string AttributeUsageType { get; set; }
 
-			///
-			///An attribute value type is either predefined vocabulary by the admin during product attribute set up or it can be "AdminEntered" or "ShopperEntered". The difference between predefined values versus manually entered values is such that the first choice is a set of options to choose from. AdminEntered and ShopperEntered are values that are entered rather than system-supplied and are not stored in the database, but captured during a live commerce operations such as during an order.
-			///
 			public string AttributeValueType { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/AttributeTypeRuleCollection.cs b/Mozu.Api/Contracts/ProductAdmin/AttributeTypeRuleCollection.cs
old mode 100644
new mode 100755
index b4772e32..a6acf1cd
--- a/Mozu.Api/Contracts/ProductAdmin/AttributeTypeRuleCollection.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/AttributeTypeRuleCollection.cs
@@ -19,26 +19,14 @@ namespace Mozu.Api.Contracts.ProductAdmin
 		///
 		public class AttributeTypeRuleCollection
 		{
-			///
-			///An array list of objects in the returned collection.
-			///
 			public List<AttributeTypeRule> Items { get; set; }
 
-			///
-			///The number of pages returned based on the startIndex and pageSize values specified. This value is system-supplied and read-only.
-			///
 			public int PageCount { get; set; }
 
-			///
-			///The number of results to display on each page when creating paged results from a query. The maximum value is 200.
-			///
 			public int PageSize { get; set; }
 
 			public int StartIndex { get; set; }
 
-			///
-			///The number of results listed in the query collection, represented by a signed 64-bit (8-byte) integer. This value is system-supplied and read-only.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/AttributeValidation.cs b/Mozu.Api/Contracts/ProductAdmin/AttributeValidation.cs
old mode 100644
new mode 100755
index b9f42205..f033ae92
--- a/Mozu.Api/Contracts/ProductAdmin/AttributeValidation.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/AttributeValidation.cs
@@ -14,43 +14,22 @@
 namespace Mozu.Api.Contracts.ProductAdmin
 {
 		///
-		///	Validates the attribute configured for the customer in the storefront against the attribute configured in .
+		///	Validates the attribute configured for the product in the storefront against the attribute configured in product admin.
 		///
 		public class AttributeValidation
 		{
-			///
-			///The maximum date allowed including month, day, and year. System-supplied and read-only.
-			///
 			public DateTime? MaxDateValue { get; set; }
 
-			///
-			///The maximum number that can be entered as a value for an extensible attribute.
-			///
 			public decimal? MaxNumericValue { get; set; }
 
-			///
-			///The maximum character length possible for a string value entered for an extensible attribute.
-			///
 			public int? MaxStringLength { get; set; }
 
-			///
-			///The minimum date allowed including month, day, and year. System-supplied and read-only.
-			///
 			public DateTime? MinDateValue { get; set; }
 
-			///
-			///The minimum numeric value required to validate an extensible attribute.
-			///
 			public decimal? MinNumericValue { get; set; }
 
-			///
-			///The minimum character length possible for a string value entered for an extensible attribute.
-			///
 			public int? MinStringLength { get; set; }
 
-			///
-			///Regular expression used to process and validate an extensible attribute value that require special formatting, such as phone numbers.
-			///
 			public string RegularExpression { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/AttributeVocabularyValue.cs b/Mozu.Api/Contracts/ProductAdmin/AttributeVocabularyValue.cs
old mode 100644
new mode 100755
index 93da6729..5473802c
--- a/Mozu.Api/Contracts/ProductAdmin/AttributeVocabularyValue.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/AttributeVocabularyValue.cs
@@ -15,38 +15,20 @@
 namespace Mozu.Api.Contracts.ProductAdmin
 {
 		///
-		///	Properties of a vocabulary value defined for an extensible attribute.
+		///	Properties of an individual vocabulary value for an attribute. For example, a "color" attribute might have the following vocabulary values: Red, Blue, Green.
 		///
 		public class AttributeVocabularyValue
 		{
-			///
-			///Complex type that contains content for a language specified by LocaleCode.
-			///
 			public AttributeVocabularyValueLocalizedContent Content { get; set; }
 
-			///
-			///The order in which the attribute value displays. If you omit a value for this property,  infers the display order from the attribute value's position the list.
-			///
 			public int? DisplayOrder { get; set; }
 
-			///
-			///The localized content associated with the object.
-			///
 			public List<AttributeVocabularyValueLocalizedContent> LocalizedContent { get; set; }
 
-			///
-			///The name of the product that represents a line item in a taxable order or product bundle.
-			///
 			public string ProductName { get; set; }
 
-			///
-			///The value of a property, used by numerous objects within  including facets, attributes, products, localized content, metadata, capabilities ( and third-party), location inventory adjustment, and more. The value may be a string, integer, or double. Validation may be run against the entered and saved values depending on the object type.
-			///
 			public object Value { get; set; }
 
-			///
-			///The number that denotes the order of the entity value within a list of entity values.
-			///
 			public int? ValueSequence { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/AttributeVocabularyValueDisplayInfo.cs b/Mozu.Api/Contracts/ProductAdmin/AttributeVocabularyValueDisplayInfo.cs
old mode 100644
new mode 100755
index 932e907c..a127a7d6
--- a/Mozu.Api/Contracts/ProductAdmin/AttributeVocabularyValueDisplayInfo.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/AttributeVocabularyValueDisplayInfo.cs
@@ -13,24 +13,12 @@
 
 namespace Mozu.Api.Contracts.ProductAdmin
 {
-		///
-		///	Provides the display information for attribute vocabulary values. 
-		///
 		public class AttributeVocabularyValueDisplayInfo
 		{
-			///
-			///The identifier of the image in the  CMS. Supply a value for either the CMS ID or Image URL parameter.
-			///
 			public string CmsId { get; set; }
 
-			///
-			///Hex value for a color to display in a color picker. This is an HTML supported code for color.
-			///
 			public string ColorValue { get; set; }
 
-			///
-			///The URL link for the image file associated with a product or category.
-			///
 			public string ImageUrl { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/AttributeVocabularyValueInProductType.cs b/Mozu.Api/Contracts/ProductAdmin/AttributeVocabularyValueInProductType.cs
old mode 100644
new mode 100755
index 71f488cc..41dc9e93
--- a/Mozu.Api/Contracts/ProductAdmin/AttributeVocabularyValueInProductType.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/AttributeVocabularyValueInProductType.cs
@@ -18,24 +18,12 @@ namespace Mozu.Api.Contracts.ProductAdmin
 		///
 		public class AttributeVocabularyValueInProductType
 		{
-			///
-			///Defines the intended display of this attribute in the storefront. Options include Drop Down, Image Picker, and Radio Buttons.
-			///
 			public AttributeVocabularyValueDisplayInfo DisplayInfo { get; set; }
 
-			///
-			///Integer that represents the sequence order of the attribute.
-			///
 			public int? Order { get; set; }
 
-			///
-			///The value of a property, used by numerous objects within  including facets, attributes, products, localized content, metadata, capabilities ( and third-party), location inventory adjustment, and more. The value may be a string, integer, or double. Validation may be run against the entered and saved values depending on the object type.
-			///
 			public object Value { get; set; }
 
-			///
-			///Navigates vocabulary value details for an attribute defined for a product type.
-			///
 			public AttributeVocabularyValue VocabularyValueDetail { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/AttributeVocabularyValueLocalizedContent.cs b/Mozu.Api/Contracts/ProductAdmin/AttributeVocabularyValueLocalizedContent.cs
old mode 100644
new mode 100755
index 80f7dc35..a07a2601
--- a/Mozu.Api/Contracts/ProductAdmin/AttributeVocabularyValueLocalizedContent.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/AttributeVocabularyValueLocalizedContent.cs
@@ -18,14 +18,8 @@ namespace Mozu.Api.Contracts.ProductAdmin
 		///
 		public class AttributeVocabularyValueLocalizedContent
 		{
-			///
-			///Language used for the entity. Currently, only "en-US" is supported.
-			///
 			public string LocaleCode { get; set; }
 
-			///
-			///If the object value is a String, this value provides that string value, used by vocabulary property values, products, and options.
-			///
 			public string StringValue { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/BundledProduct.cs b/Mozu.Api/Contracts/ProductAdmin/BundledProduct.cs
old mode 100644
new mode 100755
index dea32dd2..b0434c04
--- a/Mozu.Api/Contracts/ProductAdmin/BundledProduct.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/BundledProduct.cs
@@ -21,27 +21,27 @@ namespace Mozu.Api.Contracts.ProductAdmin
 		public class BundledProduct
 		{
 			///
-			///List of supported types of fulfillment for the product or variation. The types include direct ship, in-store pickup, or both.
+			///Indicates the fulfillment types that the product supports.
 			///
 			public List<string> FulfillmentTypesSupported { get; set; }
 
 			///
-			///Height of a package or bundle package in imperial units of feet and inches.
+			///Height of the bundle package in imperial units of feet and inches.
 			///
 			public Measurement PackageHeight { get; set; }
 
 			///
-			///Length of a package or bundle package in imperial units of feet and inches.
+			///Length of the bundle package in imperial units of feet and inches.
 			///
 			public Measurement PackageLength { get; set; }
 
 			///
-			///Weight of a package or bundle package in imperial units of pounds and ounces.
+			///Weight of the bundle package in imperial units of pounds and ounces.
 			///
 			public Measurement PackageWeight { get; set; }
 
 			///
-			///Width of a package or bundle package in imperial units of feet and inches.
+			///Width of the bundle package in imperial units of feet and inches.
 			///
 			public Measurement PackageWidth { get; set; }
 
@@ -56,12 +56,12 @@ public class BundledProduct
 			public string ProductCode { get; set; }
 
 			///
-			///The name of the product that represents a line item in a taxable order or product bundle.
+			///The read-only name of the component in a bundled product.
 			///
 			public string ProductName { get; set; }
 
 			///
-			///The specified quantity of objects and items. This property is used for numerous object types including products, options, components within a product bundle, cart and order items, returned items, shipping line items, items in a digital product. and items associated with types and reservations.
+			///The quantity of an individual component product in a bundle. For example, if a product bundle represents a 10-pack of socks, the quantity value for the bundled product would be 10.
 			///
 			public int Quantity { get; set; }
 
diff --git a/Mozu.Api/Contracts/ProductAdmin/Category.cs b/Mozu.Api/Contracts/ProductAdmin/Category.cs
old mode 100644
new mode 100755
index 535130e9..168de684
--- a/Mozu.Api/Contracts/ProductAdmin/Category.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/Category.cs
@@ -15,85 +15,40 @@
 namespace Mozu.Api.Contracts.ProductAdmin
 {
 		///
-		///	A descriptive container that groups products. A category is merchant defined with associated products and discounts as configured. GThe storefront displays products in a hierarchy of categories. As such, categories can include a nesting of sub-categories to organize products and product options per set guidelines such as color, brand, material, and size.
+		///	A descriptive container in a storefront hierarchy to organize collections of products.
 		///
 		public class Category
 		{
-			///
-			///Identifier and datetime stamp information recorded when a user or application creates, updates, or deletes a resource entity. This value is system-supplied and read-only.
-			///
 			public AuditInfo AuditInfo { get; set; }
 
 			public int? CatalogId { get; set; }
 
-			///
-			///External unique identifier of the category.
-			///
 			public string CategoryCode { get; set; }
 
-			///
-			///Specifies the type of category. The following are the valid values:* * * 
-			///
 			public string CategoryType { get; set; }
 
-			///
-			///The number of children (subcategories, for example) that stem from a parent (top-level category).
-			///
 			public int? ChildCount { get; set; }
 
-			///
-			///Complex type that contains content for a language specified by LocaleCode.
-			///
 			public CategoryLocalizedContent Content { get; set; }
 
-			///
-			///Mozu.ProductAdmin.Contracts.Category dynamicExpression ApiTypeMember DOCUMENT_HERE 
-			///
 			public DynamicExpression DynamicExpression { get; set; }
 
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public int? Id { get; set; }
 
-			///
-			///Indicates if the object or feature is active.
-			///
 			public bool? IsActive { get; set; }
 
-			///
-			///Indicates if the object is displayed on the storefront. If true, the admin product category is displayed in the store. If false, the category is not displayed.
-			///
 			public bool? IsDisplayed { get; set; }
 
-			///
-			///The code of the current category's parent category.
-			///
 			public string ParentCategoryCode { get; set; }
 
-			///
-			///If the current category has a parent, the identifier of the category's parent category.
-			///
 			public int? ParentCategoryId { get; set; }
 
-			///
-			///If the current category has a parent, the name of the category's parent category.
-			///
 			public string ParentCategoryName { get; set; }
 
-			///
-			///Indicates whether the parent category is active.
-			///
 			public bool? ParentIsActive { get; set; }
 
-			///
-			///The total number of products. This total may indicate the total products associate with a product type or number of products in a list.
-			///
 			public int? ProductCount { get; set; }
 
-			///
-			///The numeric order of objects, used by a vocabulary value defined for an extensible attribute, images, and categories.
-			///
 			public int? Sequence { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/CategoryCollection.cs b/Mozu.Api/Contracts/ProductAdmin/CategoryCollection.cs
old mode 100644
new mode 100755
index b73f06e9..c441641d
--- a/Mozu.Api/Contracts/ProductAdmin/CategoryCollection.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/CategoryCollection.cs
@@ -19,14 +19,8 @@ namespace Mozu.Api.Contracts.ProductAdmin
 		///
 		public class CategoryCollection
 		{
-			///
-			///An array list of objects in the returned collection.
-			///
 			public List<Category> Items { get; set; }
 
-			///
-			///The number of results listed in the query collection, represented by a signed 64-bit (8-byte) integer. This value is system-supplied and read-only.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/CategoryDiscountCondition.cs b/Mozu.Api/Contracts/ProductAdmin/CategoryDiscountCondition.cs
old mode 100644
new mode 100755
index bb270b7b..df3f413c
--- a/Mozu.Api/Contracts/ProductAdmin/CategoryDiscountCondition.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/CategoryDiscountCondition.cs
@@ -19,7 +19,7 @@ namespace Mozu.Api.Contracts.ProductAdmin
 		public class CategoryDiscountCondition
 		{
 			///
-			///Unique identifier of a category. 
+			///The unique identifier of the product category associated with the discount.
 			///
 			public int CategoryId { get; set; }
 
diff --git a/Mozu.Api/Contracts/ProductAdmin/CategoryLocalizedContent.cs b/Mozu.Api/Contracts/ProductAdmin/CategoryLocalizedContent.cs
old mode 100644
new mode 100755
index d01ce9f2..c99f5c44
--- a/Mozu.Api/Contracts/ProductAdmin/CategoryLocalizedContent.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/CategoryLocalizedContent.cs
@@ -19,49 +19,22 @@ namespace Mozu.Api.Contracts.ProductAdmin
 		///
 		public class CategoryLocalizedContent
 		{
-			///
-			///Array list of media images associated to a product category. These images may be localized in the language specified by the LocaleCode. Images display with the category on the storefront according to the code and formatting of your site theme. Each image includes the name, alt text, and URL location.
-			///
 			public List<CategoryLocalizedImage> CategoryImages { get; set; }
 
-			///
-			///The localized description in text for the object, displayed per the locale code. For example, descriptions are used for product descriptions, attributes, and pre-authorization transaction types.
-			///
 			public string Description { get; set; }
 
-			///
-			///Language used for the entity. Currently, only "en-US" is supported.
-			///
 			public string LocaleCode { get; set; }
 
-			///
-			///Description defined for metadata, used to interally manage data, in the language specified by the `localeCode`. This content is used by categories, products, localized content, and SEO content.
-			///
 			public string MetaTagDescription { get; set; }
 
-			///
-			///Keywords defined for metadata, used to internally manage data, in the language specified by the `localeCode`. Keywords are used by content for categories, products, localized content, and SEO content.
-			///
 			public string MetaTagKeywords { get; set; }
 
-			///
-			///Title defined for metadata, used to internally manage data, in the language specified by the `localeCode`. Titles are used by content for categories, products, localized content, and SEO content.
-			///
 			public string MetaTagTitle { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
-			///
-			///Title that appears on new product category pages, in the language specified by the `localeCode`.
-			///
 			public string PageTitle { get; set; }
 
-			///
-			///Slug is used in place of a name, code, or ID to give an SEO, human-friendly URL link for an object, used by categories.
-			///
 			public string Slug { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/CategoryLocalizedImage.cs b/Mozu.Api/Contracts/ProductAdmin/CategoryLocalizedImage.cs
old mode 100644
new mode 100755
index ea571743..58fd9030
--- a/Mozu.Api/Contracts/ProductAdmin/CategoryLocalizedImage.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/CategoryLocalizedImage.cs
@@ -18,49 +18,25 @@ namespace Mozu.Api.Contracts.ProductAdmin
 		///
 		public class CategoryLocalizedImage
 		{
-			///
-			///Descriptive text associated with the image or video that appears on the web storefront. This text displays on a hover-over in the browser, providing further information on the content displayed. The alternate text should be plain alphanumeric text without special characters or HTML coding.
-			///
 			public string AltText { get; set; }
 
 			///
-			///The identifier of the image in the  CMS. Supply a value for either the CMS ID or Image URL parameter.
+			///The identifier of the category image in the Mozu CMS. Supply a value for either the CMS ID or Image URL parameter.
 			///
 			public string CmsId { get; set; }
 
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public int? Id { get; set; }
 
-			///
-			///The localized title for an image that displays on the storefront. If localized, the displayed content is set per the locale code for the site.
-			///
 			public string ImageLabel { get; set; }
 
-			///
-			///The URL link for the image file associated with a product or category.
-			///
 			public string ImageUrl { get; set; }
 
-			///
-			///Language used for the entity. Currently, only "en-US" is supported.
-			///
 			public string LocaleCode { get; set; }
 
-			///
-			///Type of media specification required to successfully render the image, video, or other media content for products and categories.
-			///
 			public string MediaType { get; set; }
 
-			///
-			///The numeric order of objects, used by a vocabulary value defined for an extensible attribute, images, and categories.
-			///
 			public int? Sequence { get; set; }
 
-			///
-			///The URL of a video files for a product or category. The path name is set in the language specified by the LocaleCode.
-			///
 			public string VideoUrl { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/CategoryPagedCollection.cs b/Mozu.Api/Contracts/ProductAdmin/CategoryPagedCollection.cs
old mode 100644
new mode 100755
index f451ec5d..64527dee
--- a/Mozu.Api/Contracts/ProductAdmin/CategoryPagedCollection.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/CategoryPagedCollection.cs
@@ -19,26 +19,14 @@ namespace Mozu.Api.Contracts.ProductAdmin
 		///
 		public class CategoryPagedCollection
 		{
-			///
-			///An array list of objects in the returned collection.
-			///
 			public List<Category> Items { get; set; }
 
-			///
-			///The number of pages returned based on the startIndex and pageSize values specified. This value is system-supplied and read-only.
-			///
 			public int PageCount { get; set; }
 
-			///
-			///The number of results to display on each page when creating paged results from a query. The maximum value is 200.
-			///
 			public int PageSize { get; set; }
 
 			public int StartIndex { get; set; }
 
-			///
-			///The number of results listed in the query collection, represented by a signed 64-bit (8-byte) integer. This value is system-supplied and read-only.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/Coupon.cs b/Mozu.Api/Contracts/ProductAdmin/Coupon.cs
old mode 100644
new mode 100755
index c2b43421..eb9cdfa7
--- a/Mozu.Api/Contracts/ProductAdmin/Coupon.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/Coupon.cs
@@ -14,39 +14,18 @@
 
 namespace Mozu.Api.Contracts.ProductAdmin
 {
-		///
-		///	Mozu.ProductAdmin.Contracts.Coupon ApiType DOCUMENT_HERE 
-		///
 		public class Coupon
 		{
-			///
-			///Basic audit info about the object, including date, time, and user account. This data may be captured when creating, updating, and removing data.
-			///
 			public AuditInfo AuditInfo { get; set; }
 
-			///
-			///Specifies whether the coupon can be deleted and removed from a coupon set.
-			///
 			public bool CanBeDeleted { get; set; }
 
-			///
-			///The coupon code that a shopper uses to redeem an associated discount  on a purchase. This is also the unique identifier of the coupon itself.
-			///
 			public string CouponCode { get; set; }
 
-			///
-			///The unique identifier of the coupon set that the coupon belongs to.
-			///
 			public string CouponSetCode { get; set; }
 
-			///
-			///The unique, system generated id of the coupon set that contains the coupon.This value is read only.
-			///
 			public int CouponSetId { get; set; }
 
-			///
-			///The total number of times the coupon has been redeemed. When you perform a GetCoupon or GetCoupons operation, set the includeCounts operation parameter to true to view this field.This field is read only.
-			///
 			public int? RedemptionCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/CouponCollection.cs b/Mozu.Api/Contracts/ProductAdmin/CouponCollection.cs
old mode 100644
new mode 100755
index bef19863..60ec9867
--- a/Mozu.Api/Contracts/ProductAdmin/CouponCollection.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/CouponCollection.cs
@@ -14,34 +14,16 @@
 
 namespace Mozu.Api.Contracts.ProductAdmin
 {
-		///
-		///	Mozu.ProductAdmin.Contracts.CouponCollection ApiType DOCUMENT_HERE 
-		///
 		public class CouponCollection
 		{
-			///
-			///A list of requested items. All returned data is provided in an items array.For a failed request, the returned response may be success with an empty item array.
-			///
 			public List<Coupon> Items { get; set; }
 
-			///
-			///The total number of pages of the results divided per the `pageSize`.
-			///
 			public int PageCount { get; set; }
 
-			///
-			///The number of results to display on each page when creating paged results from a query. The amount is divided and displayed on the `pageCount `amount of pages. The default is 20 and maximum value is 200 per page.
-			///
 			public int PageSize { get; set; }
 
-			///
-			///When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a `pageSize `of 25, to get the 51st through the 75th items, use `startIndex=50`.
-			///
 			public int StartIndex { get; set; }
 
-			///
-			///The total number of items in the list.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/CouponSet.cs b/Mozu.Api/Contracts/ProductAdmin/CouponSet.cs
old mode 100644
new mode 100755
index ca345c22..01a1d28e
--- a/Mozu.Api/Contracts/ProductAdmin/CouponSet.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/CouponSet.cs
@@ -14,84 +14,36 @@
 
 namespace Mozu.Api.Contracts.ProductAdmin
 {
-		///
-		///	Mozu.ProductAdmin.Contracts.CouponSet ApiType DOCUMENT_HERE 
-		///
 		public class CouponSet
 		{
-			///
-			///The total number of discounts assigned to or associated with this coupon set. When you perform a GetCouponSet or GetCouponSets operation, set the includeCounts operation parameter to true to view this field. This field is read only.
-			///
 			public int? AssignedDiscountCount { get; set; }
 
-			///
-			///Basic audit info about the object, including date, time, and user account. This data may be captured when creating, updating, and removing data.
-			///
 			public AuditInfo AuditInfo { get; set; }
 
-			///
-			///Specifies whether the coupon set can be deleted. You cannot delete a coupon set if any of the coupons within the coupon set have been redeemed. This value is read only.
-			///
 			public bool CanBeDeleted { get; set; }
 
-			///
-			///The total number of coupon codes within the coupon set. When you perform a GetCouponSet or GetCouponSets operation, set the includeCounts operation parameter to true to view this field.  This field is read only.
-			///
 			public int? CouponCodeCount { get; set; }
 
-			///
-			///Determines whether the coupon set is a manual coupon set or a generated coupon set.Valid values for this field are: "Generated" and "Manual".
-			///
 			public string CouponCodeType { get; set; }
 
-			///
-			///The unique identifier of the coupon set. This value is also used as the coupon code prefix in generated coupon sets. If you specify a value, it must be unique to the catalog.  If you leave this field empty or null,  generates one. Use the GetUniqueCouponSetCode operation to retrieve a unique, random four character code.This value has a maximum length of 32. This value is required.
-			///
 			public string CouponSetCode { get; set; }
 
-			///
-			///The date and time in UTC format that the coupon set and the coupon codes in the coupon set expire.
-			///
 			public DateTime? EndDate { get; set; }
 
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public int? Id { get; set; }
 
-			///
-			///The maximum number of times any coupon code in the coupon set can be used. This value must be either null, greater than or equal to 1, or -1. A value of -1 indicates unlimited.If you leave this value null,  defaults this value to 1 when you create the coupon set.
-			///
 			public int? MaxRedemptionsPerCouponCode { get; set; }
 
-			///
-			///The maximum number of times any single shopper can redeem any coupon code in the coupon set. This value must be either null, greater than or equal to 1, or -1. A value of -1 indicates unlimited.If you leave this value null,  defaults this value to 1 when you create the coupon set.
-			///
 			public int? MaxRedemptionsPerUser { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
-			///
-			///The total number of all redeemed coupons within the coupon set. When you perform a GetCouponSet or GetCouponSets operation, set the includeCounts operation parameter to true to view this field.This field is read only.
-			///
 			public int? RedemptionCount { get; set; }
 
-			///
-			///The number of coupon codes within the coupon set.This value is required when couponCodeType is "Generated".
-			///
 			public int? SetSize { get; set; }
 
-			///
-			///The date and time in UTC format that the coupon codes in the coupon set become active.
-			///
 			public DateTime? StartDate { get; set; }
 
-			///
-			///The current status of the object.This value is read only. Valid values for this field are: "Active", "Expired", and "Inactive".
-			///
 			public string Status { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/CouponSetCollection.cs b/Mozu.Api/Contracts/ProductAdmin/CouponSetCollection.cs
old mode 100644
new mode 100755
index 4324d234..1fb44f67
--- a/Mozu.Api/Contracts/ProductAdmin/CouponSetCollection.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/CouponSetCollection.cs
@@ -14,34 +14,16 @@
 
 namespace Mozu.Api.Contracts.ProductAdmin
 {
-		///
-		///	Mozu.ProductAdmin.Contracts.CouponSetCollection ApiType DOCUMENT_HERE 
-		///
 		public class CouponSetCollection
 		{
-			///
-			///A list of requested items. All returned data is provided in an items array.For a failed request, the returned response may be success with an empty item array.
-			///
 			public List<CouponSet> Items { get; set; }
 
-			///
-			///The total number of pages of the results divided per the `pageSize`.
-			///
 			public int PageCount { get; set; }
 
-			///
-			///The number of results to display on each page when creating paged results from a query. The amount is divided and displayed on the `pageCount `amount of pages. The default is 20 and maximum value is 200 per page.
-			///
 			public int PageSize { get; set; }
 
-			///
-			///When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a `pageSize `of 25, to get the 51st through the 75th items, use `startIndex=50`.
-			///
 			public int StartIndex { get; set; }
 
-			///
-			///The total number of items in the list.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/CustomerSegment.cs b/Mozu.Api/Contracts/ProductAdmin/CustomerSegment.cs
old mode 100644
new mode 100755
index 8821de3d..dfce50b5
--- a/Mozu.Api/Contracts/ProductAdmin/CustomerSegment.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/CustomerSegment.cs
@@ -14,12 +14,12 @@
 namespace Mozu.Api.Contracts.ProductAdmin
 {
 		///
-		///	The Customer Segment object includes properties of a defined customer segment used to group customer accounts.
+		///	Properties of a customer segment used to group sets of customers for targeted reporting and discounts.
 		///
 		public class CustomerSegment
 		{
 			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
+			///Unique identifier of the customer segment.
 			///
 			public int Id { get; set; }
 
diff --git a/Mozu.Api/Contracts/ProductAdmin/Discount.cs b/Mozu.Api/Contracts/ProductAdmin/Discount.cs
old mode 100644
new mode 100755
index 0a3a37d3..7a908cf8
--- a/Mozu.Api/Contracts/ProductAdmin/Discount.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/Discount.cs
@@ -16,48 +16,31 @@
 namespace Mozu.Api.Contracts.ProductAdmin
 {
 		///
-		///	Name of the discount added and applied to a shopping cart and order for a shopper's purchase. 
+		///	Discount used to calculate SalePrice. Includes coupon code if applicable, amount of the discount, and discount savings. Discounts can be either an absolute price or a percentage off. The sale price beats any discounts.
 		///
 		public class Discount
 		{
-			///
-			///The integer amount of the discount. For example, an entry of "10" could represent a discount of $10.00 or a discount of 10%, depending on the type.
-			///
 			public decimal? Amount { get; set; }
 
-			///
-			///The type of discount amount, such as an amount or a percentage.
-			///
 			public string AmountType { get; set; }
 
-			///
-			///Identifier and datetime stamp information recorded when a user or application creates, updates, or deletes a resource entity. This value is system-supplied and read-only.
-			///
 			public AuditInfo AuditInfo { get; set; }
 
-			///
-			///Signifies that the discount is not referenced and can be hard deleted
-			///
 			public bool CanBeDeleted { get; set; }
 
+			public bool? CanBeStackedUpon { get; set; }
+
 			///
 			///List of conditions that must be met for the discount to apply.
 			///
 			public DiscountCondition Conditions { get; set; }
 
-			///
-			///Complex type that contains content for a language specified by LocaleCode.
-			///
 			public DiscountLocalizedContent Content { get; set; }
 
-			///
-			///The number of times this discount has been redeemed.
-			///
 			public int? CurrentRedemptionCount { get; set; }
 
-			///
-			///Determines whether or not a discount applies to a items with a sale price. Applicable on order and line item discounts. For line items, when this is true, the discount will be disqualified. For order level discounts, when true, the discount will not be applied to those items have a sale price.
-			///
+			public bool? DoesNotApplyToMultiShipToOrders { get; set; }
+
 			public bool? DoesNotApplyToProductsWithSalePrice { get; set; }
 
 			///
@@ -65,29 +48,16 @@ public class Discount
 			///
 			public bool? DoesNotApplyToSalePrice { get; set; }
 
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public int? Id { get; set; }
 
-			///
-			///Products receiving a price from a price list specified here or a child of a specified price list can be discounted.
-			///
 			public List<string> IncludedPriceLists { get; set; }
 
-			///
-			///Maximum impact this discount can apply on a single order. Must be either null or greater than zero.
-			///
+			public bool? IsBxGx { get; set; }
+
 			public decimal? MaximumDiscountImpactPerOrder { get; set; }
 
-			///
-			///Maximum impact this discount can apply on a single line item. Must be either null or greater than zero.
-			///
 			public decimal? MaximumDiscountImpactPerRedemption { get; set; }
 
-			///
-			///Maximum number of redemptions allowed per order. If null, defaults to unlimited.
-			///
 			public int? MaximumRedemptionsPerOrder { get; set; }
 
 			///
@@ -95,19 +65,12 @@ public class Discount
 			///
 			public int? MaximumUsesPerUser { get; set; }
 
-			///
-			///The scope to which the discount applies, which is "Order" for order discounts or "LineItem" for individual product discounts.
-			///
 			public string Scope { get; set; }
 
-			///
-			///The current status of the object.This value is read only. Valid values for this field are: "Active", "Expired", and "Inactive".
-			///
+			public int? StackingLayer { get; set; }
+
 			public string Status { get; set; }
 
-			///
-			///Targets represent the object, such as an item to apply discounts to(products or orders) or a view field for content. Targets are the dot notations that link to the source document property. For example, firstitem for the direct level or firstitem.seconditem.thirditem for a deeper property.
-			///
 			public DiscountTarget Target { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/DiscountCollection.cs b/Mozu.Api/Contracts/ProductAdmin/DiscountCollection.cs
old mode 100644
new mode 100755
index bcc849b1..06961f8c
--- a/Mozu.Api/Contracts/ProductAdmin/DiscountCollection.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/DiscountCollection.cs
@@ -19,26 +19,14 @@ namespace Mozu.Api.Contracts.ProductAdmin
 		///
 		public class DiscountCollection
 		{
-			///
-			///An array list of objects in the returned collection.
-			///
 			public List<Discount> Items { get; set; }
 
-			///
-			///The number of pages returned based on the startIndex and pageSize values specified. This value is system-supplied and read-only.
-			///
 			public int PageCount { get; set; }
 
-			///
-			///The number of results to display on each page when creating paged results from a query. The maximum value is 200.
-			///
 			public int PageSize { get; set; }
 
 			public int StartIndex { get; set; }
 
-			///
-			///The number of results listed in the query collection, represented by a signed 64-bit (8-byte) integer. This value is system-supplied and read-only.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/DiscountCondition.cs b/Mozu.Api/Contracts/ProductAdmin/DiscountCondition.cs
old mode 100644
new mode 100755
index 100b642c..fd8f55ac
--- a/Mozu.Api/Contracts/ProductAdmin/DiscountCondition.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/DiscountCondition.cs
@@ -20,7 +20,7 @@ namespace Mozu.Api.Contracts.ProductAdmin
 		public class DiscountCondition
 		{
 			///
-			///The coupon code that a shopper uses to redeem an associated discount  on a purchase. This is also the unique identifier of the coupon itself.
+			///If the discount is a coupon, the code required to redeem the coupon.
 			///
 			public string CouponCode { get; set; }
 
@@ -35,12 +35,12 @@ public class DiscountCondition
 			public List<CategoryDiscountCondition> ExcludedCategories { get; set; }
 
 			///
-			///List of products that are not eligible for the discount.
+			///List of the products that are not eligible for the discount.
 			///
 			public List<ProductDiscountCondition> ExcludedProducts { get; set; }
 
 			///
-			///Date and time in UTC format when a discount, credit, wish list, or cart expires. An expired discount no longer can be redeemed. An expired wish list is no longer available. An expired credit can no longer be redeemed for a purchase. Acart becomes inactive and expired based on a system-calculated interval. For example, if an anonymous shopper has 14 days of inactivity, the cart is considered abandoned after that period of inactivity. System-supplied and read-only.
+			///The date and time on which the discount expires and cannot be redeemed.
 			///
 			public DateTime? ExpirationDate { get; set; }
 
@@ -49,9 +49,6 @@ public class DiscountCondition
 			///
 			public List<CategoryDiscountCondition> IncludedCategories { get; set; }
 
-			///
-			///List of payment types that trigger this discount to be valid.
-			///
 			public List<string> IncludedPaymentWorkflows { get; set; }
 
 			///
@@ -65,7 +62,7 @@ public class DiscountCondition
 			public int? MaxRedemptionCount { get; set; }
 
 			///
-			///This specifies the minimum amount that must be purchased in the combined categories defined in IncludedCategories. This amount is calculated before discounting and it is not used if IncludedCategories is empty.
+			///This pecifies the minimum amount that must be purchased in the combined categories defined in IncludedCategories. This amount is calculated before discounting and it is not used if IncludedCategories is empty.
 			///
 			public decimal? MinimumCategorySubtotalBeforeDiscounts { get; set; }
 
@@ -80,12 +77,12 @@ public class DiscountCondition
 			public decimal? MinimumOrderAmount { get; set; }
 
 			///
-			///This specifies the minimum quantity of products in the categories specified in IncludedCategories, which must be purchased to qualify for the associated discount. This defaults to 1 if null, and IncludedCategories has values.
+			///This specifies the minimum quantity of products in the categories specified in IncludedCategories, which must be purchased to qualify for the associated discount. This defaults to 1 if  null, and IncludedCategories has values.
 			///
 			public int? MinimumQuantityProductsRequiredInCategories { get; set; }
 
 			///
-			///This specifies the minimum quantity of products in the specified IncludedProducts that must be purchased to qualify for the associated discount. This defaults to 1 if null, and IncludedProducts has values.
+			///This specifies the minimum quantity of products in the specified IncludedProducts that must be purchased to qualify for the associated discount. This defaults to 1 if  null, and IncludedProducts has values.
 			///
 			public int? MinimumQuantityRequiredProducts { get; set; }
 
diff --git a/Mozu.Api/Contracts/ProductAdmin/DiscountLocalizedContent.cs b/Mozu.Api/Contracts/ProductAdmin/DiscountLocalizedContent.cs
old mode 100644
new mode 100755
index ebd71cee..69010f5f
--- a/Mozu.Api/Contracts/ProductAdmin/DiscountLocalizedContent.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/DiscountLocalizedContent.cs
@@ -19,24 +19,15 @@ namespace Mozu.Api.Contracts.ProductAdmin
 		///
 		public class DiscountLocalizedContent
 		{
-			///
-			///Identifier and datetime stamp information recorded when a user or application creates, updates, or deletes a resource entity. This value is system-supplied and read-only.
-			///
 			public AuditInfo AuditInfo { get; set; }
 
 			///
-			///The localizable, shopper-facing description defined for a discount or a storefront message. 
+			///The localizable, shopper-facing description defined for the discount.
 			///
 			public string FriendlyDescription { get; set; }
 
-			///
-			///Language used for the entity. Currently, only "en-US" is supported.
-			///
 			public string LocaleCode { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/DiscountSettings.cs b/Mozu.Api/Contracts/ProductAdmin/DiscountSettings.cs
new file mode 100755
index 00000000..d1c6db9b
--- /dev/null
+++ b/Mozu.Api/Contracts/ProductAdmin/DiscountSettings.cs
@@ -0,0 +1,22 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+
+
+namespace Mozu.Api.Contracts.ProductAdmin
+{
+		public class DiscountSettings
+		{
+			public StackingConfiguration StackingConfiguration { get; set; }
+
+		}
+
+}
\ No newline at end of file
diff --git a/Mozu.Api/Contracts/ProductAdmin/DiscountTarget.cs b/Mozu.Api/Contracts/ProductAdmin/DiscountTarget.cs
old mode 100644
new mode 100755
index 036190e2..7b42fa25
--- a/Mozu.Api/Contracts/ProductAdmin/DiscountTarget.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/DiscountTarget.cs
@@ -19,49 +19,24 @@ namespace Mozu.Api.Contracts.ProductAdmin
 		///
 		public class DiscountTarget
 		{
-			///
-			///Determines which way the discount is optimized. Consumers favor(default - false/null) or tenants favor (when this is set to true) Applies to discounts where target is not a specific product or list of products. May also impact behavior of Buy X Get Y so that X is the most expensive items and Y the least expensive.
-			///
 			public bool? AppliesToLeastExpensiveProductsFirst { get; set; }
 
-			///
-			///The list of all categories associated with the product. These categories contain products, can have discounts associated, and define the grouping of products to display on the storefront.
-			///
+			public bool? AppliesToPurchaseConditionItems { get; set; }
+
 			public List<TargetedCategory> Categories { get; set; }
 
-			///
-			///List of the product categories that are not eligible for the discount.
-			///
 			public List<TargetedCategory> ExcludedCategories { get; set; }
 
-			///
-			///The operator to use on the excludedCategories field. Valid values are: "All" and "Any".
-			///
 			public string ExcludedCategoriesOperator { get; set; }
 
-			///
-			///List of products that are not eligible for the discount.
-			///
 			public List<TargetedProduct> ExcludedProducts { get; set; }
 
-			///
-			///Prevents order scoped discounts from layering over items that already have a product discount with the same type.
-			///
 			public bool? ExcludeItemsWithExistingProductDiscounts { get; set; }
 
-			///
-			///Prevents order scoped discounts from layering over items that already have a shipping discount with the same type.
-			///
 			public bool? ExcludeItemsWithExistingShippingDiscounts { get; set; }
 
-			///
-			///If true, the target discount applies to all products sold on the site, regardless of product category.
-			///
 			public bool? IncludeAllProducts { get; set; }
 
-			///
-			///The operator of the includedCategories field.Valid values are: "All" and "Any".
-			///
 			public string IncludedCategoriesOperator { get; set; }
 
 			///
@@ -69,24 +44,12 @@ public class DiscountTarget
 			///
 			public int? MaximumQuantityPerRedemption { get; set; }
 
-			///
-			///List of product codes that represent the products to which the discount can apply.
-			///
 			public List<TargetedProduct> Products { get; set; }
 
-			///
-			///The list of shipping method codes that represents the shipping service types to which the discount can apply.
-			///
 			public List<TargetedShippingMethod> ShippingMethods { get; set; }
 
-			///
-			///The list of shipping zones that are applicable for this discount.
-			///
 			public List<TargetedShippingZone> ShippingZones { get; set; }
 
-			///
-			///Properties of the object to which this discount is targeted, which can be Product or Shipping. If the discount type is Product, the target properties describe the product or product categories to which the discount applies. If the discount type is Shipping, the target properties describe the shipping methods eligible for the discount.
-			///
 			public string Type { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/DynamicExpression.cs b/Mozu.Api/Contracts/ProductAdmin/DynamicExpression.cs
old mode 100644
new mode 100755
index 1cf5ecac..a2d72b12
--- a/Mozu.Api/Contracts/ProductAdmin/DynamicExpression.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/DynamicExpression.cs
@@ -13,19 +13,10 @@
 
 namespace Mozu.Api.Contracts.ProductAdmin
 {
-		///
-		///	The expression that controls the product membership of the dynamic category. This field is only applicable when the categoryType is set to either "DynamicPreComputed" or "DynamicRealTime".Refer to [Dynamic Category Expressions](../../../developer/api-guides/dynamic-category-exp.htm) for more information about writing dynamic expressions using the  API.
-		///
 		public class DynamicExpression
 		{
-			///
-			///The text view of the dynamic  expression. For example, instead of writing a structure JSON object, you can write a simple string as the dynamic expression.
-			///
 			public string Text { get; set; }
 
-			///
-			///The tree view of the dynamic expression. This is a structure JSON object that gives you greater control and flexibility over the text view when writing the dynamic  expression.
-			///
 			public Expression Tree { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/Expression.cs b/Mozu.Api/Contracts/ProductAdmin/Expression.cs
old mode 100644
new mode 100755
index e9d7238d..aa0b7a27
--- a/Mozu.Api/Contracts/ProductAdmin/Expression.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/Expression.cs
@@ -14,45 +14,18 @@
 
 namespace Mozu.Api.Contracts.ProductAdmin
 {
-		///
-		///	The expression you want for the target rule. Refer to [Product Rules](https://www.mozu.com/docs/Guides/settings/shipping.htm#product_rules) in the Shipping Settings guides topic for more information.
-		///
 		public class Expression
 		{
-			///
-			///The expression field you wish to target. For example, if you wish to target the productCode field, this value would be productCode.Refer to [Dynamic Category Expressions](../../../developer/api-guides/dynamic-category-exp.htm) for more information about the supported expression fields.
-			///
 			public string Left { get; set; }
 
-			///
-			///The logical operator you wish to perform on the nodes within the dynamic expression. Valid values are: "And", and "Or".
-			///
 			public string LogicalOperator { get; set; }
 
-			///
-			///The node or container of the self-contained dynamic expression. The node contains the following expression fields in order: "type", "left", "operator", and "right".For example, a dynamic expression that specifies to include all products that are in the apparel category  would have the following node:`"type": "predicate",
-			///"left": "Categories.CategoryCode",
-			///"operator": "eq",
-			///"right": "apparel".`
-			///
 			public List<Expression> Nodes { get; set; }
 
-			///
-			///The operator you wish to perform on the left field. The valid values of this field are dependent on the left expression field. Refer to [Dynamic Category Expressions](../../../developer/api-guides/dynamic-category-exp.htm) for more information about the supported expression field operators.
-			///
 			public string Operator { get; set; }
 
-			///
-			///The literal values of the predicate that is validated against the combined values of the left and operator fields. For example, you wish to validate on products that have a product code of "shoe". You would write the following expression:`"type": "predicate",
-			///"left": "productCode",
-			///"operator": "eq",
-			///"right": "shoe".`
-			///
 			public object Right { get; set; }
 
-			///
-			///Specifies either the container of the dynamic expression, or the predicate of the node. Depending on where this is specified in the dynamic expression, the valid values are "container", and "predicate".Refer to [Dynamic Category Expressions](../../../../developer/api-guides/dynamic-category-exp.htm) for more information about using the type field.
-			///
 			public string Type { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/Facet.cs b/Mozu.Api/Contracts/ProductAdmin/Facet.cs
old mode 100644
new mode 100755
index 7be5bd4e..b60166d5
--- a/Mozu.Api/Contracts/ProductAdmin/Facet.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/Facet.cs
@@ -16,63 +16,30 @@
 namespace Mozu.Api.Contracts.ProductAdmin
 {
 		///
-		///	Properties of the facet used to retrieve documents.
+		///	Properties of the category, price, or attribute facet shoppers use to filter product display results on a storefront.
 		///
 		public class Facet
 		{
-			///
-			///Identifier and datetime stamp information recorded when a user or application creates, updates, or deletes a resource entity. This value is system-supplied and read-only.
-			///
 			public AuditInfo AuditInfo { get; set; }
 
-			///
-			///Unique identifier for the storefront container used to organize products.
-			///
 			public int CategoryId { get; set; }
 
-			///
-			///Unique identifier of the facet.
-			///
 			public int? FacetId { get; set; }
 
-			///
-			///The type of facet. Valid values are "range" (enables creation of a range of values) or "value" (populates the facet values based on the associated attribute or category).
-			///
 			public string FacetType { get; set; }
 
-			///
-			///Indicates if the object is hidden or breaks inheritance, primarily used by facets, products, and attribute vocabulary values. For example, if true, the attribute vocabulary value does not appear in the list when defining a value for an attribute.
-			///
 			public bool IsHidden { get; set; }
 
-			///
-			///Integer that represents the sequence order of the attribute.
-			///
 			public int Order { get; set; }
 
-			///
-			///Indicates the specific facet inherited from a parent category that is overridden by this facet. System-supplied and read only.
-			///
 			public int? OverrideFacetId { get; set; }
 
-			///
-			///For range type facets, an array of ranges to use for the facet values. For example, a price facet might have range queries for $0-$25, $25-$50, and $50-$100.
-			///
 			public List<FacetRangeQuery> RangeQueries { get; set; }
 
-			///
-			///Source for an action or container for originating content. Source is used as an origin for validation and notification messages based on successful or failed actions. For originating content, source is used for the facet source information, including the category, price, or attribute properties.
-			///
 			public FacetSource Source { get; set; }
 
-			///
-			///System-supplied and read only indicator of whether a facet is currently valid and if not indicates the reason why. A facet may become invalid if the source data is changed in some ways (for example if the category tree structure is changed).
-			///
 			public FacetValidity Validity { get; set; }
 
-			///
-			///Determines how the facet values will be sorted in the store. Must be a valid value for DataType defined in FacetValueSortTypeConst. Allowable values are:* * * * * * The default is .
-			///
 			public string ValueSortType { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/FacetRangeQuery.cs b/Mozu.Api/Contracts/ProductAdmin/FacetRangeQuery.cs
old mode 100644
new mode 100755
index f818b3a4..6c8670ea
--- a/Mozu.Api/Contracts/ProductAdmin/FacetRangeQuery.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/FacetRangeQuery.cs
@@ -18,14 +18,8 @@ namespace Mozu.Api.Contracts.ProductAdmin
 		///
 		public class FacetRangeQuery
 		{
-			///
-			///The maximum value to use for the facet range query.
-			///
 			public object RangeValueEnd { get; set; }
 
-			///
-			///The minimum value to use for the facet range query.
-			///
 			public object RangeValueStart { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/FacetSet.cs b/Mozu.Api/Contracts/ProductAdmin/FacetSet.cs
old mode 100644
new mode 100755
index f8f600a9..74000db8
--- a/Mozu.Api/Contracts/ProductAdmin/FacetSet.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/FacetSet.cs
@@ -19,14 +19,8 @@ namespace Mozu.Api.Contracts.ProductAdmin
 		///
 		public class FacetSet
 		{
-			///
-			///The list of subcategories and attributes that have not been defined as facets for the category.
-			///
 			public List<FacetSource> Available { get; set; }
 
-			///
-			///The list of category, price, and attribute facets defined for the category.
-			///
 			public List<Facet> Configured { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/FacetSource.cs b/Mozu.Api/Contracts/ProductAdmin/FacetSource.cs
old mode 100644
new mode 100755
index edb6cd9b..b3f081a3
--- a/Mozu.Api/Contracts/ProductAdmin/FacetSource.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/FacetSource.cs
@@ -14,33 +14,18 @@
 namespace Mozu.Api.Contracts.ProductAdmin
 {
 		///
-		///	Describes the source of the facet data. It can be a product field (such as price and category) or a product attribute. All fields are System-supplied and read only.
+		///	Container for the facet source information, which includes the category, price, or attribute properties.
 		///
 		public class FacetSource
 		{
-			///
-			///If true, the facet allows for values that consist of one or more ranges, such as 0-100, 100-200, and 200-300. This is only allowed for numeric and date fields. 
-			///
 			public bool AllowsRangeQuery { get; set; }
 
-			///
-			///The data type of the source product property, typically of type Bool, DateTime, Number, or String.
-			///
 			public string DataType { get; set; }
 
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public string Id { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
-			///
-			///The source type for the facet, either "Attribute" or "Element". Elements are direct properties of the product and include category and price.
-			///
 			public string Type { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/FacetValidity.cs b/Mozu.Api/Contracts/ProductAdmin/FacetValidity.cs
old mode 100644
new mode 100755
index b93233ec..85f312f7
--- a/Mozu.Api/Contracts/ProductAdmin/FacetValidity.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/FacetValidity.cs
@@ -14,18 +14,12 @@
 namespace Mozu.Api.Contracts.ProductAdmin
 {
 		///
-		///	Describes whether a facet is currently valid and the reason. A facet may become invalid if the source data is changed in some ways (for example if the category tree structure is changed).
+		///	System-supplied and read only parameter that validates a facet for its associated category.
 		///
 		public class FacetValidity
 		{
-			///
-			///Indicates if the facet is currently valid.
-			///
 			public bool IsValid { get; set; }
 
-			///
-			///A code indicating the reason why a facet is invalid.
-			///
 			public string ReasonCode { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/LocationInventory.cs b/Mozu.Api/Contracts/ProductAdmin/LocationInventory.cs
old mode 100644
new mode 100755
index 3e87025e..6f7aae4e
--- a/Mozu.Api/Contracts/ProductAdmin/LocationInventory.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/LocationInventory.cs
@@ -24,39 +24,18 @@ public class LocationInventory
 			///
 			public AuditInfo AuditInfo { get; set; }
 
-			///
-			///Product code defined by the tenant administrator to use as a base prefix when generating product codes for any variations of this product.
-			///
 			public string BaseProductCode { get; set; }
 
-			///
-			///The unique, user-defined code that identifies a location. This location can be the location where the order was entered, location for newly in-stock products, and where products are returned.
-			///
 			public string LocationCode { get; set; }
 
-			///
-			///Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.
-			///
 			public string ProductCode { get; set; }
 
-			///
-			///The name of the product that represents a line item in a taxable order or product bundle.
-			///
 			public string ProductName { get; set; }
 
-			///
-			///The stock level for the associated product currently available, at specified locations, and based on the number of pending product reservations as applicable. System-supplied and read only.
-			///
 			public int? StockAvailable { get; set; }
 
-			///
-			///The stock level for the associated product currently on back order for this location, based on the number of pending product reservations. System-supplied and read only.
-			///
 			public int? StockOnBackOrder { get; set; }
 
-			///
-			///The current physical stock level for the associated product, which does not account for pending product reservations.
-			///
 			public int? StockOnHand { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/LocationInventoryAdjustment.cs b/Mozu.Api/Contracts/ProductAdmin/LocationInventoryAdjustment.cs
old mode 100644
new mode 100755
index 984b429c..2113cf6f
--- a/Mozu.Api/Contracts/ProductAdmin/LocationInventoryAdjustment.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/LocationInventoryAdjustment.cs
@@ -19,7 +19,7 @@ namespace Mozu.Api.Contracts.ProductAdmin
 		public class LocationInventoryAdjustment
 		{
 			///
-			///The unique, user-defined code that identifies a location. This location can be the location where the order was entered, location for newly in-stock products, and where products are returned.
+			///User-defined code that identifies the location.
 			///
 			public string LocationCode { get; set; }
 
@@ -34,7 +34,7 @@ public class LocationInventoryAdjustment
 			public string Type { get; set; }
 
 			///
-			///The value of a property, used by numerous objects within  including facets, attributes, products, localized content, metadata, capabilities ( and third-party), location inventory adjustment, and more. The value may be a string, integer, or double. Validation may be run against the entered and saved values depending on the object type.
+			///Value of the location inventory adjustment, which is an absolute integer or delta. For example, to decrease the current inventory level by 2, set the Type parameter to "Delta" and the Value parameter to "-2". To adjust the inventory to a current level of 12, set the Type parameter to "Absolute" and the Value parameter to "12".
 			///
 			public int Value { get; set; }
 
diff --git a/Mozu.Api/Contracts/ProductAdmin/LocationInventoryCollection.cs b/Mozu.Api/Contracts/ProductAdmin/LocationInventoryCollection.cs
old mode 100644
new mode 100755
index 55e0df95..02ea34f9
--- a/Mozu.Api/Contracts/ProductAdmin/LocationInventoryCollection.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/LocationInventoryCollection.cs
@@ -19,29 +19,14 @@ namespace Mozu.Api.Contracts.ProductAdmin
 		///
 		public class LocationInventoryCollection
 		{
-			///
-			///An array list of objects in the returned collection.
-			///
 			public List<LocationInventory> Items { get; set; }
 
-			///
-			///The number of pages returned based on the startIndex and pageSize values specified. This value is system-supplied and read-only.
-			///
 			public int PageCount { get; set; }
 
-			///
-			///The number of results to display on each page when creating paged results from a query. The maximum value is 200.
-			///
 			public int PageSize { get; set; }
 
-			///
-			///When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.
-			///
 			public int StartIndex { get; set; }
 
-			///
-			///The number of results listed in the query collection, represented by a signed 64-bit (8-byte) integer. This value is system-supplied and read-only.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/MasterCatalog.cs b/Mozu.Api/Contracts/ProductAdmin/MasterCatalog.cs
old mode 100644
new mode 100755
index 0e5bec57..b6c159aa
--- a/Mozu.Api/Contracts/ProductAdmin/MasterCatalog.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/MasterCatalog.cs
@@ -14,33 +14,18 @@
 namespace Mozu.Api.Contracts.ProductAdmin
 {
 		///
-		///	Properties of a master product catalog defined for a tenant. All catalogs and sites associated with a master catalog share product definitions.
+		///	Properties of a master catalog associated with a tenant.
 		///
 		public class MasterCatalog
 		{
-			///
-			///Enables the live editing of products feature. If you set the productPublishingMode field to Pending, set this field to true, and set the DataViewMode in the context header to live, you can edit the live version of products instead of the pending draft.This should only be enabled for immediate changes to the live version of products. Any edits made to the live version are not applied to the pending draft version, so when you publish the pending draft version, your edits to the live version are overwritten.
-			///
 			public bool? EnableLiveEdit { get; set; }
 
-			///
-			///The unique identifier of the master catalog associated with the entity.
-			///
 			public int Id { get; set; }
 
-			///
-			///Indicates if the object is deleted. If true, the object has been deleted. This may affect associated child members and objects. For example, a deleted master catalog affects all associated catalogs. 
-			///
 			public bool IsDeleted { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
-			///
-			///The mode this master catalog uses for product updates. Possible values are "Pending" which saves product updates as a draft until they are published, and "Live" which publishes all product updates immediately.
-			///
 			public string ProductPublishingMode { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/MasterCatalogCollection.cs b/Mozu.Api/Contracts/ProductAdmin/MasterCatalogCollection.cs
old mode 100644
new mode 100755
index 7f33e423..faf59ef0
--- a/Mozu.Api/Contracts/ProductAdmin/MasterCatalogCollection.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/MasterCatalogCollection.cs
@@ -19,14 +19,8 @@ namespace Mozu.Api.Contracts.ProductAdmin
 		///
 		public class MasterCatalogCollection
 		{
-			///
-			///An array list of objects in the returned collection.
-			///
 			public List<MasterCatalog> Items { get; set; }
 
-			///
-			///The number of results listed in the query collection, represented by a signed 64-bit (8-byte) integer. This value is system-supplied and read-only.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/PriceList.cs b/Mozu.Api/Contracts/ProductAdmin/PriceList.cs
old mode 100644
new mode 100755
index 10a8e074..dcfa4368
--- a/Mozu.Api/Contracts/ProductAdmin/PriceList.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/PriceList.cs
@@ -15,89 +15,38 @@
 
 namespace Mozu.Api.Contracts.ProductAdmin
 {
-		///
-		///	The details of the price list.
-		///
 		public class PriceList
 		{
-			///
-			///Basic audit info about the object, including date, time, and user account. This data may be captured when creating, updating, and removing data.
-			///
 			public AuditInfo AuditInfo { get; set; }
 
-			///
-			///A list of sites for which you want the price list the default. The default price list will be in effect on a site if the resolution logic does not return any applicable price lists for the shopper, for example, if the shopper does not belong to any applicable customer segments. Refer to [Default](https://www.mozu.com/docs/guides/catalog/price-lists.htm#default) in the Price Lists guides topic for more information.
-			///
 			public List<int> DefaultForSites { get; set; }
 
-			///
-			///The localized description in text for the object, displayed per the locale code. For example, descriptions are used for product descriptions, attributes, and pre-authorization transaction types.
-			///
 			public string Description { get; set; }
 
-			///
-			///Indicates if a capability, function tied to an Arc.js action, application, or price list is enabled for the tenant/site. If true, the capability/application/function/price list is enabled for the tenant. System-supplied and read-only with the exception of functions tied to an Arc.js action and price lists.
-			///
 			public bool? Enabled { get; set; }
 
-			///
-			///Indicates whether the price list is exclusive. When a price list is exclusive, shoppers that resolve to the exclusive price list can only view and purchase products that have price entries in the price list and any of its parents. The default is . Refer to [Exclusivity](https://www.mozu.com/docs/guides/catalog/price-lists.htm#exclusivity) for more information.
-			///
 			public bool? FilteredInStorefront { get; set; }
 
-			///
-			///A list of site identifiers for which the price list pricing is indexed. Refer to [Indexing](https://www.mozu.com/docs/guides/catalog/price-lists.htm#indexing) in the Price Lists guides topic for more information.
-			///
 			public List<int> IndexedSites { get; set; }
 
-			///
-			///A list of customer segment codes that  uses to determine the shoppers to whom the price list applies. Refer to [Resolution](https://www.mozu.com/docs/guides/catalog/price-lists.htm#resolution) in the Price Lists guides topic for more information.
-			///
 			public List<string> MappedCustomerSegments { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
-			///
-			///The code of the price list's parent price list. You can assign each price list a parent price list, which allows each child price list to inherit the parent price list's overridden product pricing. Refer to [Inheritance](https://www.mozu.com/docs/guides/catalog/price-lists.htm#inheritance) in the Price Lists guides topic for more information.
-			///
 			public string ParentPriceListCode { get; set; }
 
-			///
-			///The user-defined name of the parent price list, if applicable. This value is read-only.
-			///
 			public string ParentPriceListName { get; set; }
 
-			///
-			///The unique, user-defined code of the price list.
-			///
 			public string PriceListCode { get; set; }
 
-			///
-			///A unique, internal ID of the price list. This property is read-only.
-			///
 			public int PriceListSequence { get; set; }
 
-			///
-			///The resolution rank of the price list that is used to break ties when a customer is applicable for multiple price lists. A lower number represents a higher priority. In order avoid conflicts,  recommends setting this property to a unique value. Refer to [Resolution Rank](https://www.mozu.com/docs/guides/catalog/price-lists.htm#resolution_rank) in the Price List guides topic for more information.
-			///
 			public int? Rank { get; set; }
 
-			///
-			///Specifies whether the price list is resolvable. When ,  is able to apply the price list and its product pricing directly to a shopper. When ,  is unable to apply the price list and its product pricing directly to a shopper; however  can still apply the price list to a shopper if it is a parent of a resolvable price list. Refer to [Resolution](https://www.mozu.com/docs/guides/catalog/price-lists.htm#resolution) in the Price List guides topic for more information.
-			///
 			public bool? Resolvable { get; set; }
 
-			///
-			///Specifies whether the price list is valid for all sites associated with the master catalog to which the price list belongs. If this property is , the  property is empty.
-			///
 			public bool? ValidForAllSites { get; set; }
 
-			///
-			///A list of sites for which the price list is valid. If this property contains any entries, the  property is .
-			///
 			public List<int> ValidSites { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/PriceListCollection.cs b/Mozu.Api/Contracts/ProductAdmin/PriceListCollection.cs
old mode 100644
new mode 100755
index 6ebf7cd7..242a5e80
--- a/Mozu.Api/Contracts/ProductAdmin/PriceListCollection.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/PriceListCollection.cs
@@ -14,34 +14,16 @@
 
 namespace Mozu.Api.Contracts.ProductAdmin
 {
-		///
-		///	Mozu.ProductAdmin.Contracts.PriceListCollection ApiType DOCUMENT_HERE 
-		///
 		public class PriceListCollection
 		{
-			///
-			///A list of requested items. All returned data is provided in an items array.For a failed request, the returned response may be success with an empty item array.
-			///
 			public List<PriceList> Items { get; set; }
 
-			///
-			///The total number of pages of the results divided per the `pageSize`.
-			///
 			public int PageCount { get; set; }
 
-			///
-			///The number of results to display on each page when creating paged results from a query. The amount is divided and displayed on the `pageCount `amount of pages. The default is 20 and maximum value is 200 per page.
-			///
 			public int PageSize { get; set; }
 
-			///
-			///When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a `pageSize `of 25, to get the 51st through the 75th items, use `startIndex=50`.
-			///
 			public int StartIndex { get; set; }
 
-			///
-			///The total number of items in the list.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/PriceListEntry.cs b/Mozu.Api/Contracts/ProductAdmin/PriceListEntry.cs
old mode 100644
new mode 100755
index d3e2e081..7937b090
--- a/Mozu.Api/Contracts/ProductAdmin/PriceListEntry.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/PriceListEntry.cs
@@ -15,134 +15,58 @@
 
 namespace Mozu.Api.Contracts.ProductAdmin
 {
-		///
-		///	The details of the price list entry.
-		///
 		public class PriceListEntry
 		{
-			///
-			///Basic audit info about the object, including date, time, and user account. This data may be captured when creating, updating, and removing data.
-			///
 			public AuditInfo AuditInfo { get; set; }
 
-			///
-			///Mozu.ProductAdmin.Contracts.PriceListEntry cost ApiTypeMember DOCUMENT_HERE 
-			///
 			public decimal? Cost { get; set; }
 
-			///
-			///Specifies whether the product's cost is the default catalog cost or is overridden. If this property is set to ,  cannot not be null.This property has the following valid values:* * 
-			///
 			public string CostMode { get; set; }
 
-			///
-			///The localized currency code for the monetary amount. 
-			///
 			public string CurrencyCode { get; set; }
 
-			///
-			///Indicates if the discount is restricted. If true, the system cannot apply any discounts to this product. Discount restrictions are defined at the master catalog level. Client administrators cannot override discount restrictions at the catalog level, but they can limit the restriction to a defined time interval.For price list entries, specifies whether discounts are restricted for the specific entry if  is set to .Refer to [Discount Restriction](../../../guides/catalog/price-lists.htm#discountrestriction) in the Price Lists guides topic for more information.
-			///
 			public bool? DiscountsRestricted { get; set; }
 
-			///
-			///The date and time on which the discount restriction period ends.
-			///
 			public DateTime? DiscountsRestrictedEndDate { get; set; }
 
-			///
-			///Specifies whether to use the default catalog setting for discount restriction, or to override the default catalog setting.Refer to [Discount Restriction](https://www.mozu.com/docs/guides/catalog/price-lists.htm#discountrestriction) in the Price Lists guides topic for more information.This property has the following valid values:* * 
-			///
 			public string DiscountsRestrictedMode { get; set; }
 
-			///
-			///The date and time on which the discount restriction period starts.
-			///
 			public DateTime? DiscountsRestrictedStartDate { get; set; }
 
-			///
-			///Specifies the date in UTC format when the price list entry is no longer in effect. This property is optional.
-			///
 			public DateTime? EndDate { get; set; }
 
-			///
-			///A list of product extras associated with the price list entry.Refer to [Extras](https://www.mozu.com/docs/guides/catalog/price-lists.htm#extras) in the Price Lists guides topic for more information.
-			///
 			public List<PriceListEntryExtra> ExtraEntries { get; set; }
 
-			///
-			///Specifies whether the product in the price list entry is a product variant.Refer to [Configurable Products with Options](https://www.mozu.com/docs/guides/catalog/price-lists.htm#product_variants) in the Price Lists guides topic for more information.
-			///
 			public bool IsVariation { get; set; }
 
-			///
-			///The minimum advertised price (MAP) of the product, if  is set to .
-			///
 			public decimal? Map { get; set; }
 
-			///
-			///The date the price list entry's map is no longer in effect.
-			///
 			public DateTime? MapEndDate { get; set; }
 
-			///
-			///Specifies whether to use the product's default catalog map, or to override the product's default catalog map.This property has the following valid values:* * 
-			///
 			public string MapMode { get; set; }
 
-			///
-			///The date the price list entry's map takes effect.
-			///
 			public DateTime? MapStartDate { get; set; }
 
-			///
-			///The manufacturer's suggested retail price (MSRP) for the product. This content may be defined by the supplier.
-			///
 			public decimal? Msrp { get; set; }
 
-			///
-			///Specifies whether to use the product's default catalog msrp, or to override the product's default catalog msrp.
-			///
 			public string MsrpMode { get; set; }
 
-			///
-			///List of option attributes configured for an object. These values are associated and used by products, product bundles, and product types.
-			///
 			public List<ProductOption> Options { get; set; }
 
-			///
-			///A list of product pricing information associated with the price list entry.
-			///
 			public List<PriceListEntryPrice> PriceEntries { get; set; }
 
-			///
-			///External unique identifier of the Price List. Must be unique an only contain url sanitized characters. The max length is 50.
-			///
 			public string PriceListCode { get; set; }
 
-			///
-			///This property is for future price list functionality and currently should always be .
-			///
 			public string PriceListEntryMode { get; set; }
 
-			///
-			///This property is used for referencing the price list entry. Read-only.
-			///
 			public int PriceListEntrySequence { get; set; }
 
-			///
-			///The unique, user-defined product code of a product, used throughout  to reference and associate to a product.
-			///
+			public string PriceListEntryTypeCode { get; set; }
+
 			public string ProductCode { get; set; }
 
-			///
-			///The name of the product that represents a line item in a taxable order or product bundle.
-			///
 			public string ProductName { get; set; }
 
-			///
-			///Specifies the date and time in UTC format when the price list entry is in effect.
-			///
 			public DateTime? StartDate { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/PriceListEntryCollection.cs b/Mozu.Api/Contracts/ProductAdmin/PriceListEntryCollection.cs
old mode 100644
new mode 100755
index f12421cc..e46ba45f
--- a/Mozu.Api/Contracts/ProductAdmin/PriceListEntryCollection.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/PriceListEntryCollection.cs
@@ -14,34 +14,16 @@
 
 namespace Mozu.Api.Contracts.ProductAdmin
 {
-		///
-		///	A collection of price list entries and their details.
-		///
 		public class PriceListEntryCollection
 		{
-			///
-			///A list of requested items. All returned data is provided in an items array.For a failed request, the returned response may be success with an empty item array.
-			///
 			public List<PriceListEntry> Items { get; set; }
 
-			///
-			///The total number of pages of the results divided per the `pageSize`.
-			///
 			public int PageCount { get; set; }
 
-			///
-			///The number of results to display on each page when creating paged results from a query. The amount is divided and displayed on the `pageCount `amount of pages. The default is 20 and maximum value is 200 per page.
-			///
 			public int PageSize { get; set; }
 
-			///
-			///When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a `pageSize `of 25, to get the 51st through the 75th items, use `startIndex=50`.
-			///
 			public int StartIndex { get; set; }
 
-			///
-			///The total number of items in the list.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/PriceListEntryExtra.cs b/Mozu.Api/Contracts/ProductAdmin/PriceListEntryExtra.cs
old mode 100644
new mode 100755
index a5a5c4cf..d26e9f80
--- a/Mozu.Api/Contracts/ProductAdmin/PriceListEntryExtra.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/PriceListEntryExtra.cs
@@ -13,39 +13,18 @@
 
 namespace Mozu.Api.Contracts.ProductAdmin
 {
-		///
-		///	Mozu.ProductAdmin.Contracts.PriceListEntryExtra ApiType DOCUMENT_HERE 
-		///
 		public class PriceListEntryExtra
 		{
-			///
-			///Merchant-defined code for an extensible attribute. This code may be used to generate an object's fully qualified name, such as for products.
-			///
 			public string AttributeCode { get; set; }
 
-			///
-			///The fully qualified name of the attribute. The attributeDefiniteId may be used to generate this name.
-			///
 			public string AttributeFQN { get; set; }
 
-			///
-			///Name of attribute that this extra is based on. ReadOnly
-			///
 			public string AttributeName { get; set; }
 
-			///
-			///Value to display. Currently only vaild when Value is a string type. ReadOnly
-			///
 			public string DisplayValue { get; set; }
 
-			///
-			///PriceList price for the extra
-			///
 			public decimal Price { get; set; }
 
-			///
-			///The value of a property, used by numerous objects within  including facets, attributes, products, localized content, metadata, capabilities ( and third-party), location inventory adjustment, and more. The value may be a string, integer, or double. Validation may be run against the entered and saved values depending on the object type.
-			///
 			public object Value { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/PriceListEntryPrice.cs b/Mozu.Api/Contracts/ProductAdmin/PriceListEntryPrice.cs
old mode 100644
new mode 100755
index ecf39643..ed2f35b9
--- a/Mozu.Api/Contracts/ProductAdmin/PriceListEntryPrice.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/PriceListEntryPrice.cs
@@ -13,34 +13,16 @@
 
 namespace Mozu.Api.Contracts.ProductAdmin
 {
-		///
-		///	Mozu.ProductAdmin.Contracts.PriceListEntryPrice ApiType DOCUMENT_HERE 
-		///
 		public class PriceListEntryPrice
 		{
-			///
-			///The product's list price if  is set to .
-			///
 			public decimal? ListPrice { get; set; }
 
-			///
-			///Specifies whether to use the product's default catalog list price, or to override the product's default catalog list price.This property has the following valid values:* * 
-			///
 			public string ListPriceMode { get; set; }
 
-			///
-			///This property is for future price list entry functionality and currently should always be 1.
-			///
 			public int MinQty { get; set; }
 
-			///
-			///The set sale price for a product consisting of a price with a discount already applied.For price list entries, this property is the product's sale price if the  is set to .
-			///
 			public decimal? SalePrice { get; set; }
 
-			///
-			///Specifies whether to use the product's default catalog sale price, or to override the product's default catalog sale price.This property has the following valid values:* * 
-			///
 			public string SalePriceMode { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/Product.cs b/Mozu.Api/Contracts/ProductAdmin/Product.cs
old mode 100644
new mode 100755
index 28b9f562..3928b5e2
--- a/Mozu.Api/Contracts/ProductAdmin/Product.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/Product.cs
@@ -16,23 +16,14 @@
 namespace Mozu.Api.Contracts.ProductAdmin
 {
 		///
-		///	The properties of a product, referenced and used by carts, orders, wish lists, and returns.
+		///	Properties of a product in a master catalog. Product properties include discounts, localizable content, inventory information, attribute configurations, price data, and the catalogs associated with a product.
 		///
 		public class Product
 		{
-			///
-			///List of discounts available per configured conditions and criteria. These discounts are associated with products, orders, and shipping costs. Shoppers can view these discounts per order, per product in an order, or for their shipping depending on the configuration.
-			///
 			public List<Discount> ApplicableDiscounts { get; set; }
 
-			///
-			///Identifier and datetime stamp information recorded when a user or application creates, updates, or deletes a resource entity. This value is system-supplied and read-only.
-			///
 			public AuditInfo AuditInfo { get; set; }
 
-			///
-			///Product code defined by the tenant administrator to use as a base prefix when generating product codes for any variations of this product.
-			///
 			public string BaseProductCode { get; set; }
 
 			///
@@ -42,114 +33,54 @@ public class Product
 
 			public ProductLocalizedContent Content { get; set; }
 
-			///
-			///List of extra product attributes defined for this product. For example, monogram could be a possible extra for a shirt product.
-			///
 			public List<ProductExtra> Extras { get; set; }
 
 			///
-			///List of supported types of fulfillment for the product or variation. The types include direct ship, in-store pickup, or both.
+			///Describes the types of fulfillment that are supported for this product. A product can support direct ship, in-store pickup, or both. Supported fulfillment types are defined at the master catalog level. Client administrators cannot override the supported fulfillment types at the catalog level.
 			///
 			public List<string> FulfillmentTypesSupported { get; set; }
 
-			///
-			///If true, the product has configurable options. This option means that a product is not purchasable until the shopper selects options that resolve into a product variation. Configurable options for a product are the choices a shopper makes when ordering a product. Size and color are configurable options. System-supplied and read-only.
-			///
 			public bool HasConfigurableOptions { get; set; }
 
-			///
-			///If true, this product has standalone options that a shopper can select without configuring a defined product variations. System-supplied and read only.
-			///
 			public bool HasStandAloneOptions { get; set; }
 
-			///
-			///Properties and data of inventory information for configured and bundled products. If product stock is managed, the data specifies out of stock behavior.
-			///
 			public ProductInventoryInfo InventoryInfo { get; set; }
 
-			///
-			///Indicates if the product must be shipped alone in a container. This is used for products and products within a bundle. If true, this product cannot be shipped in a package with other items and must ship in a package by itself.
-			///
 			public bool? IsPackagedStandAlone { get; set; }
 
-			///
-			///Indicates if the product in a cart, order, or wish list is purchased on a recurring schedule. If true, the item can be purchased or fulfilled at regular intervals, such as a monthly billing cycle. For example, digital or physical product subscriptions are recurring cart items. This property is not used at this time and is reserved for future functionality.
-			///
 			public bool? IsRecurring { get; set; }
 
-			///
-			///Indicates if the item is subject to taxation, used by products, options, extras, cart and order items, line items, and wish lists. If true, the entity is subject to tax based on the relevant tax rate and rules.
-			///
 			public bool? IsTaxable { get; set; }
 
-			///
-			///If true, this product is valid for the assigned product type.
-			///
 			public bool? IsValidForProductType { get; set; }
 
-			///
-			///If true, this configured product represents a product variation defined with configurable options. System-supplied and read only.
-			///
 			public bool IsVariation { get; set; }
 
-			///
-			///The unique identifier of the master catalog associated with the entity.
-			///
 			public int? MasterCatalogId { get; set; }
 
-			///
-			///List of option attributes configured for an object. These values are associated and used by products, product bundles, and product types.
-			///
 			public List<ProductOption> Options { get; set; }
 
-			///
-			///Height of a package or bundle package in imperial units of feet and inches.
-			///
 			public Measurement PackageHeight { get; set; }
 
-			///
-			///Length of a package or bundle package in imperial units of feet and inches.
-			///
 			public Measurement PackageLength { get; set; }
 
-			///
-			///Weight of a package or bundle package in imperial units of pounds and ounces.
-			///
 			public Measurement PackageWeight { get; set; }
 
-			///
-			///Width of a package or bundle package in imperial units of feet and inches.
-			///
 			public Measurement PackageWidth { get; set; }
 
-			///
-			///Unit price that the client intends to sell the product if no sale price is set.
-			///
 			public ProductPrice Price { get; set; }
 
 			///
-			///Properties that describe the behavior the system uses when determining the price of products.
+			///Describes the behavior the system uses when determining the price of the product.
 			///
 			public ProductPricingBehaviorInfo PricingBehavior { get; set; }
 
-			///
-			///Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.
-			///
 			public string ProductCode { get; set; }
 
-			///
-			///Properties defined for a product as they appear in its associated catalogs.
-			///
 			public List<ProductInCatalogInfo> ProductInCatalogs { get; set; }
 
-			///
-			///Integer that represents the sequential order of the product.
-			///
 			public int? ProductSequence { get; set; }
 
-			///
-			///Unique identifier of the product type assigned for this product. Tenant administrators can only define one product type per product.
-			///
 			public int? ProductTypeId { get; set; }
 
 			///
@@ -157,29 +88,14 @@ public class Product
 			///
 			public string ProductUsage { get; set; }
 
-			///
-			///Collection of property attributes defined for the object. Properties are associated to all objects within , including documents, products, and product types.
-			///
 			public List<ProductProperty> Properties { get; set; }
 
-			///
-			///Properties of the product publishing settings for the associated product.
-			///
 			public ProductPublishingInfo PublishingInfo { get; set; }
 
-			///
-			///The search engine optimized content defined for products or products associated with a catalog. If no SEO content is specified in the request for products associated with a catalog, this catalog uses the SEO content defined in the master catalog. To override the SEO content for this catalog, the `IsSEOContentOverridden `flag must be set to "true".
-			///
 			public ProductLocalizedSEOContent SeoContent { get; set; }
 
-			///
-			///Identifier of the shipping class.
-			///
 			public int? ShippingClassId { get; set; }
 
-			///
-			///If the product must be packaged separately, the type of standalone package to use.
-			///
 			public string StandAlonePackageType { get; set; }
 
 			///
@@ -187,19 +103,10 @@ public class Product
 			///
 			public ProductSupplierInfo SupplierInfo { get; set; }
 
-			///
-			///The universal product code (UPC) is the barcode defined for the product. The UPC is unique across all sales channels. 
-			///
 			public string Upc { get; set; }
 
-			///
-			///System-generated key that represents the attribute values that uniquely identify a specific product variation.
-			///
 			public string VariationKey { get; set; }
 
-			///
-			///The list of product variation configurations defined for this product based on its available product option attributes.
-			///
 			public List<ProductVariationOption> VariationOptions { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/ProductCategory.cs b/Mozu.Api/Contracts/ProductAdmin/ProductCategory.cs
old mode 100644
new mode 100755
index 06079c91..b6ddd569
--- a/Mozu.Api/Contracts/ProductAdmin/ProductCategory.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/ProductCategory.cs
@@ -18,9 +18,6 @@ namespace Mozu.Api.Contracts.ProductAdmin
 		///
 		public class ProductCategory
 		{
-			///
-			///Unique identifier for the storefront container used to organize products.
-			///
 			public int CategoryId { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/ProductCodeRename.cs b/Mozu.Api/Contracts/ProductAdmin/ProductCodeRename.cs
old mode 100644
new mode 100755
index df5b98fb..a08c298b
--- a/Mozu.Api/Contracts/ProductAdmin/ProductCodeRename.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/ProductCodeRename.cs
@@ -13,19 +13,10 @@
 
 namespace Mozu.Api.Contracts.ProductAdmin
 {
-		///
-		///	Properties for a product code current and changed content.
-		///
 		public class ProductCodeRename
 		{
-			///
-			///The existing product code to be changed.
-			///
 			public string ExistingProductCode { get; set; }
 
-			///
-			///The new product code for the product. This code must be unique across all catalogs.
-			///
 			public string NewProductCode { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/ProductCollection.cs b/Mozu.Api/Contracts/ProductAdmin/ProductCollection.cs
old mode 100644
new mode 100755
index cc2e0f06..34a8b12b
--- a/Mozu.Api/Contracts/ProductAdmin/ProductCollection.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/ProductCollection.cs
@@ -19,26 +19,14 @@ namespace Mozu.Api.Contracts.ProductAdmin
 		///
 		public class ProductCollection
 		{
-			///
-			///An array list of objects in the returned collection.
-			///
 			public List<Product> Items { get; set; }
 
-			///
-			///The number of pages returned based on the startIndex and pageSize values specified. This value is system-supplied and read-only.
-			///
 			public int PageCount { get; set; }
 
-			///
-			///The number of results to display on each page when creating paged results from a query. The maximum value is 200.
-			///
 			public int PageSize { get; set; }
 
 			public int StartIndex { get; set; }
 
-			///
-			///The number of results listed in the query collection, represented by a signed 64-bit (8-byte) integer. This value is system-supplied and read-only.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/ProductCost.cs b/Mozu.Api/Contracts/ProductAdmin/ProductCost.cs
old mode 100644
new mode 100755
diff --git a/Mozu.Api/Contracts/ProductAdmin/ProductDiscountCondition.cs b/Mozu.Api/Contracts/ProductAdmin/ProductDiscountCondition.cs
old mode 100644
new mode 100755
diff --git a/Mozu.Api/Contracts/ProductAdmin/ProductExtra.cs b/Mozu.Api/Contracts/ProductAdmin/ProductExtra.cs
old mode 100644
new mode 100755
index 616b74db..c2de1e22
--- a/Mozu.Api/Contracts/ProductAdmin/ProductExtra.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/ProductExtra.cs
@@ -19,24 +19,12 @@ namespace Mozu.Api.Contracts.ProductAdmin
 		///
 		public class ProductExtra
 		{
-			///
-			///The fully qualified name of the attribute, which is a user defined attribute identifier.
-			///
 			public string AttributeFQN { get; set; }
 
-			///
-			///If true, the shopper can select more than one value from a predefined list for this extra.
-			///
 			public bool? IsMultiSelect { get; set; }
 
-			///
-			///Indicates if the property, attribute, product option, or product extra is required. If true, the object must have a defined value.
-			///
 			public bool? IsRequired { get; set; }
 
-			///
-			///List of value data for objects.
-			///
 			public List<ProductExtraValue> Values { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/ProductExtraValue.cs b/Mozu.Api/Contracts/ProductAdmin/ProductExtraValue.cs
old mode 100644
new mode 100755
index b523def3..e6a97066
--- a/Mozu.Api/Contracts/ProductAdmin/ProductExtraValue.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/ProductExtraValue.cs
@@ -19,39 +19,21 @@ namespace Mozu.Api.Contracts.ProductAdmin
 		///
 		public class ProductExtraValue
 		{
-			///
-			///Properties of an individual vocabulary value for an attribute. For example, a "color" attribute might have the following vocabulary values: Red, Blue, Green.
-			///
 			public AttributeVocabularyValue AttributeVocabularyValueDetail { get; set; }
 
-			///
-			///If the product is in relative pricing mode, this is the difference between associated prices for a product, variation option, or extra. The difference is calculated by subtracting the base price from the associated price with this product, option, and/or extra. For example, if a product with a defined monogram extra costs an additional $10, the `deltaPrice `value is "10". Between options, a price for a medium may be $10 and a large $12 giving a `deltaPrice `value of "2".Refer to [Product Variant Pricing and Weight](../../../guides/catalog/products.htm#product_variant_pricing_and_weight) in the Products guides topic for more information.
-			///
 			public ProductExtraValueDeltaPrice DeltaPrice { get; set; }
 
-			///
-			///The difference between the weight associated with this product, variation option, or extra and the base product. For example, if a product with a monogram weighs an extra 1/4 lb, the DeltaWeight value is "0.25". The amount of the delta is set by the weight type for the storefront.
-			///
 			public decimal? DeltaWeight { get; set; }
 
-			///
-			///If true, the value for the product extra is selected by default. Shopper entered extras cannot be defaulted.
-			///
 			public bool? IsDefaulted { get; set; }
 
-			///
-			///The difference between associated prices for a product, variation option, or extra that is localized per the `localeCode`. The difference is calculated by subtracting the base price from the associated price with this product, option, and/or extra. Depending on the localeCode, the price may be converted such as from USD (US Dollar) to EUR (euro).
-			///
 			public List<ProductExtraValueDeltaPrice> LocalizedDeltaPrice { get; set; }
 
 			///
-			///The specified quantity of objects and items. This property is used for numerous object types including products, options, components within a product bundle, cart and order items, returned items, shipping line items, items in a digital product. and items associated with types and reservations.
+			///When setting up the extra on a parent product, you can specify a quantity. You can have an extra that is a quantity > 1 of another product.
 			///
 			public int? Quantity { get; set; }
 
-			///
-			///The value of a property, used by numerous objects within  including facets, attributes, products, localized content, metadata, capabilities ( and third-party), location inventory adjustment, and more. The value may be a string, integer, or double. Validation may be run against the entered and saved values depending on the object type.
-			///
 			public object Value { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/ProductExtraValueDeltaPrice.cs b/Mozu.Api/Contracts/ProductAdmin/ProductExtraValueDeltaPrice.cs
old mode 100644
new mode 100755
index b69c1a5c..db915f42
--- a/Mozu.Api/Contracts/ProductAdmin/ProductExtraValueDeltaPrice.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/ProductExtraValueDeltaPrice.cs
@@ -18,14 +18,8 @@ namespace Mozu.Api.Contracts.ProductAdmin
 		///
 		public class ProductExtraValueDeltaPrice
 		{
-			///
-			///3-letter ISO 4217 standard global currency code. Currently, only "USD" (US Dollar) is supported.
-			///
 			public string CurrencyCode { get; set; }
 
-			///
-			///If the product is in relative pricing mode, this is the difference between associated prices for a product, variation option, or extra. The difference is calculated by subtracting the base price from the associated price with this product, option, and/or extra. For example, if a product with a defined monogram extra costs an additional $10, the `deltaPrice `value is "10". Between options, a price for a medium may be $10 and a large $12 giving a `deltaPrice `value of "2".Refer to [Product Variant Pricing and Weight](../../../guides/catalog/products.htm#product_variant_pricing_and_weight) in the Products guides topic for more information.
-			///
 			public decimal DeltaPrice { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/ProductInCatalogInfo.cs b/Mozu.Api/Contracts/ProductAdmin/ProductInCatalogInfo.cs
old mode 100644
new mode 100755
index 9cacb853..8b0ccff7
--- a/Mozu.Api/Contracts/ProductAdmin/ProductInCatalogInfo.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/ProductInCatalogInfo.cs
@@ -20,69 +20,30 @@ namespace Mozu.Api.Contracts.ProductAdmin
 		///
 		public class ProductInCatalogInfo
 		{
-			///
-			///If true, the product is marked as available for sale in the catalog. Setting a product to IsActive = false will prevent it from being shown on the customer facing storefront.
-			///
 			public ActiveDateRange ActiveDateRange { get; set; }
 
-			///
-			///Identifier and datetime stamp information recorded when a user or application creates, updates, or deletes a resource entity. This value is system-supplied and read-only.
-			///
 			public AuditInfo AuditInfo { get; set; }
 
-			///
-			///The unique identifier of the catalog of products used by a site.
-			///
 			public int CatalogId { get; set; }
 
-			///
-			///Localizable content (such as a name and/or description) for an attribute. The content may be localized when displayed according to the locale code specified by the master catalog. Content can include descriptive text for product extensible attributes, catalog-level descriptions (displayed if isContentOverriden is true), product bundles, and customer account notes.
-			///
 			public ProductLocalizedContent Content { get; set; }
 
-			///
-			///Date this product was first Available for sale in the catalog. This is utilized in expressions that refrence DaysInCatloag.
-			///
 			public DateTime? DateFirstAvailableInCatalog { get; set; }
 
-			///
-			///Indicates if the object or feature is active.
-			///
 			public bool? IsActive { get; set; }
 
-			///
-			///If true, the content defined for this product in the master catalog in overridden in the catalog with the content specified in the request body. If false, this catalog uses the content defined in the master catalog for the product.
-			///
 			public bool? IsContentOverridden { get; set; }
 
-			///
-			///If true, the price defined for this product in the master catalog in overridden in the catalog with the price specified in the request body. If false, this catalog uses the price defined in the master catalog for the product.
-			///
 			public bool? IsPriceOverridden { get; set; }
 
-			///
-			///If true, the SEO content defined for this product in the master catalog in overridden in the catalog with the SEO content specified in the request body. If false, this catalog uses the SEO content defined in the master catalog for the product.
-			///
 			public bool? IsseoContentOverridden { get; set; }
 
-			///
-			///The price of the product associated with the specified catalog. If no price is specified in the request, this catalog uses the price defined in the master catalog. To override the product price for this catalog, the IsPriceOverridden flag must be set to "true".
-			///
 			public ProductPrice Price { get; set; }
 
-			///
-			///Specifies which static category to use in the navigation breadcrumb, regardless of how shoppers navigate to the product. If not set, or if the product belongs only to dynamic categories, the default is to use the category with the smallest ID.
-			///
 			public ProductCategory PrimaryProductCategory { get; set; }
 
-			///
-			///The product categories to define for the product associated with the specified catalog.
-			///
 			public List<ProductCategory> ProductCategories { get; set; }
 
-			///
-			///The search engine optimized content defined for products or products associated with a catalog. If no SEO content is specified in the request for products associated with a catalog, this catalog uses the SEO content defined in the master catalog. To override the SEO content for this catalog, the `IsSEOContentOverridden `flag must be set to "true".
-			///
 			public ProductLocalizedSEOContent SeoContent { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/ProductInventoryInfo.cs b/Mozu.Api/Contracts/ProductAdmin/ProductInventoryInfo.cs
old mode 100644
new mode 100755
index 6cdf4121..ede61900
--- a/Mozu.Api/Contracts/ProductAdmin/ProductInventoryInfo.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/ProductInventoryInfo.cs
@@ -18,14 +18,8 @@ namespace Mozu.Api.Contracts.ProductAdmin
 		///
 		public class ProductInventoryInfo
 		{
-			///
-			///Indicates is the item's stock is managed. If true,  manages inventory levels for this product.
-			///
 			public bool? ManageStock { get; set; }
 
-			///
-			///Determines the method this product uses when active stock is depeleted. Options include "DisplayMessage" to display an out of stock message to the shopper, "HideProduct" to disable the product on the storefront, or "AllowBackOrder" to allow the shopper to back order the product. This property is required only if  manages inventory for this product.
-			///
 			public string OutOfStockBehavior { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/ProductLocalizedContent.cs b/Mozu.Api/Contracts/ProductAdmin/ProductLocalizedContent.cs
old mode 100644
new mode 100755
index fe17560a..9572ce49
--- a/Mozu.Api/Contracts/ProductAdmin/ProductLocalizedContent.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/ProductLocalizedContent.cs
@@ -19,29 +19,14 @@ namespace Mozu.Api.Contracts.ProductAdmin
 		///
 		public class ProductLocalizedContent
 		{
-			///
-			///Language used for the entity. Currently, only "en-US" is supported.
-			///
 			public string LocaleCode { get; set; }
 
-			///
-			///Lengthy full description for a product description, displayed on product detail pages within the storefront.
-			///
 			public string ProductFullDescription { get; set; }
 
-			///
-			///List of image files associated with a product. This content may include the image file URL, name, and other information as available.
-			///
 			public List<ProductLocalizedImage> ProductImages { get; set; }
 
-			///
-			///The name of the product that represents a line item in a taxable order or product bundle.
-			///
 			public string ProductName { get; set; }
 
-			///
-			///Brief text description of the product or component in a product bundle, typically used when the product is displayed in a list or in search results.
-			///
 			public string ProductShortDescription { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/ProductLocalizedImage.cs b/Mozu.Api/Contracts/ProductAdmin/ProductLocalizedImage.cs
old mode 100644
new mode 100755
index bccc6c55..6fd662f0
--- a/Mozu.Api/Contracts/ProductAdmin/ProductLocalizedImage.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/ProductLocalizedImage.cs
@@ -18,49 +18,25 @@ namespace Mozu.Api.Contracts.ProductAdmin
 		///
 		public class ProductLocalizedImage
 		{
-			///
-			///Descriptive text associated with the image or video that appears on the web storefront. This text displays on a hover-over in the browser, providing further information on the content displayed. The alternate text should be plain alphanumeric text without special characters or HTML coding.
-			///
 			public string AltText { get; set; }
 
 			///
-			///The identifier of the image in the  CMS. Supply a value for either the CMS ID or Image URL parameter.
+			///The identifier of the product image in the Mozu CMS. Supply a value for either the CMS ID or the Image URL parameter.
 			///
 			public string CmsId { get; set; }
 
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public int? Id { get; set; }
 
-			///
-			///The localized title for an image that displays on the storefront. If localized, the displayed content is set per the locale code for the site.
-			///
 			public string ImageLabel { get; set; }
 
-			///
-			///The URL link for the image file associated with a product or category.
-			///
 			public string ImageUrl { get; set; }
 
-			///
-			///Language used for the entity. Currently, only "en-US" is supported.
-			///
 			public string LocaleCode { get; set; }
 
-			///
-			///Type of media specification required to successfully render the image, video, or other media content for products and categories.
-			///
 			public string MediaType { get; set; }
 
-			///
-			///The numeric order of objects, used by a vocabulary value defined for an extensible attribute, images, and categories.
-			///
 			public int? Sequence { get; set; }
 
-			///
-			///The URL of a video files for a product or category. The path name is set in the language specified by the LocaleCode.
-			///
 			public string VideoUrl { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/ProductLocalizedSEOContent.cs b/Mozu.Api/Contracts/ProductAdmin/ProductLocalizedSEOContent.cs
old mode 100644
new mode 100755
index 8f789a22..aa027ddc
--- a/Mozu.Api/Contracts/ProductAdmin/ProductLocalizedSEOContent.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/ProductLocalizedSEOContent.cs
@@ -18,34 +18,16 @@ namespace Mozu.Api.Contracts.ProductAdmin
 		///
 		public class ProductLocalizedSEOContent
 		{
-			///
-			///Language used for the entity. Currently, only "en-US" is supported.
-			///
 			public string LocaleCode { get; set; }
 
-			///
-			///Description defined for metadata, used to interally manage data, in the language specified by the `localeCode`. This content is used by categories, products, localized content, and SEO content.
-			///
 			public string MetaTagDescription { get; set; }
 
-			///
-			///Keywords defined for metadata, used to internally manage data, in the language specified by the `localeCode`. Keywords are used by content for categories, products, localized content, and SEO content.
-			///
 			public string MetaTagKeywords { get; set; }
 
-			///
-			///Title defined for metadata, used to internally manage data, in the language specified by the `localeCode`. Titles are used by content for categories, products, localized content, and SEO content.
-			///
 			public string MetaTagTitle { get; set; }
 
-			///
-			///The search engine optimized, human-readable portion of the URL. The content is localized according to the product's `localeCode`.
-			///
 			public string SeoFriendlyUrl { get; set; }
 
-			///
-			///Customizes the HTML title tag within the header section of the product details page for the specified product.
-			///
 			public string TitleTagTitle { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/ProductOption.cs b/Mozu.Api/Contracts/ProductAdmin/ProductOption.cs
old mode 100644
new mode 100755
index 644b9e84..cf6e7419
--- a/Mozu.Api/Contracts/ProductAdmin/ProductOption.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/ProductOption.cs
@@ -19,14 +19,8 @@ namespace Mozu.Api.Contracts.ProductAdmin
 		///
 		public class ProductOption
 		{
-			///
-			///The fully qualified name of the attribute, which is a user defined attribute identifier.
-			///
 			public string AttributeFQN { get; set; }
 
-			///
-			///List of value data for objects.
-			///
 			public List<ProductOptionValue> Values { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/ProductOptionValue.cs b/Mozu.Api/Contracts/ProductAdmin/ProductOptionValue.cs
old mode 100644
new mode 100755
index c04949ef..fe5f3500
--- a/Mozu.Api/Contracts/ProductAdmin/ProductOptionValue.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/ProductOptionValue.cs
@@ -18,14 +18,8 @@ namespace Mozu.Api.Contracts.ProductAdmin
 		///
 		public class ProductOptionValue
 		{
-			///
-			///Properties of an individual vocabulary value for an attribute. For example, a "color" attribute might have the following vocabulary values: Red, Blue, Green.
-			///
 			public AttributeVocabularyValue AttributeVocabularyValueDetail { get; set; }
 
-			///
-			///The value of a property, used by numerous objects within  including facets, attributes, products, localized content, metadata, capabilities ( and third-party), location inventory adjustment, and more. The value may be a string, integer, or double. Validation may be run against the entered and saved values depending on the object type.
-			///
 			public object Value { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/ProductPrice.cs b/Mozu.Api/Contracts/ProductAdmin/ProductPrice.cs
old mode 100644
new mode 100755
index 61b43277..4cf9fdcf
--- a/Mozu.Api/Contracts/ProductAdmin/ProductPrice.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/ProductPrice.cs
@@ -19,13 +19,10 @@ namespace Mozu.Api.Contracts.ProductAdmin
 		public class ProductPrice
 		{
 			///
-			///The credit value of the product or bundled product. When the `goodsType `is `DigitalCredit`, this value is populated to indicate the value of the credit. This is used to create store credit in the fulfillment of gift cards.
+			///The credit amount of the product.
 			///
 			public decimal? CreditValue { get; set; }
 
-			///
-			///3-letter ISO 4217 standard global currency code. Currently, only "USD" (US Dollar) is supported.
-			///
 			public string IsoCurrencyCode { get; set; }
 
 			///
@@ -44,18 +41,12 @@ public class ProductPrice
 			public DateTime? MapStartDate { get; set; }
 
 			///
-			///The manufacturer's suggested retail price (MSRP) for the product. This content may be defined by the supplier.
+			///The manufacturer's suggested retail price, as defined by the supplier.
 			///
 			public decimal? Msrp { get; set; }
 
-			///
-			///Price that the merchant intends to sell the product which is not necessarily the list price. This is the price the merchant intends to sell the product if no sale price is present.
-			///
 			public decimal? Price { get; set; }
 
-			///
-			///The set sale price for a product consisting of a price with a discount already applied.For price list entries, this property is the product's sale price if the  is set to .
-			///
 			public decimal? SalePrice { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/ProductPricingBehaviorInfo.cs b/Mozu.Api/Contracts/ProductAdmin/ProductPricingBehaviorInfo.cs
old mode 100644
new mode 100755
index 0b76e439..9a56208c
--- a/Mozu.Api/Contracts/ProductAdmin/ProductPricingBehaviorInfo.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/ProductPricingBehaviorInfo.cs
@@ -19,23 +19,20 @@ namespace Mozu.Api.Contracts.ProductAdmin
 		public class ProductPricingBehaviorInfo
 		{
 			///
-			///Indicates if the discount is restricted. If true, the system cannot apply any discounts to this product. Discount restrictions are defined at the master catalog level. Client administrators cannot override discount restrictions at the catalog level, but they can limit the restriction to a defined time interval.For price list entries, specifies whether discounts are restricted for the specific entry if  is set to .Refer to [Discount Restriction](../../../guides/catalog/price-lists.htm#discountrestriction) in the Price Lists guides topic for more information.
+			///If true, the system cannot apply any discounts to this product. Discount restrictions are defined at the master catalog level. Client administrators cannot override discount restrictions at the catalog level, but they can limit the restriction to a defined time interval.
 			///
 			public bool? DiscountsRestricted { get; set; }
 
 			///
-			///The date and time on which the discount restriction period ends.
+			///If discounts are restricted for this product, the date and time the discount restriction ends, in UTC datetime.
 			///
 			public DateTime? DiscountsRestrictedEndDate { get; set; }
 
 			///
-			///The date and time on which the discount restriction period starts.
+			///If discounts are restricted for this product, the date and time the discount restriction begins, in UTC datetime.
 			///
 			public DateTime? DiscountsRestrictedStartDate { get; set; }
 
-			///
-			///Specifies the pricing method for variations associated with the product.This property has the following valid values:* * 
-			///
 			public string VariationPricingMethod { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/ProductProperty.cs b/Mozu.Api/Contracts/ProductAdmin/ProductProperty.cs
old mode 100644
new mode 100755
index ea12c6ac..446749e4
--- a/Mozu.Api/Contracts/ProductAdmin/ProductProperty.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/ProductProperty.cs
@@ -15,18 +15,12 @@
 namespace Mozu.Api.Contracts.ProductAdmin
 {
 		///
-		///	Details of a property defined for a product.
+		///	Properties of the product property to create such as attribute detail, fully qualified name, and list of product property values.
 		///
 		public class ProductProperty
 		{
-			///
-			///The fully qualified name of the attribute, which is a user defined attribute identifier.
-			///
 			public string AttributeFQN { get; set; }
 
-			///
-			///List of value data for objects.
-			///
 			public List<ProductPropertyValue> Values { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/ProductPropertyValue.cs b/Mozu.Api/Contracts/ProductAdmin/ProductPropertyValue.cs
old mode 100644
new mode 100755
index e57085fe..86ba2fb4
--- a/Mozu.Api/Contracts/ProductAdmin/ProductPropertyValue.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/ProductPropertyValue.cs
@@ -15,28 +15,16 @@
 namespace Mozu.Api.Contracts.ProductAdmin
 {
 		///
-		///	Properties of a value for a product property.
+		///	Value details for a product property attribute.
 		///
 		public class ProductPropertyValue
 		{
-			///
-			///Properties of an individual vocabulary value for an attribute. For example, a "color" attribute might have the following vocabulary values: Red, Blue, Green.
-			///
 			public AttributeVocabularyValue AttributeVocabularyValueDetail { get; set; }
 
-			///
-			///Localizable content (such as a name and/or description) for an attribute. The content may be localized when displayed according to the locale code specified by the master catalog. Content can include descriptive text for product extensible attributes, catalog-level descriptions (displayed if isContentOverriden is true), product bundles, and customer account notes.
-			///
 			public ProductPropertyValueLocalizedContent Content { get; set; }
 
-			///
-			///The localized content associated with the object.
-			///
 			public List<ProductPropertyValueLocalizedContent> LocalizedContent { get; set; }
 
-			///
-			///The value of a property, used by numerous objects within  including facets, attributes, products, localized content, metadata, capabilities ( and third-party), location inventory adjustment, and more. The value may be a string, integer, or double. Validation may be run against the entered and saved values depending on the object type.
-			///
 			public object Value { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/ProductPropertyValueLocalizedContent.cs b/Mozu.Api/Contracts/ProductAdmin/ProductPropertyValueLocalizedContent.cs
old mode 100644
new mode 100755
index f1c385ef..043ecd12
--- a/Mozu.Api/Contracts/ProductAdmin/ProductPropertyValueLocalizedContent.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/ProductPropertyValueLocalizedContent.cs
@@ -18,14 +18,8 @@ namespace Mozu.Api.Contracts.ProductAdmin
 		///
 		public class ProductPropertyValueLocalizedContent
 		{
-			///
-			///Language used for the entity. Currently, only "en-US" is supported.
-			///
 			public string LocaleCode { get; set; }
 
-			///
-			///If the object value is a String, this value provides that string value, used by vocabulary property values, products, and options.
-			///
 			public string StringValue { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/ProductPublishingInfo.cs b/Mozu.Api/Contracts/ProductAdmin/ProductPublishingInfo.cs
old mode 100644
new mode 100755
index fe990591..9caadd6c
--- a/Mozu.Api/Contracts/ProductAdmin/ProductPublishingInfo.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/ProductPublishingInfo.cs
@@ -18,24 +18,12 @@ namespace Mozu.Api.Contracts.ProductAdmin
 		///
 		public class ProductPublishingInfo
 		{
-			///
-			///The user ID of the user who last published changes for this product in the catalog.
-			///
 			public string LastPublishedBy { get; set; }
 
-			///
-			///The date and time a draft change for this product was published to the catalog.
-			///
 			public DateTime? LastPublishedDate { get; set; }
 
-			///
-			///The current publishing state of this product in the catalog, which is Live, New, or Draft. Live products appear on the storefront and have no pending changes. New products have been created but do not yet appear on the storefront. Draft products appear on the storefront but have pending changes that have not yet been published.
-			///
 			public string PublishedState { get; set; }
 
-			///
-			///The unique identifier of the publish set the pending product draft is assigned to. This field is not valid if the product is live.
-			///
 			public string PublishSetCode { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/ProductReservation.cs b/Mozu.Api/Contracts/ProductAdmin/ProductReservation.cs
old mode 100644
new mode 100755
index 89d0baee..c0510af4
--- a/Mozu.Api/Contracts/ProductAdmin/ProductReservation.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/ProductReservation.cs
@@ -19,39 +19,18 @@ namespace Mozu.Api.Contracts.ProductAdmin
 		///
 		public class ProductReservation
 		{
-			///
-			///Identifier and datetime stamp information recorded when a user or application creates, updates, or deletes a resource entity. This value is system-supplied and read-only.
-			///
 			public AuditInfo AuditInfo { get; set; }
 
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public int? Id { get; set; }
 
-			///
-			///The unique, user-defined code that identifies a location. This location can be the location where the order was entered, location for newly in-stock products, and where products are returned.
-			///
 			public string LocationCode { get; set; }
 
-			///
-			///Unique identifier of the order associated with the payment.
-			///
 			public string OrderId { get; set; }
 
-			///
-			///Unique identifier of the order item associated with a validation message, order, or return.
-			///
 			public string OrderItemId { get; set; }
 
-			///
-			///Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.
-			///
 			public string ProductCode { get; set; }
 
-			///
-			///The specified quantity of objects and items. This property is used for numerous object types including products, options, components within a product bundle, cart and order items, returned items, shipping line items, items in a digital product. and items associated with types and reservations.
-			///
 			public int Quantity { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/ProductReservationCollection.cs b/Mozu.Api/Contracts/ProductAdmin/ProductReservationCollection.cs
old mode 100644
new mode 100755
index 5d3d97a5..d4cff80b
--- a/Mozu.Api/Contracts/ProductAdmin/ProductReservationCollection.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/ProductReservationCollection.cs
@@ -19,26 +19,14 @@ namespace Mozu.Api.Contracts.ProductAdmin
 		///
 		public class ProductReservationCollection
 		{
-			///
-			///An array list of objects in the returned collection.
-			///
 			public List<ProductReservation> Items { get; set; }
 
-			///
-			///The number of pages returned based on the startIndex and pageSize values specified. This value is system-supplied and read-only.
-			///
 			public int PageCount { get; set; }
 
-			///
-			///The number of results to display on each page when creating paged results from a query. The maximum value is 200.
-			///
 			public int PageSize { get; set; }
 
 			public int StartIndex { get; set; }
 
-			///
-			///The number of results listed in the query collection, represented by a signed 64-bit (8-byte) integer. This value is system-supplied and read-only.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/ProductSupplierInfo.cs b/Mozu.Api/Contracts/ProductAdmin/ProductSupplierInfo.cs
old mode 100644
new mode 100755
index 3b07cf64..64754594
--- a/Mozu.Api/Contracts/ProductAdmin/ProductSupplierInfo.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/ProductSupplierInfo.cs
@@ -29,7 +29,7 @@ public class ProductSupplierInfo
 			public string DistPartNumber { get; set; }
 
 			///
-			///The manufacturer's part number for the product.
+			///The manufacturer part number associated with this product, defined by the product manufacturer.
 			///
 			public string MfgPartNumber { get; set; }
 
diff --git a/Mozu.Api/Contracts/ProductAdmin/ProductType.cs b/Mozu.Api/Contracts/ProductAdmin/ProductType.cs
old mode 100644
new mode 100755
index 8576884f..5347d527
--- a/Mozu.Api/Contracts/ProductAdmin/ProductType.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/ProductType.cs
@@ -20,59 +20,32 @@ namespace Mozu.Api.Contracts.ProductAdmin
 		///
 		public class ProductType
 		{
-			///
-			///Identifier and datetime stamp information recorded when a user or application creates, updates, or deletes a resource entity. This value is system-supplied and read-only.
-			///
 			public AuditInfo AuditInfo { get; set; }
 
-			///
-			///List of extra product attributes defined for this product. For example, monogram could be a possible extra for a shirt product.
-			///
 			public List<AttributeInProductType> Extras { get; set; }
 
 			///
-			///The type of goods in a bundled product. A bundled product is composed of products associated to sell together. Possible values include “Physical” and “DigitalCredit”. This comes from the `productType `of the product. Products are defaulted to a Physical `goodsType`. Gift cards have a `goodsType `of DigitalCredit.
+			///The type of goods for this product.
 			///
 			public string GoodsType { get; set; }
 
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public int? Id { get; set; }
 
-			///
-			///If true, this product is associated with the overall product type. There is only one BaseProductType per site group. System-supplied and read-only.
-			///
 			public bool IsBaseProductType { get; set; }
 
-			///
-			///The unique identifier of the master catalog associated with the entity.
-			///
 			public int? MasterCatalogId { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
-			///
-			///List of option attributes configured for an object. These values are associated and used by products, product bundles, and product types.
-			///
 			public List<AttributeInProductType> Options { get; set; }
 
-			///
-			///The total number of products. This total may indicate the total products associate with a product type or number of products in a list.
-			///
 			public int? ProductCount { get; set; }
 
 			///
-			///List of product usages that describe how products of this type are used. Products of this type can be Standard (a single product without configurable options), Configurable (a product that includes configurable option attributes), Bundle (a collection of products sold as a single entity), or Component (an invididual product that represents a component in a bundle).
+			///List of product usages that describe how products of this type are used. Products of this type can be Standard (a single product without configurable options), Configurable (a product that includes configurable option attributes), Bundle (a collection of products sold as a single entity), or Component (an invididual product that represents a component in a bundle). Product type usages cannot be both Bundle and Configurable.
 			///
 			public List<string> ProductUsages { get; set; }
 
-			///
-			///Collection of property attributes defined for the object. Properties are associated to all objects within , including documents, products, and product types.
-			///
 			public List<AttributeInProductType> Properties { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/ProductTypeCollection.cs b/Mozu.Api/Contracts/ProductAdmin/ProductTypeCollection.cs
old mode 100644
new mode 100755
index c2c84c6a..38222599
--- a/Mozu.Api/Contracts/ProductAdmin/ProductTypeCollection.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/ProductTypeCollection.cs
@@ -19,26 +19,14 @@ namespace Mozu.Api.Contracts.ProductAdmin
 		///
 		public class ProductTypeCollection
 		{
-			///
-			///An array list of objects in the returned collection.
-			///
 			public List<ProductType> Items { get; set; }
 
-			///
-			///The number of pages returned based on the startIndex and pageSize values specified. This value is system-supplied and read-only.
-			///
 			public int PageCount { get; set; }
 
-			///
-			///The number of results to display on each page when creating paged results from a query. The maximum value is 200.
-			///
 			public int PageSize { get; set; }
 
 			public int StartIndex { get; set; }
 
-			///
-			///The number of results listed in the query collection, represented by a signed 64-bit (8-byte) integer. This value is system-supplied and read-only.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/ProductVariation.cs b/Mozu.Api/Contracts/ProductAdmin/ProductVariation.cs
old mode 100644
new mode 100755
index 11f2d94d..0bea6f49
--- a/Mozu.Api/Contracts/ProductAdmin/ProductVariation.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/ProductVariation.cs
@@ -19,79 +19,43 @@ namespace Mozu.Api.Contracts.ProductAdmin
 		///
 		public class ProductVariation
 		{
-			///
-			///If the product is in relative pricing mode, this is the difference between associated prices for a product, variation option, or extra. The difference is calculated by subtracting the base price from the associated price with this product, option, and/or extra. For example, if a product with a defined monogram extra costs an additional $10, the `deltaPrice `value is "10". Between options, a price for a medium may be $10 and a large $12 giving a `deltaPrice `value of "2".Refer to [Product Variant Pricing and Weight](../../../guides/catalog/products.htm#product_variant_pricing_and_weight) in the Products guides topic for more information.
-			///
 			public ProductVariationDeltaPrice DeltaPrice { get; set; }
 
-			///
-			///The difference between the weight associated with this product, variation option, or extra and the base product. For example, if a product with a monogram weighs an extra 1/4 lb, the DeltaWeight value is "0.25". The amount of the delta is set by the weight type for the storefront.
-			///
 			public decimal? DeltaWeight { get; set; }
 
-			///
-			///If the product is in Explicit pricing mode, this is the price of the variation.Refer to [Product Variant Pricing and Weight](../../../guides/catalog/products.htm#product_variant_pricing_and_weight) in the Products guides topic for more information.
-			///
 			public ProductVariationFixedPrice FixedPrice { get; set; }
 
-			///
-			///If the product is in explicit pricing mode, this is the fixed weight of the variation.
-			///
 			public decimal? FixedWeight { get; set; }
 
 			///
-			///List of supported types of fulfillment for the product or variation. The types include direct ship, in-store pickup, or both.
+			///Describes the types of fulfillment that are supported for this product variation. A variation can support direct ship, in-store pickup, or both. Supported fulfillment types are defined at the master catalog level. Client administrators cannot override the supported fulfillment types at the catalog level.
 			///
 			public List<string> FulfillmentTypesSupported { get; set; }
 
-			///
-			///Indicates if the object or feature is active.
-			///
 			public bool? IsActive { get; set; }
 
-			///
-			///If true, the production variation is no longer available for sale. For example, if a client stops selling all "small" shirts, all product variations with the "small" option are set to IsOrphan. System-supplied and read only.
-			///
 			public bool? IsOrphan { get; set; }
 
-			///
-			///The difference between associated prices for a product, variation option, or extra that is localized per the `localeCode`. The difference is calculated by subtracting the base price from the associated price with this product, option, and/or extra. Depending on the localeCode, the price may be converted such as from USD (US Dollar) to EUR (euro).
-			///
 			public List<ProductVariationDeltaPrice> LocalizedDeltaPrice { get; set; }
 
-			///
-			///Price of the variation using fixed per currency This collection allows for multiple currencies.
-			///
 			public List<ProductVariationFixedPrice> LocalizedFixedPrice { get; set; }
 
-			///
-			///List of option attributes configured for an object. These values are associated and used by products, product bundles, and product types.
-			///
 			public List<ProductVariationOption> Options { get; set; }
 
 			///
-			///Supplier-defined properties assigned for the product.
+			///Supplier-defined properties assigned for the product variation.
 			///
 			public ProductSupplierInfo SupplierInfo { get; set; }
 
 			///
-			///The universal product code (UPC) is the barcode defined for the product. The UPC is unique across all sales channels. 
+			///The universal product code associated with the product variation. The UPC of a product is unique across all sales channels.
 			///
 			public string Upc { get; set; }
 
-			///
-			///If true, one or more product variations are configured for the specified product code.
-			///
 			public bool? VariationExists { get; set; }
 
-			///
-			///System-generated key that represents the attribute values that uniquely identify a specific product variation.
-			///
 			public string Variationkey { get; set; }
 
-			///
-			///Merchant-created code associated with a specific product variation. Variation product codes maintain an association with the base product code.
-			///
 			public string VariationProductCode { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/ProductVariationCollection.cs b/Mozu.Api/Contracts/ProductAdmin/ProductVariationCollection.cs
old mode 100644
new mode 100755
index 8c2c4b5e..b661f4bb
--- a/Mozu.Api/Contracts/ProductAdmin/ProductVariationCollection.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/ProductVariationCollection.cs
@@ -19,14 +19,8 @@ namespace Mozu.Api.Contracts.ProductAdmin
 		///
 		public class ProductVariationCollection
 		{
-			///
-			///An array list of objects in the returned collection.
-			///
 			public List<ProductVariation> Items { get; set; }
 
-			///
-			///The number of results listed in the query collection, represented by a signed 64-bit (8-byte) integer. This value is system-supplied and read-only.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/ProductVariationDeltaPrice.cs b/Mozu.Api/Contracts/ProductAdmin/ProductVariationDeltaPrice.cs
old mode 100644
new mode 100755
index e0e2d3ae..4dd784db
--- a/Mozu.Api/Contracts/ProductAdmin/ProductVariationDeltaPrice.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/ProductVariationDeltaPrice.cs
@@ -19,23 +19,17 @@ namespace Mozu.Api.Contracts.ProductAdmin
 		public class ProductVariationDeltaPrice
 		{
 			///
-			///The credit value of the product or bundled product. When the `goodsType `is `DigitalCredit`, this value is populated to indicate the value of the credit. This is used to create store credit in the fulfillment of gift cards.
+			///The credit amount for the product.
 			///
 			public decimal? CreditValue { get; set; }
 
-			///
-			///3-letter ISO 4217 standard global currency code. Currently, only "USD" (US Dollar) is supported.
-			///
 			public string CurrencyCode { get; set; }
 
 			///
-			///The manufacturer's suggested retail price (MSRP) for the product. This content may be defined by the supplier.
+			///The manufacturer's suggested retail price, as defined by the supplier.
 			///
 			public decimal? Msrp { get; set; }
 
-			///
-			///The value of a property, used by numerous objects within  including facets, attributes, products, localized content, metadata, capabilities ( and third-party), location inventory adjustment, and more. The value may be a string, integer, or double. Validation may be run against the entered and saved values depending on the object type.
-			///
 			public decimal? Value { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/ProductVariationFixedPrice.cs b/Mozu.Api/Contracts/ProductAdmin/ProductVariationFixedPrice.cs
old mode 100644
new mode 100755
index 121ef898..ac5d083f
--- a/Mozu.Api/Contracts/ProductAdmin/ProductVariationFixedPrice.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/ProductVariationFixedPrice.cs
@@ -13,34 +13,16 @@
 
 namespace Mozu.Api.Contracts.ProductAdmin
 {
-		///
-		///	The details of the product variation localized price.
-		///
 		public class ProductVariationFixedPrice
 		{
-			///
-			///The credit value of the product or bundled product. When the `goodsType `is `DigitalCredit`, this value is populated to indicate the value of the credit. This is used to create store credit in the fulfillment of gift cards.
-			///
 			public decimal? CreditValue { get; set; }
 
-			///
-			///The localized currency code for the monetary amount. 
-			///
 			public string CurrencyCode { get; set; }
 
-			///
-			///If the product is in explicit pricing mode, this is the list price of the variation.
-			///
 			public decimal? ListPrice { get; set; }
 
-			///
-			///The manufacturer's suggested retail price (MSRP) for the product. This content may be defined by the supplier.
-			///
 			public decimal? Msrp { get; set; }
 
-			///
-			///The set sale price for a product consisting of a price with a discount already applied.For price list entries, this property is the product's sale price if the  is set to .
-			///
 			public decimal? SalePrice { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/ProductVariationOption.cs b/Mozu.Api/Contracts/ProductAdmin/ProductVariationOption.cs
old mode 100644
new mode 100755
index 440ea785..34758da2
--- a/Mozu.Api/Contracts/ProductAdmin/ProductVariationOption.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/ProductVariationOption.cs
@@ -18,19 +18,10 @@ namespace Mozu.Api.Contracts.ProductAdmin
 		///
 		public class ProductVariationOption
 		{
-			///
-			///The fully qualified name of the attribute, which is a user defined attribute identifier.
-			///
 			public string AttributeFQN { get; set; }
 
-			///
-			///Complex type that contains content for a language specified by LocaleCode.
-			///
 			public AttributeVocabularyValueLocalizedContent Content { get; set; }
 
-			///
-			///The value of a property, used by numerous objects within  including facets, attributes, products, localized content, metadata, capabilities ( and third-party), location inventory adjustment, and more. The value may be a string, integer, or double. Validation may be run against the entered and saved values depending on the object type.
-			///
 			public object Value { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/ProductVariationPagedCollection.cs b/Mozu.Api/Contracts/ProductAdmin/ProductVariationPagedCollection.cs
old mode 100644
new mode 100755
index c74f970a..dbcb7543
--- a/Mozu.Api/Contracts/ProductAdmin/ProductVariationPagedCollection.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/ProductVariationPagedCollection.cs
@@ -19,29 +19,14 @@ namespace Mozu.Api.Contracts.ProductAdmin
 		///
 		public class ProductVariationPagedCollection
 		{
-			///
-			///An array list of objects in the returned collection.
-			///
 			public List<ProductVariation> Items { get; set; }
 
-			///
-			///The number of pages returned based on the startIndex and pageSize values specified. This value is system-supplied and read-only.
-			///
 			public int PageCount { get; set; }
 
-			///
-			///The number of results to display on each page when creating paged results from a query. The maximum value is 200.
-			///
 			public int PageSize { get; set; }
 
-			///
-			///When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.
-			///
 			public int StartIndex { get; set; }
 
-			///
-			///The number of results listed in the query collection, represented by a signed 64-bit (8-byte) integer. This value is system-supplied and read-only.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/PublishSet.cs b/Mozu.Api/Contracts/ProductAdmin/PublishSet.cs
old mode 100644
new mode 100755
index 0b768ff0..bd76b1e0
--- a/Mozu.Api/Contracts/ProductAdmin/PublishSet.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/PublishSet.cs
@@ -14,24 +14,12 @@
 
 namespace Mozu.Api.Contracts.ProductAdmin
 {
-		///
-		///	Mozu.ProductAdmin.Contracts.PublishSet ApiType DOCUMENT_HERE 
-		///
 		public class PublishSet
 		{
-			///
-			///The unique identifier of the product publish set.
-			///
 			public string Code { get; set; }
 
-			///
-			///A list of product codes of associated products. When this field is in the Product Publishing resource, you can use this field  to publish or delete individual pending product changes, or assign individual pending product changes to a publish set.
-			///
 			public List<string> ProductCodes { get; set; }
 
-			///
-			///The total number of products. This total may indicate the total products associate with a product type or number of products in a list.
-			///
 			public int ProductCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/PublishSetCollection.cs b/Mozu.Api/Contracts/ProductAdmin/PublishSetCollection.cs
old mode 100644
new mode 100755
index 6a633bb7..7187b5dd
--- a/Mozu.Api/Contracts/ProductAdmin/PublishSetCollection.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/PublishSetCollection.cs
@@ -14,19 +14,10 @@
 
 namespace Mozu.Api.Contracts.ProductAdmin
 {
-		///
-		///	Mozu.ProductAdmin.Contracts.PublishSetCollection ApiType DOCUMENT_HERE 
-		///
 		public class PublishSetCollection
 		{
-			///
-			///A list of requested items. All returned data is provided in an items array.For a failed request, the returned response may be success with an empty item array.
-			///
 			public List<PublishSet> Items { get; set; }
 
-			///
-			///The total number of items in the list.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/PublishingScope.cs b/Mozu.Api/Contracts/ProductAdmin/PublishingScope.cs
old mode 100644
new mode 100755
index 3d414eb9..e6ecd8de
--- a/Mozu.Api/Contracts/ProductAdmin/PublishingScope.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/PublishingScope.cs
@@ -19,19 +19,10 @@ namespace Mozu.Api.Contracts.ProductAdmin
 		///
 		public class PublishingScope
 		{
-			///
-			///Specifies whether all the pending product drafts are affected by the operation performed. For example, when you perform the PublishDrafts operation and you set this field to true, all pending product changes in the master catalog or in a publish set are published.
-			///
 			public bool? AllPending { get; set; }
 
-			///
-			///A list of product codes of associated products. When this field is in the Product Publishing resource, you can use this field  to publish or delete individual pending product changes, or assign individual pending product changes to a publish set.
-			///
 			public List<string> ProductCodes { get; set; }
 
-			///
-			///The unique identifier of the product publish set.You can use this field to perform operations on all the pending product changes assigned to a publish set. For example, when you perform the PublishDrafts operation, you can specify the publish set that the pending product changes are assigned to in order to publish all of the pending changes. If you specify a publishSetCode, the respecting operation is performed on all pending product changes assigned to the publish set, even if you specify individual productCodes.
-			///
 			public string PublishSetCode { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/Search/SearchSynonymSettings.cs b/Mozu.Api/Contracts/ProductAdmin/Search/SearchSynonymSettings.cs
old mode 100644
new mode 100755
index 1bc7542c..9da3e080
--- a/Mozu.Api/Contracts/ProductAdmin/Search/SearchSynonymSettings.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/Search/SearchSynonymSettings.cs
@@ -13,24 +13,12 @@
 
 namespace Mozu.Api.Contracts.ProductAdmin.Search
 {
-		///
-		///	Settings for search synonyms for search results.
-		///
 		public class SearchSynonymSettings
 		{
-			///
-			///Indicates if synonyms should be expanded.
-			///
 			public bool ExpandSynonyms { get; set; }
 
-			///
-			///Sets the boost for the words actually sent in the query.
-			///
 			public decimal MainPartBoost { get; set; }
 
-			///
-			///Boosts the synonyms to affect rankings for search results.
-			///
 			public decimal SynonymPartBoost { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/Search/SearchTuningRule.cs b/Mozu.Api/Contracts/ProductAdmin/Search/SearchTuningRule.cs
old mode 100644
new mode 100755
index ede0aa5c..b4f10eeb
--- a/Mozu.Api/Contracts/ProductAdmin/Search/SearchTuningRule.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/Search/SearchTuningRule.cs
@@ -15,74 +15,32 @@
 
 namespace Mozu.Api.Contracts.ProductAdmin.Search
 {
-		///
-		///	Mozu.ProductAdmin.Contracts.Search.SearchTuningRule ApiType DOCUMENT_HERE 
-		///
 		public class SearchTuningRule
 		{
-			///
-			///Specifies whether the search results tuning rule is active.
-			///
 			public bool Active { get; set; }
 
-			///
-			///The date that the search tuning rule is no longer active.
-			///
 			public DateTime? ActiveEndDate { get; set; }
 
-			///
-			///The date the search tuning rule starts being active.
-			///
 			public DateTime? ActiveStartDate { get; set; }
 
-			///
-			///Basic audit info about the object, including date, time, and user account. This data may be captured when creating, updating, and removing data.
-			///
 			public AuditInfo AuditInfo { get; set; }
 
-			///
-			///A list of product codes that you wish to block from appearing on a search result, or on a specific category page. Use the filters field to specify a category page.
-			///
 			public List<string> BlockedProductCodes { get; set; }
 
-			///
-			///A list of product codes that you wish to explicitly boost using the search tuning rule.  The order that you list products in defines the order that they appear in a search result, or category page.
-			///
 			public List<string> BoostedProductCodes { get; set; }
 
-			///
-			///The filters that limit what the search tuning rule is applied to. Currently, the only supported filters are category pages.For example, you can limit the search tuning rule to only apply when a shopper either navigates to or searches for a specific keyword on a category page.
-			///
 			public List<SearchTuningRuleFilter> Filters { get; set; }
 
-			///
-			///Indicates if the object is default. This indicator is used for product variations and site search settings. If true, the value/object is the default option. 
-			///
 			public bool IsDefault { get; set; }
 
-			///
-			///The keywords that trigger the search tuning rule. These are specific keywords that shoppers search for.
-			///
 			public List<string> Keywords { get; set; }
 
-			///
-			///The unique identifier of the search tuning rule.
-			///
 			public string SearchTuningRuleCode { get; set; }
 
-			///
-			///The description of the search tuning rule. Use this field for further identification purposes.
-			///
 			public string SearchTuningRuleDescription { get; set; }
 
-			///
-			///The name of the search tuning rule. Use this field for further identification purposes.
-			///
 			public string SearchTuningRuleName { get; set; }
 
-			///
-			///Unique identifier for the site. This ID is used at all levels of a store, catalog, and tenant to associate objects to a site.
-			///
 			public int SiteId { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/Search/SearchTuningRuleCollection.cs b/Mozu.Api/Contracts/ProductAdmin/Search/SearchTuningRuleCollection.cs
old mode 100644
new mode 100755
index 14ca642e..339f2f5c
--- a/Mozu.Api/Contracts/ProductAdmin/Search/SearchTuningRuleCollection.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/Search/SearchTuningRuleCollection.cs
@@ -14,34 +14,16 @@
 
 namespace Mozu.Api.Contracts.ProductAdmin.Search
 {
-		///
-		///	Mozu.ProductAdmin.Contracts.Search.SearchTuningRuleCollection ApiType DOCUMENT_HERE 
-		///
 		public class SearchTuningRuleCollection
 		{
-			///
-			///A list of requested items. All returned data is provided in an items array.For a failed request, the returned response may be success with an empty item array.
-			///
 			public List<SearchTuningRule> Items { get; set; }
 
-			///
-			///The total number of pages of the results divided per the `pageSize`.
-			///
 			public int PageCount { get; set; }
 
-			///
-			///The number of results to display on each page when creating paged results from a query. The amount is divided and displayed on the `pageCount `amount of pages. The default is 20 and maximum value is 200 per page.
-			///
 			public int PageSize { get; set; }
 
-			///
-			///When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a `pageSize `of 25, to get the 51st through the 75th items, use `startIndex=50`.
-			///
 			public int StartIndex { get; set; }
 
-			///
-			///The total number of items in the list.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/Search/SearchTuningRuleFilter.cs b/Mozu.Api/Contracts/ProductAdmin/Search/SearchTuningRuleFilter.cs
old mode 100644
new mode 100755
index dfbb3d65..2b42b99d
--- a/Mozu.Api/Contracts/ProductAdmin/Search/SearchTuningRuleFilter.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/Search/SearchTuningRuleFilter.cs
@@ -13,19 +13,10 @@
 
 namespace Mozu.Api.Contracts.ProductAdmin.Search
 {
-		///
-		///	Mozu.ProductAdmin.Contracts.Search.SearchTuningRuleFilter ApiType DOCUMENT_HERE 
-		///
 		public class SearchTuningRuleFilter
 		{
-			///
-			///Mozu.ProductAdmin.Contracts.Search.SearchTuningRuleFilter field ApiTypeMember DOCUMENT_HERE 
-			///
 			public string Field { get; set; }
 
-			///
-			///The value of a property, used by numerous objects within  including facets, attributes, products, localized content, metadata, capabilities ( and third-party), location inventory adjustment, and more. The value may be a string, integer, or double. Validation may be run against the entered and saved values depending on the object type.
-			///
 			public string Value { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/Search/SearchTuningRuleSortFields.cs b/Mozu.Api/Contracts/ProductAdmin/Search/SearchTuningRuleSortFields.cs
old mode 100644
new mode 100755
index 91ddf2e9..42dddfdb
--- a/Mozu.Api/Contracts/ProductAdmin/Search/SearchTuningRuleSortFields.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/Search/SearchTuningRuleSortFields.cs
@@ -14,19 +14,10 @@
 
 namespace Mozu.Api.Contracts.ProductAdmin.Search
 {
-		///
-		///	Mozu.ProductAdmin.Contracts.Search.SearchTuningRuleSortFields ApiType DOCUMENT_HERE 
-		///
 		public class SearchTuningRuleSortFields
 		{
-			///
-			///Specifies whether you want the product properties in sortFields to be white listed or black listed. When you white list a product property, any search tuning rules that affect that product property will be in effect whenever a shopper sorts by that product property. When you black list a product product, any search tuning rules that affect that product property will never be in effect whenever a shopper sorts by that product property.Valid values are: "WhiteList" or "BlackList".For more information about search tuning rule sort fields, refer to [Search Tuning Rules](../../../../developer/api-guides/search-tuning-rules.htm).
-			///
 			public string InclusionExclusionType { get; set; }
 
-			///
-			///A list of product properties that you want to apply the search tuning rule sort fields to. For example, you can set this field to "popularity" in order to make all search tuning rules that affect product popularity to always be in effect whenever a shopper sorts by popularity.
-			///
 			public List<string> SortFields { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/Search/SynonymDefinition.cs b/Mozu.Api/Contracts/ProductAdmin/Search/SynonymDefinition.cs
old mode 100644
new mode 100755
index b699107a..e6a0715e
--- a/Mozu.Api/Contracts/ProductAdmin/Search/SynonymDefinition.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/Search/SynonymDefinition.cs
@@ -14,24 +14,12 @@
 
 namespace Mozu.Api.Contracts.ProductAdmin.Search
 {
-		///
-		///	Properties of synonyms and their relations via keys and lists to determine search results.
-		///
 		public class SynonymDefinition
 		{
-			///
-			///Key used for metadata defined for objects, including extensible attributes, custom attributes associated with a shipping provider, and search synonyms definitions. This content may be user-defined depending on the object and usage.For search synonym definitions, refer to [Synonym Expansion Types](https://www.mozu.com/docs/Developer/api-guides/search-settings.htm#synonym_expansion_types) for more information about the key usage.
-			///
 			public string Key { get; set; }
 
-			///
-			///The unique identifier of the synonym.
-			///
 			public int? SynonymId { get; set; }
 
-			///
-			///A list of comma seperated synonyms. If you do not specify a ,  uses a two way expansion. Refer to [Synonym Expansion Types](https://www.mozu.com/docs/Developer/api-guides/search-settings.htm#synonym_expansion_types) for more information.
-			///
 			public List<string> Synonyms { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/Search/SynonymDefinitionCollection.cs b/Mozu.Api/Contracts/ProductAdmin/Search/SynonymDefinitionCollection.cs
old mode 100644
new mode 100755
index 8cf64979..bd304f06
--- a/Mozu.Api/Contracts/ProductAdmin/Search/SynonymDefinitionCollection.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/Search/SynonymDefinitionCollection.cs
@@ -14,9 +14,6 @@
 
 namespace Mozu.Api.Contracts.ProductAdmin.Search
 {
-		///
-		///	A collection of synonym definitions.
-		///
 		public class SynonymDefinitionCollection
 		{
 			///
@@ -24,14 +21,8 @@ public class SynonymDefinitionCollection
 			///
 			public string LocaleCode { get; set; }
 
-			///
-			///Unique identifier for the site. This ID is used at all levels of a store, catalog, and tenant to associate objects to a site.
-			///
 			public int SiteId { get; set; }
 
-			///
-			///List of mappings for this definition.
-			///
 			public List<SynonymDefinition> SynonymDefinitions { get; set; }
 
 			///
diff --git a/Mozu.Api/Contracts/ProductAdmin/Search/SynonymDefinitionPagedCollection.cs b/Mozu.Api/Contracts/ProductAdmin/Search/SynonymDefinitionPagedCollection.cs
old mode 100644
new mode 100755
index f50219df..f78bc163
--- a/Mozu.Api/Contracts/ProductAdmin/Search/SynonymDefinitionPagedCollection.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/Search/SynonymDefinitionPagedCollection.cs
@@ -14,34 +14,16 @@
 
 namespace Mozu.Api.Contracts.ProductAdmin.Search
 {
-		///
-		///	A paged collection of synonym definitions.
-		///
 		public class SynonymDefinitionPagedCollection
 		{
-			///
-			///A list of requested items. All returned data is provided in an items array.For a failed request, the returned response may be success with an empty item array.
-			///
 			public List<SynonymDefinition> Items { get; set; }
 
-			///
-			///The total number of pages of the results divided per the `pageSize`.
-			///
 			public int PageCount { get; set; }
 
-			///
-			///The number of results to display on each page when creating paged results from a query. The amount is divided and displayed on the `pageCount `amount of pages. The default is 20 and maximum value is 200 per page.
-			///
 			public int PageSize { get; set; }
 
-			///
-			///When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a `pageSize `of 25, to get the 51st through the 75th items, use `startIndex=50`.
-			///
 			public int StartIndex { get; set; }
 
-			///
-			///The total number of items in the list.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/SearchSettings.cs b/Mozu.Api/Contracts/ProductAdmin/SearchSettings.cs
old mode 100644
new mode 100755
index f9fc4a5d..68d69bfd
--- a/Mozu.Api/Contracts/ProductAdmin/SearchSettings.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/SearchSettings.cs
@@ -20,14 +20,8 @@ namespace Mozu.Api.Contracts.ProductAdmin
 		///
 		public class SearchSettings
 		{
-			///
-			///Settings of keys and values for synonyms in search results.
-			///
 			public SearchSynonymSettings SearchSynonymSettings { get; set; }
 
-			///
-			///Settings for searches performed at the site level.
-			///
 			public List<SiteSearchSettings> SiteSearchSettings { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/SiteSearchKeywordRelevancySettings.cs b/Mozu.Api/Contracts/ProductAdmin/SiteSearchKeywordRelevancySettings.cs
old mode 100644
new mode 100755
index d387f80b..77aec6b2
--- a/Mozu.Api/Contracts/ProductAdmin/SiteSearchKeywordRelevancySettings.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/SiteSearchKeywordRelevancySettings.cs
@@ -13,54 +13,24 @@
 
 namespace Mozu.Api.Contracts.ProductAdmin
 {
-		///
-		///	Properties for the site search keyword relevancy settings. Relevancy determines the calculated matched of entered search strings against keywords. The relevancy weight can determine the order of importance for matching a search term such as categories before or after product names.
-		///
 		public class SiteSearchKeywordRelevancySettings
 		{
-			///
-			///The considered relevancy weight for the attributes.
-			///
 			public int AttributesWeight { get; set; }
 
-			///
-			///The considered relevancy weight for category names.
-			///
 			public int CategoryNamesWeight { get; set; }
 
-			///
-			///The considered relevancy weight for descriptions.
-			///
 			public int DescriptionWeight { get; set; }
 
-			///
-			///The considered relevancy weight for keywords.
-			///
 			public int KeywordsWeight { get; set; }
 
-			///
-			///The considered relevancy weight for mpn provider.
-			///
 			public int MpnWeight { get; set; }
 
-			///
-			///The weight for the name used in ranking search results.
-			///
 			public int NameWeight { get; set; }
 
-			///
-			///The considered relevancy weight for product code, as loose.
-			///
 			public int ProductCodeLooseWeight { get; set; }
 
-			///
-			///The considered relevancy weight for product code.
-			///
 			public int ProductCodeWeight { get; set; }
 
-			///
-			///The considered relevancy weight for UPCs.
-			///
 			public int UpcWeight { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/SiteSearchPhraseRelevancySettings.cs b/Mozu.Api/Contracts/ProductAdmin/SiteSearchPhraseRelevancySettings.cs
old mode 100644
new mode 100755
index 19d4cc19..14285cac
--- a/Mozu.Api/Contracts/ProductAdmin/SiteSearchPhraseRelevancySettings.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/SiteSearchPhraseRelevancySettings.cs
@@ -13,24 +13,12 @@
 
 namespace Mozu.Api.Contracts.ProductAdmin
 {
-		///
-		///	Properties for the site search phrase relevancy settings. Relevancy determines the calculated matched of entered search phrase strings against keywords. The relevancy weight can determine the order of importance for matching a search term such as categories before or after product names.
-		///
 		public class SiteSearchPhraseRelevancySettings
 		{
-			///
-			///The considered relevancy weight for the attributes phrase.
-			///
 			public int AttributeWeight { get; set; }
 
-			///
-			///The considered relevancy weight for descriptions.
-			///
 			public int DescriptionWeight { get; set; }
 
-			///
-			///The weight for the name used in ranking search results.
-			///
 			public int NameWeight { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/SiteSearchRelevancyCustomField.cs b/Mozu.Api/Contracts/ProductAdmin/SiteSearchRelevancyCustomField.cs
old mode 100644
new mode 100755
index bff1a5b9..7e51330c
--- a/Mozu.Api/Contracts/ProductAdmin/SiteSearchRelevancyCustomField.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/SiteSearchRelevancyCustomField.cs
@@ -13,19 +13,10 @@
 
 namespace Mozu.Api.Contracts.ProductAdmin
 {
-		///
-		///	Properties for setting custom field site search keyword relevancy settings. Relevancy determines the calculated matched of entered search strings against keywords. The relevancy weight can determine the order of importance for matching a search term such as categories before or after product names.
-		///
 		public class SiteSearchRelevancyCustomField
 		{
-			///
-			///Name of the field.
-			///
 			public string FieldName { get; set; }
 
-			///
-			///Relative weight of the field for relevancy purposes.
-			///
 			public int FieldWeight { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/SiteSearchSettings.cs b/Mozu.Api/Contracts/ProductAdmin/SiteSearchSettings.cs
old mode 100644
new mode 100755
index 33af2d74..f5438557
--- a/Mozu.Api/Contracts/ProductAdmin/SiteSearchSettings.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/SiteSearchSettings.cs
@@ -14,44 +14,20 @@
 
 namespace Mozu.Api.Contracts.ProductAdmin
 {
-		///
-		///	Properties for the site search settings.
-		///
 		public class SiteSearchSettings
 		{
-			///
-			///Custom boost value for searches.
-			///
 			public List<string> CustomBoosts { get; set; }
 
-			///
-			///Custom field for searches.
-			///
 			public List<SiteSearchRelevancyCustomField> CustomFields { get; set; }
 
-			///
-			///Indicates if the object is default. This indicator is used for product variations and site search settings. If true, the value/object is the default option. 
-			///
 			public bool IsDefault { get; set; }
 
-			///
-			///Specifies the minimum match percentage setting. The minimum match percentage is a percentage of the number of terms that must match a search request, rounded down. 's default minimum match percentage is 75%. To require all search terms match, set this value to 100%.
-			///
 			public int? MinimumMatchPercent { get; set; }
 
-			///
-			///The name for the search settings.
-			///
 			public string SettingsName { get; set; }
 
-			///
-			///The site keyword relevancy settings.
-			///
 			public SiteSearchKeywordRelevancySettings SiteKeywordRelevancy { get; set; }
 
-			///
-			///The site phrase relevancy settings.
-			///
 			public SiteSearchPhraseRelevancySettings SitePhraseRelevancy { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/SoftAllocation.cs b/Mozu.Api/Contracts/ProductAdmin/SoftAllocation.cs
old mode 100644
new mode 100755
index 571bc348..4fdc2bb0
--- a/Mozu.Api/Contracts/ProductAdmin/SoftAllocation.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/SoftAllocation.cs
@@ -14,49 +14,22 @@
 
 namespace Mozu.Api.Contracts.ProductAdmin
 {
-		///
-		///	Mozu.ProductAdmin.Contracts.SoftAllocation ApiType DOCUMENT_HERE 
-		///
 		public class SoftAllocation
 		{
-			///
-			///Basic audit info about the object, including date, time, and user account. This data may be captured when creating, updating, and removing data.
-			///
 			public AuditInfo AuditInfo { get; set; }
 
-			///
-			///The date and time in UTC format that the soft allocation expires.
-			///
 			public DateTime? ExpiresAt { get; set; }
 
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public int? Id { get; set; }
 
-			///
-			///The unique, user-defined code that identifies a location. This location can be the location where the order was entered, location for newly in-stock products, and where products are returned.
-			///
 			public string LocationCode { get; set; }
 
-			///
-			///The unique, user-defined product code of a product, used throughout  to reference and associate to a product.
-			///
 			public string ProductCode { get; set; }
 
-			///
-			///The specified quantity of objects and items. This property is used for numerous object types including products, options, components within a product bundle, cart and order items, returned items, shipping line items, items in a digital product. and items associated with types and reservations.
-			///
 			public int? Quantity { get; set; }
 
-			///
-			///Entity RefrenceID this allocation is linked to.
-			///
 			public string ReferenceId { get; set; }
 
-			///
-			///item Id of the RefrenceID.
-			///
 			public string ReferenceItemId { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/SoftAllocationCollection.cs b/Mozu.Api/Contracts/ProductAdmin/SoftAllocationCollection.cs
old mode 100644
new mode 100755
index f78257ae..379c5f95
--- a/Mozu.Api/Contracts/ProductAdmin/SoftAllocationCollection.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/SoftAllocationCollection.cs
@@ -14,34 +14,16 @@
 
 namespace Mozu.Api.Contracts.ProductAdmin
 {
-		///
-		///	Mozu.ProductAdmin.Contracts.SoftAllocationCollection ApiType DOCUMENT_HERE 
-		///
 		public class SoftAllocationCollection
 		{
-			///
-			///A list of requested items. All returned data is provided in an items array.For a failed request, the returned response may be success with an empty item array.
-			///
 			public List<SoftAllocation> Items { get; set; }
 
-			///
-			///The total number of pages of the results divided per the `pageSize`.
-			///
 			public int PageCount { get; set; }
 
-			///
-			///The number of results to display on each page when creating paged results from a query. The amount is divided and displayed on the `pageCount `amount of pages. The default is 20 and maximum value is 200 per page.
-			///
 			public int PageSize { get; set; }
 
-			///
-			///When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a `pageSize `of 25, to get the 51st through the 75th items, use `startIndex=50`.
-			///
 			public int StartIndex { get; set; }
 
-			///
-			///The total number of items in the list.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/SoftAllocationRenew.cs b/Mozu.Api/Contracts/ProductAdmin/SoftAllocationRenew.cs
old mode 100644
new mode 100755
index 1f66ef53..05030067
--- a/Mozu.Api/Contracts/ProductAdmin/SoftAllocationRenew.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/SoftAllocationRenew.cs
@@ -14,19 +14,10 @@
 
 namespace Mozu.Api.Contracts.ProductAdmin
 {
-		///
-		///	Mozu.ProductAdmin.Contracts.SoftAllocationRenew ApiType DOCUMENT_HERE 
-		///
 		public class SoftAllocationRenew
 		{
-			///
-			///The updated date and time in UTC format that you wish the soft allocations to expire on.
-			///
 			public DateTime? ExpiresAt { get; set; }
 
-			///
-			///A comma-separate list of unique identifiers of the soft allocations to renew.
-			///
 			public List<int> Ids { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/StackingConfiguration.cs b/Mozu.Api/Contracts/ProductAdmin/StackingConfiguration.cs
new file mode 100755
index 00000000..1626b21b
--- /dev/null
+++ b/Mozu.Api/Contracts/ProductAdmin/StackingConfiguration.cs
@@ -0,0 +1,26 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+
+
+namespace Mozu.Api.Contracts.ProductAdmin
+{
+		public class StackingConfiguration
+		{
+			public int ProductLineItemLayers { get; set; }
+
+			public int ProductOrderLayers { get; set; }
+
+			public bool StackingEnabled { get; set; }
+
+		}
+
+}
\ No newline at end of file
diff --git a/Mozu.Api/Contracts/ProductAdmin/TargetedCategory.cs b/Mozu.Api/Contracts/ProductAdmin/TargetedCategory.cs
old mode 100644
new mode 100755
index 9721d485..9222f8ef
--- a/Mozu.Api/Contracts/ProductAdmin/TargetedCategory.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/TargetedCategory.cs
@@ -18,9 +18,6 @@ namespace Mozu.Api.Contracts.ProductAdmin
 		///
 		public class TargetedCategory
 		{
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public int? Id { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/TargetedProduct.cs b/Mozu.Api/Contracts/ProductAdmin/TargetedProduct.cs
old mode 100644
new mode 100755
diff --git a/Mozu.Api/Contracts/ProductAdmin/TargetedShippingMethod.cs b/Mozu.Api/Contracts/ProductAdmin/TargetedShippingMethod.cs
old mode 100644
new mode 100755
index d38b2ba7..3c17fd95
--- a/Mozu.Api/Contracts/ProductAdmin/TargetedShippingMethod.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/TargetedShippingMethod.cs
@@ -18,14 +18,8 @@ namespace Mozu.Api.Contracts.ProductAdmin
 		///
 		public class TargetedShippingMethod
 		{
-			///
-			///The code associated with the carrier's shipping method service type. Service type codes include a prefix that indicates the carrier. For example: FEDEX_INTERNATIONAL_STANDARD
-			///
 			public string Code { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductAdmin/TargetedShippingZone.cs b/Mozu.Api/Contracts/ProductAdmin/TargetedShippingZone.cs
old mode 100644
new mode 100755
index 5132f08d..538d6a1f
--- a/Mozu.Api/Contracts/ProductAdmin/TargetedShippingZone.cs
+++ b/Mozu.Api/Contracts/ProductAdmin/TargetedShippingZone.cs
@@ -13,14 +13,8 @@
 
 namespace Mozu.Api.Contracts.ProductAdmin
 {
-		///
-		///	The targeted shipping zone for the product.
-		///
 		public class TargetedShippingZone
 		{
-			///
-			///The zone string for the tenant domain.
-			///
 			public string Zone { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductRuntime/AppliedDiscount.cs b/Mozu.Api/Contracts/ProductRuntime/AppliedDiscount.cs
old mode 100644
new mode 100755
index 6b2c4f69..814072cb
--- a/Mozu.Api/Contracts/ProductRuntime/AppliedDiscount.cs
+++ b/Mozu.Api/Contracts/ProductRuntime/AppliedDiscount.cs
@@ -9,6 +9,7 @@
 //------------------------------------------------------------------------------
 
 using System;
+using System.Collections.Generic;
 
 
 namespace Mozu.Api.Contracts.ProductRuntime
@@ -18,19 +19,12 @@ namespace Mozu.Api.Contracts.ProductRuntime
 		///
 		public class AppliedDiscount
 		{
-			///
-			///Alphanumeric code associated with the coupon or promotion that results in a discounted price.
-			///
 			public string CouponCode { get; set; }
 
-			///
-			///Name of the discount added and applied to a shopping cart and order for a shopper's purchase. 
-			///
 			public Discount Discount { get; set; }
 
-			///
-			///The value of the discount applied to the cart or order, represented as a negative currency amount to apply to the original price.
-			///
+			public List<Discount> Discounts { get; set; }
+
 			public decimal Impact { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductRuntime/AttributeDetail.cs b/Mozu.Api/Contracts/ProductRuntime/AttributeDetail.cs
old mode 100644
new mode 100755
index b6de2c6e..2ab28b42
--- a/Mozu.Api/Contracts/ProductRuntime/AttributeDetail.cs
+++ b/Mozu.Api/Contracts/ProductRuntime/AttributeDetail.cs
@@ -18,69 +18,36 @@ namespace Mozu.Api.Contracts.ProductRuntime
 		///
 		public class AttributeDetail
 		{
-			///
-			///Indicates whether the attribute should be able to be used in filters, facets, and sorting on the public storefront.
-			///
 			public bool AllowFilteringAndSortingInStorefront { get; set; }
 
-			///
-			///The data type of the source product property, typically of type Bool, DateTime, Number, or String.
-			///
 			public string DataType { get; set; }
 
-			///
-			///Unique sequence of the attribute for its data type.
-			///
 			public int DataTypeSequence { get; set; }
 
-			///
-			///The localized description in text for the object, displayed per the locale code. For example, descriptions are used for product descriptions, attributes, and pre-authorization transaction types.
-			///
 			public string Description { get; set; }
 
-			///
-			///Defines the intended display of this attribute in the storefront. Options include Drop Down, Image Picker, and Radio Buttons.
-			///
 			public string DisplayIntention { get; set; }
 
-			///
-			///Specifies whether to create a case-sensitive Solr search index. The default is .
-			///
 			public bool? IndexValueWithCase { get; set; }
 
-			///
-			///The type of input selection used to define a value for the attribute, including Yes/No, Date, DateTime, List, TextBox, or TextArea.
-			///
 			public string InputType { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
 			///
-			///Indicates if the attribute value is searchable on the public storefront.
+			///Indicates whether the attribute value is searchable in the storefont by a shopper.
 			///
 			public bool SearchableInStorefront { get; set; }
 
 			///
-			///Indicates what kind of values search queries and returns. If true, the system indexes the display value of string attributes instead of the canonical value for searching. Always use the canonical value for filtering. This does not apply for non-string attributes.
+			///If true, the system indexes the display value of string attributes instead of the canonical value for searching. The canonical value is always used for filtering. This does not apply for for non-string attributes.
 			///
 			public bool SearchDisplayValue { get; set; }
 
-			///
-			///The usage type of the product attribute, which is property, option, or extra.
-			///
 			public string UsageType { get; set; }
 
-			///
-			///Properties used when validating a value entered for an object, including extensible attributes, products attributes, and database entries.
-			///
 			public AttributeValidation Validation { get; set; }
 
-			///
-			///An attribute value type is either predefined vocabulary by the admin during attribute set up or user-defined with an appropriate type (AdminEntered or ShopperEntered depending on the user). These types are used by products and attributes. The difference between predefined values versus manually entered values is such that the first choice is a set of options to choose from. AdminEntered and ShopperEntered are values that are entered rather than system-supplied and are not stored in the database, but captured during a live commerce operations such as during an order.
-			///
 			public string ValueType { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductRuntime/AttributeValidation.cs b/Mozu.Api/Contracts/ProductRuntime/AttributeValidation.cs
old mode 100644
new mode 100755
index 9c235ade..b8fc4ad4
--- a/Mozu.Api/Contracts/ProductRuntime/AttributeValidation.cs
+++ b/Mozu.Api/Contracts/ProductRuntime/AttributeValidation.cs
@@ -14,43 +14,22 @@
 namespace Mozu.Api.Contracts.ProductRuntime
 {
 		///
-		///	Validates the attribute configured for the customer in the storefront against the attribute configured in .
+		///	Validates the attribute configured for the product in the storefront against the attribute configured in product admin.
 		///
 		public class AttributeValidation
 		{
-			///
-			///The maximum date allowed including month, day, and year. System-supplied and read-only.
-			///
 			public DateTime? MaxDateValue { get; set; }
 
-			///
-			///The maximum number that can be entered as a value for an extensible attribute.
-			///
 			public double MaxNumericValue { get; set; }
 
-			///
-			///The maximum character length possible for a string value entered for an extensible attribute.
-			///
 			public int? MaxStringLength { get; set; }
 
-			///
-			///The minimum date allowed including month, day, and year. System-supplied and read-only.
-			///
 			public DateTime? MinDateValue { get; set; }
 
-			///
-			///The minimum numeric value required to validate an extensible attribute.
-			///
 			public double MinNumericValue { get; set; }
 
-			///
-			///The minimum character length possible for a string value entered for an extensible attribute.
-			///
 			public int? MinStringLength { get; set; }
 
-			///
-			///Regular expression used to process and validate an extensible attribute value that require special formatting, such as phone numbers.
-			///
 			public string RegularExpression { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductRuntime/AttributeVocabularyValueDisplayInfo.cs b/Mozu.Api/Contracts/ProductRuntime/AttributeVocabularyValueDisplayInfo.cs
old mode 100644
new mode 100755
index ad359b7a..3e3a4ecc
--- a/Mozu.Api/Contracts/ProductRuntime/AttributeVocabularyValueDisplayInfo.cs
+++ b/Mozu.Api/Contracts/ProductRuntime/AttributeVocabularyValueDisplayInfo.cs
@@ -13,24 +13,12 @@
 
 namespace Mozu.Api.Contracts.ProductRuntime
 {
-		///
-		///	Provides the display information for attribute vocabulary values. 
-		///
 		public class AttributeVocabularyValueDisplayInfo
 		{
-			///
-			///The identifier of the image in the  CMS. Supply a value for either the CMS ID or Image URL parameter.
-			///
 			public string CmsId { get; set; }
 
-			///
-			///Hex value for a color to display in a color picker. This is an HTML supported code for color.
-			///
 			public string ColorValue { get; set; }
 
-			///
-			///The URL link for the image file associated with a product or category.
-			///
 			public string ImageUrl { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductRuntime/BundledProduct.cs b/Mozu.Api/Contracts/ProductRuntime/BundledProduct.cs
old mode 100644
new mode 100755
index 4df90487..15750053
--- a/Mozu.Api/Contracts/ProductRuntime/BundledProduct.cs
+++ b/Mozu.Api/Contracts/ProductRuntime/BundledProduct.cs
@@ -19,27 +19,27 @@ namespace Mozu.Api.Contracts.ProductRuntime
 		public class BundledProduct
 		{
 			///
-			///Localizable content (such as a name and/or description) for an attribute. The content may be localized when displayed according to the locale code specified by the master catalog. Content can include descriptive text for product extensible attributes, catalog-level descriptions (displayed if isContentOverriden is true), product bundles, and customer account notes.
+			///Localizable product content defined for the product bundle. System-supplied and read only.
 			///
 			public ProductContent Content { get; set; }
 
 			///
-			///The credit value of the product or bundled product. When the `goodsType `is `DigitalCredit`, this value is populated to indicate the value of the credit. This is used to create store credit in the fulfillment of gift cards.
+			///When the goodsType is DigitalCredit this value is populated to indicate the value of the credit. This is used to create store credit in the fulfillment of gift cards.
 			///
 			public decimal? CreditValue { get; set; }
 
 			///
-			///The type of goods in a bundled product. A bundled product is composed of products associated to sell together. Possible values include “Physical” and “DigitalCredit”. This comes from the `productType `of the product. Products are defaulted to a Physical `goodsType`. Gift cards have a `goodsType `of DigitalCredit.
+			///This is the goods type of the product. Possible values are “Physical,” and “DigitalCredit”. This comes from the productType of the product. Products are defaulted to a Physical goodsType. Gift cards have a goodsType of DigitalCredit.
 			///
 			public string GoodsType { get; set; }
 
 			///
-			///Properties and data of inventory information for configured and bundled products. If product stock is managed, the data specifies out of stock behavior.
+			///This contains the inventory information about bundled products. If it manages stock, it specifies what the out of stock behavior is.
 			///
 			public ProductInventoryInfo InventoryInfo { get; set; }
 
 			///
-			///Indicates if the product must be shipped alone in a container. This is used for products and products within a bundle. If true, this product cannot be shipped in a package with other items and must ship in a package by itself.
+			///If true, the component product of the bundle should not ship in a package with the rest of the product bundle, and should ship in a package by itself. System-supplied and read only.
 			///
 			public bool? IsPackagedStandAlone { get; set; }
 
@@ -49,12 +49,12 @@ public class BundledProduct
 			public PackageMeasurements Measurements { get; set; }
 
 			///
-			///Fully qualified name of the selected option's attribute. Bundledproducts result from a static bundle or are dynamically added as a result of the shopper selecting products as extras. When the bundled item is dynamic, it includes the attribute's fully qualified name of the extra that it came from. When `optionAttributeFQN `is null, the bundled item was statically defined. When not null, the item came from an extra selection.
+			///BundledProducts result from a static bundle or are dynamically added as a result of the shopper selecting products as extras. When the bundled item is dynamic, it includes the attribute's fully qualified name of the extra that it came from. When optionAttributeFQN is null, the bundled item was statically defined, when not null, the item came from an extra selection.
 			///
 			public string OptionAttributeFQN { get; set; }
 
 			///
-			///The value of the option attribute. These values are associated and used by product bundles and options.
+			///Properties of a value associated with a product option attribute.
 			///
 			public object OptionValue { get; set; }
 
@@ -63,13 +63,10 @@ public class BundledProduct
 			///
 			public string ProductCode { get; set; }
 
-			///
-			///A product type is like a product template.
-			///
 			public string ProductType { get; set; }
 
 			///
-			///The specified quantity of objects and items. This property is used for numerous object types including products, options, components within a product bundle, cart and order items, returned items, shipping line items, items in a digital product. and items associated with types and reservations.
+			///The quantity of the component product in the product bundle. System-supplied and read only.
 			///
 			public int Quantity { get; set; }
 
diff --git a/Mozu.Api/Contracts/ProductRuntime/BundledProductSummary.cs b/Mozu.Api/Contracts/ProductRuntime/BundledProductSummary.cs
old mode 100644
new mode 100755
index 83ccc328..5e4356c5
--- a/Mozu.Api/Contracts/ProductRuntime/BundledProductSummary.cs
+++ b/Mozu.Api/Contracts/ProductRuntime/BundledProductSummary.cs
@@ -19,22 +19,22 @@ namespace Mozu.Api.Contracts.ProductRuntime
 		public class BundledProductSummary
 		{
 			///
-			///The credit value of the product or bundled product. When the `goodsType `is `DigitalCredit`, this value is populated to indicate the value of the credit. This is used to create store credit in the fulfillment of gift cards.
+			///When the goodsType is DigitalCredit this value is populated to indicate the value of the credit. This is used to create store credit in the fulfillment of gift cards.
 			///
 			public decimal? CreditValue { get; set; }
 
 			///
-			///The type of goods in a bundled product. A bundled product is composed of products associated to sell together. Possible values include “Physical” and “DigitalCredit”. This comes from the `productType `of the product. Products are defaulted to a Physical `goodsType`. Gift cards have a `goodsType `of DigitalCredit.
+			///This is the goods type of the product. Possible values are “Physical,” and “DigitalCredit”. This comes from the productType of the product. Products are defaulted to a Physical goodsType. Gift cards have a goodsType of DigitalCredit.
 			///
 			public string GoodsType { get; set; }
 
 			///
-			///Properties and data of inventory information for configured and bundled products. If product stock is managed, the data specifies out of stock behavior.
+			///This contains the inventory information about bundled products. If it manages stock, it specifies what the out of stock behavior is.
 			///
 			public ProductInventoryInfo InventoryInfo { get; set; }
 
 			///
-			///Indicates if the product must be shipped alone in a container. This is used for products and products within a bundle. If true, this product cannot be shipped in a package with other items and must ship in a package by itself.
+			///If true, the component product of the bundle should not ship in a package with the rest of the product bundle, and should ship in a package by itself. System-supplied and read only.
 			///
 			public bool? IsPackagedStandAlone { get; set; }
 
@@ -44,12 +44,12 @@ public class BundledProductSummary
 			public PackageMeasurements Measurements { get; set; }
 
 			///
-			///Fully qualified name of the selected option's attribute. Bundledproducts result from a static bundle or are dynamically added as a result of the shopper selecting products as extras. When the bundled item is dynamic, it includes the attribute's fully qualified name of the extra that it came from. When `optionAttributeFQN `is null, the bundled item was statically defined. When not null, the item came from an extra selection.
+			///BundledProducts result from a static bundle or are dynamically added as a result of the shopper selecting products as extras. When the bundled item is dynamic, it includes the attribute's fully qualified name of the extra that it came from. When optionAttributeFQN is null, the bundled item was statically defined, when not null, the item came from an extra selection.
 			///
 			public string OptionAttributeFQN { get; set; }
 
 			///
-			///The value of the option attribute. These values are associated and used by product bundles and options.
+			///Properties of a value associated with a product option attribute.
 			///
 			public object OptionValue { get; set; }
 
@@ -59,22 +59,19 @@ public class BundledProductSummary
 			public string ProductCode { get; set; }
 
 			///
-			///The name of the product that represents a line item in a taxable order or product bundle.
+			///The read-only name of the component in the bundled product.
 			///
 			public string ProductName { get; set; }
 
 			///
-			///Brief text description of the product or component in a product bundle, typically used when the product is displayed in a list or in search results.
+			///The short description defined for the component in a bundled product. System-supplied and read only.
 			///
 			public string ProductShortDescription { get; set; }
 
-			///
-			///A product type is like a product template.
-			///
 			public string ProductType { get; set; }
 
 			///
-			///The specified quantity of objects and items. This property is used for numerous object types including products, options, components within a product bundle, cart and order items, returned items, shipping line items, items in a digital product. and items associated with types and reservations.
+			///The quantity of a component product in its product bundle.
 			///
 			public int Quantity { get; set; }
 
diff --git a/Mozu.Api/Contracts/ProductRuntime/Category.cs b/Mozu.Api/Contracts/ProductRuntime/Category.cs
old mode 100644
new mode 100755
index 19684acc..5189091d
--- a/Mozu.Api/Contracts/ProductRuntime/Category.cs
+++ b/Mozu.Api/Contracts/ProductRuntime/Category.cs
@@ -15,48 +15,27 @@
 namespace Mozu.Api.Contracts.ProductRuntime
 {
 		///
-		///	A descriptive container that groups products. A category is merchant defined with associated products and discounts as configured. GThe storefront displays products in a hierarchy of categories. As such, categories can include a nesting of sub-categories to organize products and product options per set guidelines such as color, brand, material, and size.
+		///	Properties of the product category that appears on the storefront.
 		///
 		public class Category
 		{
-			///
-			///External unique identifier of the category.
-			///
 			public string CategoryCode { get; set; }
 
-			///
-			///Unique identifier for the storefront container used to organize products.
-			///
 			public int CategoryId { get; set; }
 
-			///
-			///List of the subcategories in the hierarchy for the specified categories.
-			///
 			public List<Category> ChildrenCategories { get; set; }
 
-			///
-			///Complex type that contains content for a language specified by LocaleCode.
-			///
 			public CategoryContent Content { get; set; }
 
-			///
-			///The total number of associated items.
-			///
 			public int? Count { get; set; }
 
 			///
-			///Indicates if the object is displayed on the storefront. If true, the admin product category is displayed in the store. If false, the category is not displayed.
+			///If true, the category is displayed on the website storefront.
 			///
 			public bool IsDisplayed { get; set; }
 
-			///
-			///If applicable, the parent category in the hierarchy for the specified category.
-			///
 			public Category ParentCategory { get; set; }
 
-			///
-			///The numeric order of objects, used by a vocabulary value defined for an extensible attribute, images, and categories.
-			///
 			public int? Sequence { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductRuntime/CategoryCollection.cs b/Mozu.Api/Contracts/ProductRuntime/CategoryCollection.cs
old mode 100644
new mode 100755
index 67122808..080a5052
--- a/Mozu.Api/Contracts/ProductRuntime/CategoryCollection.cs
+++ b/Mozu.Api/Contracts/ProductRuntime/CategoryCollection.cs
@@ -19,14 +19,8 @@ namespace Mozu.Api.Contracts.ProductRuntime
 		///
 		public class CategoryCollection
 		{
-			///
-			///An array list of objects in the returned collection.
-			///
 			public List<Category> Items { get; set; }
 
-			///
-			///The number of results listed in the query collection, represented by a signed 64-bit (8-byte) integer. This value is system-supplied and read-only.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductRuntime/CategoryContent.cs b/Mozu.Api/Contracts/ProductRuntime/CategoryContent.cs
old mode 100644
new mode 100755
index bfeb24fa..7dd60049
--- a/Mozu.Api/Contracts/ProductRuntime/CategoryContent.cs
+++ b/Mozu.Api/Contracts/ProductRuntime/CategoryContent.cs
@@ -19,44 +19,20 @@ namespace Mozu.Api.Contracts.ProductRuntime
 		///
 		public class CategoryContent
 		{
-			///
-			///Array list of media images associated to a product category. These images may be localized in the language specified by the LocaleCode. Images display with the category on the storefront according to the code and formatting of your site theme. Each image includes the name, alt text, and URL location.
-			///
 			public List<CategoryImage> CategoryImages { get; set; }
 
-			///
-			///The localized description in text for the object, displayed per the locale code. For example, descriptions are used for product descriptions, attributes, and pre-authorization transaction types.
-			///
 			public string Description { get; set; }
 
-			///
-			///Description defined for metadata, used to interally manage data, in the language specified by the `localeCode`. This content is used by categories, products, localized content, and SEO content.
-			///
 			public string MetaTagDescription { get; set; }
 
-			///
-			///Keywords defined for metadata, used to internally manage data, in the language specified by the `localeCode`. Keywords are used by content for categories, products, localized content, and SEO content.
-			///
 			public string MetaTagKeywords { get; set; }
 
-			///
-			///Title defined for metadata, used to internally manage data, in the language specified by the `localeCode`. Titles are used by content for categories, products, localized content, and SEO content.
-			///
 			public string MetaTagTitle { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
-			///
-			///Title that appears on new product category pages, in the language specified by the `localeCode`.
-			///
 			public string PageTitle { get; set; }
 
-			///
-			///Slug is used in place of a name, code, or ID to give an SEO, human-friendly URL link for an object, used by categories.
-			///
 			public string Slug { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductRuntime/CategoryImage.cs b/Mozu.Api/Contracts/ProductRuntime/CategoryImage.cs
old mode 100644
new mode 100755
index a2849efe..010fd68b
--- a/Mozu.Api/Contracts/ProductRuntime/CategoryImage.cs
+++ b/Mozu.Api/Contracts/ProductRuntime/CategoryImage.cs
@@ -18,39 +18,21 @@ namespace Mozu.Api.Contracts.ProductRuntime
 		///
 		public class CategoryImage
 		{
-			///
-			///Descriptive text associated with the image or video that appears on the web storefront. This text displays on a hover-over in the browser, providing further information on the content displayed. The alternate text should be plain alphanumeric text without special characters or HTML coding.
-			///
 			public string AltText { get; set; }
 
 			///
-			///The identifier of the image in the  CMS. Supply a value for either the CMS ID or Image URL parameter.
+			///The identifier of the category image in the Mozu CMS. Supply a value for either the CMS ID or Image URL parameter.
 			///
 			public string CmsId { get; set; }
 
-			///
-			///The localized title for an image that displays on the storefront. If localized, the displayed content is set per the locale code for the site.
-			///
 			public string ImageLabel { get; set; }
 
-			///
-			///The URL link for the image file associated with a product or category.
-			///
 			public string ImageUrl { get; set; }
 
-			///
-			///Type of media specification required to successfully render the image, video, or other media content for products and categories.
-			///
 			public string MediaType { get; set; }
 
-			///
-			///The numeric order of objects, used by a vocabulary value defined for an extensible attribute, images, and categories.
-			///
 			public int? Sequence { get; set; }
 
-			///
-			///The URL of a video files for a product or category. The path name is set in the language specified by the LocaleCode.
-			///
 			public string VideoUrl { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductRuntime/CategoryPagedCollection.cs b/Mozu.Api/Contracts/ProductRuntime/CategoryPagedCollection.cs
old mode 100644
new mode 100755
index ea8a0ca0..8a5aa037
--- a/Mozu.Api/Contracts/ProductRuntime/CategoryPagedCollection.cs
+++ b/Mozu.Api/Contracts/ProductRuntime/CategoryPagedCollection.cs
@@ -15,30 +15,18 @@
 namespace Mozu.Api.Contracts.ProductRuntime
 {
 		///
-		///	The container for paged lists of related site-specific product category properties.
+		///	Paged collection of categories and related properties.
 		///
 		public class CategoryPagedCollection
 		{
-			///
-			///An array list of objects in the returned collection.
-			///
 			public List<Category> Items { get; set; }
 
-			///
-			///The number of pages returned based on the startIndex and pageSize values specified. This value is system-supplied and read-only.
-			///
 			public int PageCount { get; set; }
 
-			///
-			///The number of results to display on each page when creating paged results from a query. The maximum value is 200.
-			///
 			public int PageSize { get; set; }
 
 			public int StartIndex { get; set; }
 
-			///
-			///The number of results listed in the query collection, represented by a signed 64-bit (8-byte) integer. This value is system-supplied and read-only.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductRuntime/ConfiguredProduct.cs b/Mozu.Api/Contracts/ProductRuntime/ConfiguredProduct.cs
old mode 100644
new mode 100755
index e197279c..927d6dd9
--- a/Mozu.Api/Contracts/ProductRuntime/ConfiguredProduct.cs
+++ b/Mozu.Api/Contracts/ProductRuntime/ConfiguredProduct.cs
@@ -19,74 +19,45 @@ namespace Mozu.Api.Contracts.ProductRuntime
 		///
 		public class ConfiguredProduct
 		{
-			///
-			///List of shipping discounts that can be applied to the configured product. These discounts are calculated and updated as shoppers add content to their cart and continue checkout steps to order submission.
-			///
 			public List<Discount> AvailableShippingDiscounts { get; set; }
 
 			///
-			///List of supported types of fulfillment for the product or variation. The types include direct ship, in-store pickup, or both.
+			///The list of fulfillment types the product supports.
 			///
 			public List<string> FulfillmentTypesSupported { get; set; }
 
-			///
-			///Properties and data of inventory information for configured and bundled products. If product stock is managed, the data specifies out of stock behavior.
-			///
 			public ProductInventoryInfo InventoryInfo { get; set; }
 
-			///
-			///Dimensions of the packaged product.
-			///
 			public PackageMeasurements Measurements { get; set; }
 
 			///
-			///The manufacturer's part number for the product.
+			///The manufacturer part number supplied for the product.
 			///
 			public string MfgPartNumber { get; set; }
 
-			///
-			///List of option attributes configured for an object. These values are associated and used by products, product bundles, and product types.
-			///
 			public List<ProductOption> Options { get; set; }
 
-			///
-			///Unit price that the tenant intends to sell the product if no sale price is set.
-			///
 			public ProductPrice Price { get; set; }
 
-			///
-			///For products with options that vary the cost of the product, the range between lowest and highest possible price of the product based on the current selection of options.
-			///
+			public ProductProperty PriceListEntryTypeProperty { get; set; }
+
 			public ProductPriceRange PriceRange { get; set; }
 
-			///
-			///Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.
-			///
 			public string ProductCode { get; set; }
 
-			///
-			///The current state of the configured product determines whether or not the product is eligible for purchase. Products with options are only purchasable if the shopper has selected all required options. If the product is not ready for purchase, a message lists missing options that are required.
-			///
 			public ProductPurchasableState PurchasableState { get; set; }
 
+			public string PurchaseLocation { get; set; }
+
 			///
-			///The universal product code (UPC) is the barcode defined for the product. The UPC is unique across all sales channels. 
+			///The universal product code defined for the product.
 			///
 			public string Upc { get; set; }
 
-			///
-			///Merchant-created code associated with a specific product variation. Variation product codes maintain an association with the base product code.
-			///
 			public string VariationProductCode { get; set; }
 
-			///
-			///The details of any volume price bands associated with the product.Refer to [Volume Pricing](https://www.mozu.com/docs/guides/catalog/price-lists.htm#volume_pricing) for more information.
-			///
 			public List<ProductVolumePrice> VolumePriceBands { get; set; }
 
-			///
-			///The details of the volume price range associated with the product. Volume price ranges consist of a lower price and an upper price, and either lower or upper prices can be affected by discounts.You can display the volume price range on product listing pages, such as category and search result pages, and product detail pages.Refer to [Volume Pricing Storefront Behavior](https://www.mozu.com/docs/guides/catalog/price-lists.htm#volume_pricing_storefront_behavior) for more information.
-			///
 			public ProductPriceRange VolumePriceRange { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductRuntime/Discount.cs b/Mozu.Api/Contracts/ProductRuntime/Discount.cs
old mode 100644
new mode 100755
index 3c912678..010f6e98
--- a/Mozu.Api/Contracts/ProductRuntime/Discount.cs
+++ b/Mozu.Api/Contracts/ProductRuntime/Discount.cs
@@ -14,28 +14,21 @@
 namespace Mozu.Api.Contracts.ProductRuntime
 {
 		///
-		///	Name of the discount added and applied to a shopping cart and order for a shopper's purchase. 
+		///	Properties of a defined product, order, or shipping discount.
 		///
 		public class Discount
 		{
-			///
-			///The unique identifier of the discount.
-			///
 			public int DiscountId { get; set; }
 
-			///
-			///Date and time in UTC format when a discount, credit, wish list, or cart expires. An expired discount no longer can be redeemed. An expired wish list is no longer available. An expired credit can no longer be redeemed for a purchase. Acart becomes inactive and expired based on a system-calculated interval. For example, if an anonymous shopper has 14 days of inactivity, the cart is considered abandoned after that period of inactivity. System-supplied and read-only.
-			///
 			public DateTime? ExpirationDate { get; set; }
 
 			///
-			///The localizable, shopper-facing description defined for a discount or a storefront message. 
+			///Client-defined description that displays for the shopper on the web storefront.
 			///
 			public string FriendlyDescription { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
+			public decimal Impact { get; set; }
+
 			public string Name { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductRuntime/DiscountSelections.cs b/Mozu.Api/Contracts/ProductRuntime/DiscountSelections.cs
old mode 100644
new mode 100755
diff --git a/Mozu.Api/Contracts/ProductRuntime/DiscountValidationSummary.cs b/Mozu.Api/Contracts/ProductRuntime/DiscountValidationSummary.cs
old mode 100644
new mode 100755
index 8d33973d..9a5713eb
--- a/Mozu.Api/Contracts/ProductRuntime/DiscountValidationSummary.cs
+++ b/Mozu.Api/Contracts/ProductRuntime/DiscountValidationSummary.cs
@@ -20,7 +20,7 @@ namespace Mozu.Api.Contracts.ProductRuntime
 		public class DiscountValidationSummary
 		{
 			///
-			///List of discounts available per configured conditions and criteria. These discounts are associated with products, orders, and shipping costs. Shoppers can view these discounts per order, per product in an order, or for their shipping depending on the configuration.
+			///List of discount IDs the shopper can redeem for a product in its current state.
 			///
 			public List<Discount> ApplicableDiscounts { get; set; }
 
diff --git a/Mozu.Api/Contracts/ProductRuntime/Facet.cs b/Mozu.Api/Contracts/ProductRuntime/Facet.cs
old mode 100644
new mode 100755
index 204fe8ae..1d0ad41e
--- a/Mozu.Api/Contracts/ProductRuntime/Facet.cs
+++ b/Mozu.Api/Contracts/ProductRuntime/Facet.cs
@@ -15,28 +15,16 @@
 namespace Mozu.Api.Contracts.ProductRuntime
 {
 		///
-		///	Properties of the facet used to retrieve documents.
+		///	Properties of the facet used to index product searches on a storefront.
 		///
 		public class Facet
 		{
-			///
-			///The type of facet. Valid values are "range" (enables creation of a range of values) or "value" (populates the facet values based on the associated attribute or category).
-			///
 			public string FacetType { get; set; }
 
-			///
-			///The field name associated with the facet.
-			///
 			public string Field { get; set; }
 
-			///
-			///Descriptive text used as a label for objects, such as field names, facets, date ranges, contact information, and package information.
-			///
 			public string Label { get; set; }
 
-			///
-			///List of value data for objects.
-			///
 			public List<FacetValue> Values { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductRuntime/FacetValue.cs b/Mozu.Api/Contracts/ProductRuntime/FacetValue.cs
old mode 100644
new mode 100755
index 31e1780a..09d72c66
--- a/Mozu.Api/Contracts/ProductRuntime/FacetValue.cs
+++ b/Mozu.Api/Contracts/ProductRuntime/FacetValue.cs
@@ -19,54 +19,24 @@ namespace Mozu.Api.Contracts.ProductRuntime
 		///
 		public class FacetValue
 		{
-			///
-			///If applicable, the values of any subcategory facets in a hierarchy. Hierarchical facets only apply for product categories.
-			///
 			public List<FacetValue> ChildrenFacetValues { get; set; }
 
-			///
-			///The total number of associated items.
-			///
 			public int Count { get; set; }
 
-			///
-			///Submits the selected facet value as a facet value filter.
-			///
 			public string FilterValue { get; set; }
 
-			///
-			///If true, the facet value is applied as a filter in the storefront product search.
-			///
 			public bool? IsApplied { get; set; }
 
-			///
-			///Indicates if the object is displayed on the storefront. If true, the admin product category is displayed in the store. If false, the category is not displayed.
-			///
 			public bool IsDisplayed { get; set; }
 
-			///
-			///Descriptive text used as a label for objects, such as field names, facets, date ranges, contact information, and package information.
-			///
 			public string Label { get; set; }
 
-			///
-			///If applicable, the values of any parent category facets in a hierarchy. Hierarchical facets only apply for product categories.
-			///
 			public string ParentFacetValue { get; set; }
 
-			///
-			///The maximum value selected or entered for the facet range query.
-			///
 			public string RangeQueryValueEnd { get; set; }
 
-			///
-			///The minimum value selected or entered for the facet range query.
-			///
 			public string RangeQueryValueStart { get; set; }
 
-			///
-			///The value of a property, used by numerous objects within  including facets, attributes, products, localized content, metadata, capabilities ( and third-party), location inventory adjustment, and more. The value may be a string, integer, or double. Validation may be run against the entered and saved values depending on the object type.
-			///
 			public string Value { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductRuntime/LocationInventory.cs b/Mozu.Api/Contracts/ProductRuntime/LocationInventory.cs
old mode 100644
new mode 100755
index 6537b1c0..21021125
--- a/Mozu.Api/Contracts/ProductRuntime/LocationInventory.cs
+++ b/Mozu.Api/Contracts/ProductRuntime/LocationInventory.cs
@@ -14,28 +14,16 @@
 namespace Mozu.Api.Contracts.ProductRuntime
 {
 		///
-		///	Properties of an inventory definition that defines the level of inventory for a specific product at a given location.
+		///	Properties of the active product inventory levels for a specific location.
 		///
 		public class LocationInventory
 		{
-			///
-			///The unique, user-defined code that identifies a location. This location can be the location where the order was entered, location for newly in-stock products, and where products are returned.
-			///
 			public string LocationCode { get; set; }
 
-			///
-			///The unique, user-defined product code of a product, used throughout  to reference and associate to a product.
-			///
 			public string ProductCode { get; set; }
 
-			///
-			///The soft stock level for the associated product currently available, at specified locations, and based on the number of pending soft product allocations as applicable. This value is associated with the  resource and operations.
-			///
 			public int? SoftStockAvailable { get; set; }
 
-			///
-			///The stock level for the associated product currently available, at specified locations, and based on the number of pending product reservations as applicable. System-supplied and read only.
-			///
 			public int? StockAvailable { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductRuntime/LocationInventoryCollection.cs b/Mozu.Api/Contracts/ProductRuntime/LocationInventoryCollection.cs
old mode 100644
new mode 100755
index d5f567f3..e0618c32
--- a/Mozu.Api/Contracts/ProductRuntime/LocationInventoryCollection.cs
+++ b/Mozu.Api/Contracts/ProductRuntime/LocationInventoryCollection.cs
@@ -15,18 +15,12 @@
 namespace Mozu.Api.Contracts.ProductRuntime
 {
 		///
-		///	Array list of inventory definitions that manage the stock level of products at a given location.
+		///	Paged collection of product inventory information by location.
 		///
 		public class LocationInventoryCollection
 		{
-			///
-			///An array list of objects in the returned collection.
-			///
 			public List<LocationInventory> Items { get; set; }
 
-			///
-			///The number of results listed in the query collection, represented by a signed 64-bit (8-byte) integer. This value is system-supplied and read-only.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductRuntime/LocationInventoryQuery.cs b/Mozu.Api/Contracts/ProductRuntime/LocationInventoryQuery.cs
old mode 100644
new mode 100755
index 766d18ef..57308dfb
--- a/Mozu.Api/Contracts/ProductRuntime/LocationInventoryQuery.cs
+++ b/Mozu.Api/Contracts/ProductRuntime/LocationInventoryQuery.cs
@@ -14,19 +14,10 @@
 
 namespace Mozu.Api.Contracts.ProductRuntime
 {
-		///
-		///	Properties for the product location inventory provided for queries to locate products by their location.
-		///
 		public class LocationInventoryQuery
 		{
-			///
-			///List of location codes to associate with the location usage. At this time, you can only specify one location code in the request for the direct ship location usage type.
-			///
 			public List<string> LocationCodes { get; set; }
 
-			///
-			///A list of product codes of associated products. When this field is in the Product Publishing resource, you can use this field  to publish or delete individual pending product changes, or assign individual pending product changes to a publish set.
-			///
 			public List<string> ProductCodes { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductRuntime/PackageMeasurements.cs b/Mozu.Api/Contracts/ProductRuntime/PackageMeasurements.cs
old mode 100644
new mode 100755
index 59cf92c6..153a89bf
--- a/Mozu.Api/Contracts/ProductRuntime/PackageMeasurements.cs
+++ b/Mozu.Api/Contracts/ProductRuntime/PackageMeasurements.cs
@@ -19,24 +19,12 @@ namespace Mozu.Api.Contracts.ProductRuntime
 		///
 		public class PackageMeasurements
 		{
-			///
-			///Height of a package or bundle package in imperial units of feet and inches.
-			///
 			public Measurement PackageHeight { get; set; }
 
-			///
-			///Length of a package or bundle package in imperial units of feet and inches.
-			///
 			public Measurement PackageLength { get; set; }
 
-			///
-			///Weight of a package or bundle package in imperial units of pounds and ounces.
-			///
 			public Measurement PackageWeight { get; set; }
 
-			///
-			///Width of a package or bundle package in imperial units of feet and inches.
-			///
 			public Measurement PackageWidth { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductRuntime/PriceList.cs b/Mozu.Api/Contracts/ProductRuntime/PriceList.cs
old mode 100644
new mode 100755
index a1c0935f..0d1e8f03
--- a/Mozu.Api/Contracts/ProductRuntime/PriceList.cs
+++ b/Mozu.Api/Contracts/ProductRuntime/PriceList.cs
@@ -14,69 +14,30 @@
 
 namespace Mozu.Api.Contracts.ProductRuntime
 {
-		///
-		///	The details of the price list.
-		///
 		public class PriceList
 		{
-			///
-			///A list of price lists and their details that describe the ancestor/parent hierarchy of the current price list. Each price list within this list is an ancestor/parent of the current price list. An ancestor/parent price list can have it's own ancestor/parent, which is denoted by .
-			///
 			public List<PriceListNode> Ancestors { get; set; }
 
-			///
-			///A list of price lists and their details that describe the descendant/child hierarchy of the current price list. Each price list within this list is an descendant/child of the current price list. A descendant/child price list can have it's own descendant/child, which is denoted by .
-			///
 			public List<PriceListNode> Descendants { get; set; }
 
-			///
-			///The localized description in text for the object, displayed per the locale code. For example, descriptions are used for product descriptions, attributes, and pre-authorization transaction types.
-			///
 			public string Description { get; set; }
 
-			///
-			///Indicates if a capability, function tied to an Arc.js action, application, or price list is enabled for the tenant/site. If true, the capability/application/function/price list is enabled for the tenant. System-supplied and read-only with the exception of functions tied to an Arc.js action and price lists.
-			///
 			public bool Enabled { get; set; }
 
-			///
-			///Indicates whether the price list is exclusive. When a price list is exclusive, shoppers that resolve to the exclusive price list can only view and purchase products that have price entries in the price list and any of its parents. The default is .
-			///
 			public bool FilteredInStoreFront { get; set; }
 
-			///
-			///Specifies whether the price list is indexed for the site.
-			///
 			public bool? IsIndexed { get; set; }
 
-			///
-			///Specifies whether the price list is the default price list for the site. Refer to [Default](../../../guides/catalog/price-lists.htm#default) in the Price Lists guides topic for more information. 
-			///
 			public bool IsSiteDefault { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
-			///
-			///The unique, user-defined code of the price list.
-			///
 			public string PriceListCode { get; set; }
 
-			///
-			///The internal identifier of the price list.
-			///
 			public int PriceListId { get; set; }
 
-			///
-			///Specifies whether the price list is resolvable. When ,  is able to apply the price list and its product pricing directly to a shopper. When ,  is unable to apply the price list and its product pricing directly to a shopper; however  can still apply the price list to a shopper if it is a parent of a resolvable price list. Refer to [Resolution](../../../guides/catalog/price-lists.htm#resolution) in the Price Lists guides topic for more information.
-			///
 			public bool Resolvable { get; set; }
 
-			///
-			///A list of site identifiers for which the price list is valid.
-			///
 			public List<int> ValidSites { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductRuntime/PriceListNode.cs b/Mozu.Api/Contracts/ProductRuntime/PriceListNode.cs
old mode 100644
new mode 100755
index 7690f4dc..db5bd364
--- a/Mozu.Api/Contracts/ProductRuntime/PriceListNode.cs
+++ b/Mozu.Api/Contracts/ProductRuntime/PriceListNode.cs
@@ -13,29 +13,14 @@
 
 namespace Mozu.Api.Contracts.ProductRuntime
 {
-		///
-		///	Mozu.ProductRuntime.Contracts.PriceListNode ApiType DOCUMENT_HERE 
-		///
 		public class PriceListNode
 		{
-			///
-			///Specifies the id of the price list's parent within the ancestor/descendant hierarchy, if applicable.
-			///
 			public int? ParentPriceListId { get; set; }
 
-			///
-			///Specifies the code of the price list within the ancestor/descendant hierarchy, if applicable.
-			///
 			public string PriceListCode { get; set; }
 
-			///
-			///Specifies the internal id of the price list within the ancestor/descendant hierarchy, if applicable.
-			///
 			public int PriceListId { get; set; }
 
-			///
-			///Denotes the place of the ancestor/descendant within the hierarchy. A value of 1 is the closest ancestor/descendant to the current price list. For example an ancestor that has a value of 1 is the direct parent of the current price list.
-			///
 			public int PriceListLevel { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductRuntime/Product.cs b/Mozu.Api/Contracts/ProductRuntime/Product.cs
old mode 100644
new mode 100755
index 86f9ba16..15cfea2d
--- a/Mozu.Api/Contracts/ProductRuntime/Product.cs
+++ b/Mozu.Api/Contracts/ProductRuntime/Product.cs
@@ -15,97 +15,57 @@
 namespace Mozu.Api.Contracts.ProductRuntime
 {
 		///
-		///	The properties of a product, referenced and used by carts, orders, wish lists, and returns.
+		///	Properties of the product that appears on a designated storefront.
 		///
 		public class Product
 		{
-			///
-			///List of shipping discounts that can be applied to the configured product. These discounts are calculated and updated as shoppers add content to their cart and continue checkout steps to order submission.
-			///
 			public List<Discount> AvailableShippingDiscounts { get; set; }
 
 			///
-			///Properties of a collection of component products that make up a single product bundle with its own product code. Tenants can define product bundles for any product type that supports the Bundle product usage.
+			///Properties of a collection of component products that make up a single product bundle with its own product code.
 			///
 			public List<BundledProduct> BundledProducts { get; set; }
 
-			///
-			///The date and time in UTC when the product is no longer active in the catalog.
-			///
 			public DateTime? CatalogEndDate { get; set; }
 
-			///
-			///The date and time in UTC format when the product is active in the catalog.
-			///
 			public DateTime? CatalogStartDate { get; set; }
 
-			///
-			///The list of all categories associated with the product. These categories contain products, can have discounts associated, and define the grouping of products to display on the storefront.
-			///
 			public List<Category> Categories { get; set; }
 
-			///
-			///Complex type that contains content for a language specified by LocaleCode.
-			///
 			public ProductContent Content { get; set; }
 
-			///
-			///Date and time when the entity was created, represented in UTC Date/Time.
-			///
 			public DateTime CreateDate { get; set; }
 
-			///
-			///The date and time in UTC format when the product first became available in the catalog. This field is used to calculate the number of days the product has been available in the catalog for a dynamic expression.
-			///
 			public DateTime? DateFirstAvailableInCatalog { get; set; }
 
-			///
-			///The total number of days the product has been available in the catalog. This field is related to the DaysAvailableInCatalog field in a dynamic expression.
-			///
 			public int? DaysAvailableInCatalog { get; set; }
 
 			///
-			///List of supported types of fulfillment for the product or variation. The types include direct ship, in-store pickup, or both.
+			///The list of fulfillment types the product supports.
 			///
 			public List<string> FulfillmentTypesSupported { get; set; }
 
-			///
-			///The type of goods in a bundled product. A bundled product is composed of products associated to sell together. Possible values include “Physical” and “DigitalCredit”. This comes from the `productType `of the product. Products are defaulted to a Physical `goodsType`. Gift cards have a `goodsType `of DigitalCredit.
-			///
 			public string GoodsType { get; set; }
 
-			///
-			///Properties and data of inventory information for configured and bundled products. If product stock is managed, the data specifies out of stock behavior.
-			///
 			public ProductInventoryInfo InventoryInfo { get; set; }
 
-			///
-			///Indicates if the object or feature is active.
-			///
 			public bool? IsActive { get; set; }
 
 			///
-			///Indicates if the product must be shipped alone in a container. This is used for products and products within a bundle. If true, this product cannot be shipped in a package with other items and must ship in a package by itself.
+			///If true, this product cannot ship in a package with other products and must ship in a package by itself.
 			///
 			public bool? IsPackagedStandAlone { get; set; }
 
-			///
-			///Indicates if the product in a cart, order, or wish list is purchased on a recurring schedule. If true, the item can be purchased or fulfilled at regular intervals, such as a monthly billing cycle. For example, digital or physical product subscriptions are recurring cart items. This property is not used at this time and is reserved for future functionality.
-			///
 			public bool IsRecurring { get; set; }
 
-			///
-			///Indicates if the item is subject to taxation, used by products, options, extras, cart and order items, line items, and wish lists. If true, the entity is subject to tax based on the relevant tax rate and rules.
-			///
 			public bool IsTaxable { get; set; }
 
-			///
-			///Dimensions of the packaged product.
-			///
+			public List<string> LocationsInStock { get; set; }
+
 			public PackageMeasurements Measurements { get; set; }
 
 			///
-			///The manufacturer's part number for the product.
+			///The manufacturer part number defined for the product.
 			///
 			public string MfgPartNumber { get; set; }
 
@@ -114,44 +74,23 @@ public class Product
 			///
 			public List<string> MfgPartNumbers { get; set; }
 
-			///
-			///List of option attributes configured for an object. These values are associated and used by products, product bundles, and product types.
-			///
 			public List<ProductOption> Options { get; set; }
 
-			///
-			///Unit price that the tenant intends to sell the product if no sale price is set.
-			///
 			public ProductPrice Price { get; set; }
 
-			///
-			///For products with options that vary the cost of the product, the range between lowest and highest possible price of the product based on the current selection of options.
-			///
 			public ProductPriceRange PriceRange { get; set; }
 
 			///
-			///Properties that describe the behavior the system uses when determining the price of products.
+			///Describes the behavior the system uses when determining the price of the product.
 			///
 			public ProductPricingBehaviorInfo PricingBehavior { get; set; }
 
-			///
-			///Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.
-			///
 			public string ProductCode { get; set; }
 
-			///
-			///Integer that represents the sequential order of the product.
-			///
 			public int? ProductSequence { get; set; }
 
-			///
-			///A product type is like a product template.
-			///
 			public string ProductType { get; set; }
 
-			///
-			///The unique identifier of the product type of the product.
-			///
 			public int? ProductTypeId { get; set; }
 
 			///
@@ -159,24 +98,14 @@ public class Product
 			///
 			public string ProductUsage { get; set; }
 
-			///
-			///Collection of property attributes defined for the object. Properties are associated to all objects within , including documents, products, and product types.
-			///
 			public List<ProductProperty> Properties { get; set; }
 
-			///
-			///The current state of the document or product definition. States for documents include Active, Draft, or Latest. Active documents are published and cannot be deleted. Querying Latest returns the most recent version of the document, regardless of whether it is published or a draft. States for product include New, Draft, or Live.
-			///
 			public string PublishState { get; set; }
 
-			///
-			///The current state of the configured product determines whether or not the product is eligible for purchase. Products with options are only purchasable if the shopper has selected all required options. If the product is not ready for purchase, a message lists missing options that are required.
-			///
 			public ProductPurchasableState PurchasableState { get; set; }
 
-			///
-			///The universal product code (UPC) is the barcode defined for the product. The UPC is unique across all sales channels. 
-			///
+			public string PurchaseLocation { get; set; }
+
 			public string Upc { get; set; }
 
 			///
@@ -184,34 +113,16 @@ public class Product
 			///
 			public List<string> UpCs { get; set; }
 
-			///
-			///The date and time in UTC format the object was updated most recently.
-			///
 			public DateTime UpdateDate { get; set; }
 
-			///
-			///A list of price lists for which the product is valid.
-			///
 			public List<string> ValidPriceLists { get; set; }
 
-			///
-			///Merchant-created code associated with a specific product variation. Variation product codes maintain an association with the base product code.
-			///
 			public string VariationProductCode { get; set; }
 
-			///
-			///A summary of all variations that exist for the product.
-			///
 			public List<VariationSummary> Variations { get; set; }
 
-			///
-			///The details of any volume price bands associated with the product.Refer to [Volume Pricing](https://www.mozu.com/docs/guides/catalog/price-lists.htm#volume_pricing) for more information.
-			///
 			public List<ProductVolumePrice> VolumePriceBands { get; set; }
 
-			///
-			///The details of the volume price range associated with the product. Volume price ranges consist of a lower price and an upper price, and either lower or upper prices can be affected by discounts.You can display the volume price range on product listing pages, such as category and search result pages, and product detail pages.Refer to [Volume Pricing Storefront Behavior](https://www.mozu.com/docs/guides/catalog/price-lists.htm#volume_pricing_storefront_behavior) for more information.
-			///
 			public ProductPriceRange VolumePriceRange { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductRuntime/ProductCollection.cs b/Mozu.Api/Contracts/ProductRuntime/ProductCollection.cs
old mode 100644
new mode 100755
index 6e3bd99d..17a3d949
--- a/Mozu.Api/Contracts/ProductRuntime/ProductCollection.cs
+++ b/Mozu.Api/Contracts/ProductRuntime/ProductCollection.cs
@@ -15,35 +15,20 @@
 namespace Mozu.Api.Contracts.ProductRuntime
 {
 		///
-		///	The container for a set of products.
+		///	Collection of products and their related properties.
 		///
 		public class ProductCollection
 		{
-			///
-			///An array list of objects in the returned collection.
-			///
 			public List<Product> Items { get; set; }
 
-			///
-			///This parameter is associated with deep paging. If you started a deep paged request by specifying ,  returns an encoded value for the . In your most immediate subsequent request, set  to the same value you received for  to continue paging. When  is null, you've reached the end of paged results.
-			///
 			public string NextCursorMark { get; set; }
 
-			///
-			///The number of pages returned based on the startIndex and pageSize values specified. This value is system-supplied and read-only.
-			///
 			public int PageCount { get; set; }
 
-			///
-			///The number of results to display on each page when creating paged results from a query. The maximum value is 200.
-			///
 			public int PageSize { get; set; }
 
 			public int StartIndex { get; set; }
 
-			///
-			///The number of results listed in the query collection, represented by a signed 64-bit (8-byte) integer. This value is system-supplied and read-only.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductRuntime/ProductContent.cs b/Mozu.Api/Contracts/ProductRuntime/ProductContent.cs
old mode 100644
new mode 100755
index 5b6e3ef9..6d8ea8b6
--- a/Mozu.Api/Contracts/ProductRuntime/ProductContent.cs
+++ b/Mozu.Api/Contracts/ProductRuntime/ProductContent.cs
@@ -19,44 +19,20 @@ namespace Mozu.Api.Contracts.ProductRuntime
 		///
 		public class ProductContent
 		{
-			///
-			///Description defined for metadata, used to interally manage data, in the language specified by the `localeCode`. This content is used by categories, products, localized content, and SEO content.
-			///
 			public string MetaTagDescription { get; set; }
 
-			///
-			///Keywords defined for metadata, used to internally manage data, in the language specified by the `localeCode`. Keywords are used by content for categories, products, localized content, and SEO content.
-			///
 			public string MetaTagKeywords { get; set; }
 
-			///
-			///Title defined for metadata, used to internally manage data, in the language specified by the `localeCode`. Titles are used by content for categories, products, localized content, and SEO content.
-			///
 			public string MetaTagTitle { get; set; }
 
-			///
-			///Lengthy full description for a product description, displayed on product detail pages within the storefront.
-			///
 			public string ProductFullDescription { get; set; }
 
-			///
-			///List of image files associated with a product. This content may include the image file URL, name, and other information as available.
-			///
 			public List<ProductImage> ProductImages { get; set; }
 
-			///
-			///The name of the product that represents a line item in a taxable order or product bundle.
-			///
 			public string ProductName { get; set; }
 
-			///
-			///Brief text description of the product or component in a product bundle, typically used when the product is displayed in a list or in search results.
-			///
 			public string ProductShortDescription { get; set; }
 
-			///
-			///The search engine optimized, human-readable portion of the URL. The content is localized according to the product's `localeCode`.
-			///
 			public string SeoFriendlyUrl { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductRuntime/ProductCost.cs b/Mozu.Api/Contracts/ProductRuntime/ProductCost.cs
old mode 100644
new mode 100755
index 097aea78..9ce8b468
--- a/Mozu.Api/Contracts/ProductRuntime/ProductCost.cs
+++ b/Mozu.Api/Contracts/ProductRuntime/ProductCost.cs
@@ -13,19 +13,10 @@
 
 namespace Mozu.Api.Contracts.ProductRuntime
 {
-		///
-		///	The cost a client pays the supplier to stock the product.
-		///
 		public class ProductCost
 		{
-			///
-			///cost ApiType DOCUMENT_HERE 
-			///
 			public decimal Cost { get; set; }
 
-			///
-			///The unique, user-defined product code of a product, used throughout  to reference and associate to a product.
-			///
 			public string ProductCode { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductRuntime/ProductCostCollection.cs b/Mozu.Api/Contracts/ProductRuntime/ProductCostCollection.cs
old mode 100644
new mode 100755
index 2a0b785b..37788c9e
--- a/Mozu.Api/Contracts/ProductRuntime/ProductCostCollection.cs
+++ b/Mozu.Api/Contracts/ProductRuntime/ProductCostCollection.cs
@@ -14,19 +14,10 @@
 
 namespace Mozu.Api.Contracts.ProductRuntime
 {
-		///
-		///	Mozu.ProductRuntime.Contracts.ProductCostCollection ApiType DOCUMENT_HERE 
-		///
 		public class ProductCostCollection
 		{
-			///
-			///A list of requested items. All returned data is provided in an items array.For a failed request, the returned response may be success with an empty item array.
-			///
 			public List<ProductCost> Items { get; set; }
 
-			///
-			///The total number of items in the list.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductRuntime/ProductCostQuery.cs b/Mozu.Api/Contracts/ProductRuntime/ProductCostQuery.cs
old mode 100644
new mode 100755
index 5f657e9e..59745afb
--- a/Mozu.Api/Contracts/ProductRuntime/ProductCostQuery.cs
+++ b/Mozu.Api/Contracts/ProductRuntime/ProductCostQuery.cs
@@ -14,14 +14,8 @@
 
 namespace Mozu.Api.Contracts.ProductRuntime
 {
-		///
-		///	Mozu.ProductRuntime.Contracts.ProductCostQuery ApiType DOCUMENT_HERE 
-		///
 		public class ProductCostQuery
 		{
-			///
-			///A list of product codes of associated products. When this field is in the Product Publishing resource, you can use this field  to publish or delete individual pending product changes, or assign individual pending product changes to a publish set.
-			///
 			public List<string> ProductCodes { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductRuntime/ProductImage.cs b/Mozu.Api/Contracts/ProductRuntime/ProductImage.cs
old mode 100644
new mode 100755
index 06973e9c..a81bd742
--- a/Mozu.Api/Contracts/ProductRuntime/ProductImage.cs
+++ b/Mozu.Api/Contracts/ProductRuntime/ProductImage.cs
@@ -18,39 +18,21 @@ namespace Mozu.Api.Contracts.ProductRuntime
 		///
 		public class ProductImage
 		{
-			///
-			///Descriptive text associated with the image or video that appears on the web storefront. This text displays on a hover-over in the browser, providing further information on the content displayed. The alternate text should be plain alphanumeric text without special characters or HTML coding.
-			///
 			public string AltText { get; set; }
 
 			///
-			///The identifier of the image in the  CMS. Supply a value for either the CMS ID or Image URL parameter.
+			///The identifier of the product image in the Mozu CMS. Supply a value for either the CMS ID or the Image URL parameter.
 			///
 			public string CmsId { get; set; }
 
-			///
-			///The localized title for an image that displays on the storefront. If localized, the displayed content is set per the locale code for the site.
-			///
 			public string ImageLabel { get; set; }
 
-			///
-			///The URL link for the image file associated with a product or category.
-			///
 			public string ImageUrl { get; set; }
 
-			///
-			///Type of media specification required to successfully render the image, video, or other media content for products and categories.
-			///
 			public string MediaType { get; set; }
 
-			///
-			///The numeric order of objects, used by a vocabulary value defined for an extensible attribute, images, and categories.
-			///
 			public int? Sequence { get; set; }
 
-			///
-			///The URL of a video files for a product or category. The path name is set in the language specified by the LocaleCode.
-			///
 			public string VideoUrl { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductRuntime/ProductInventoryInfo.cs b/Mozu.Api/Contracts/ProductRuntime/ProductInventoryInfo.cs
old mode 100644
new mode 100755
index 575bc31b..949ad2e4
--- a/Mozu.Api/Contracts/ProductRuntime/ProductInventoryInfo.cs
+++ b/Mozu.Api/Contracts/ProductRuntime/ProductInventoryInfo.cs
@@ -14,13 +14,10 @@
 namespace Mozu.Api.Contracts.ProductRuntime
 {
 		///
-		///	Properties of the inventory behavior associated with a product definition.
+		///	Properties of the active inventory managed for the product.
 		///
 		public class ProductInventoryInfo
 		{
-			///
-			///Indicates is the item's stock is managed. If true,  manages inventory levels for this product.
-			///
 			public bool? ManageStock { get; set; }
 
 			///
@@ -28,19 +25,10 @@ public class ProductInventoryInfo
 			///
 			public string OnlineLocationCode { get; set; }
 
-			///
-			///Number of product items currently available for purchase.
-			///
 			public int? OnlineSoftStockAvailable { get; set; }
 
-			///
-			///The current number of products that are available for purchase.
-			///
 			public int? OnlineStockAvailable { get; set; }
 
-			///
-			///Determines the method this product uses when active stock is depeleted. Options include "DisplayMessage" to display an out of stock message to the shopper, "HideProduct" to disable the product on the storefront, or "AllowBackOrder" to allow the shopper to back order the product. This property is required only if  manages inventory for this product.
-			///
 			public string OutOfStockBehavior { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductRuntime/ProductOption.cs b/Mozu.Api/Contracts/ProductRuntime/ProductOption.cs
old mode 100644
new mode 100755
index a605e9d9..18cfc01e
--- a/Mozu.Api/Contracts/ProductRuntime/ProductOption.cs
+++ b/Mozu.Api/Contracts/ProductRuntime/ProductOption.cs
@@ -15,33 +15,18 @@
 namespace Mozu.Api.Contracts.ProductRuntime
 {
 		///
-		///	Properties of the product option to create such as attribute detail, fully qualified name, and list of product option values.
+		///	Represents configurable options that a shopper can choose when ordering a product, such as a t-shirt color and size.
 		///
 		public class ProductOption
 		{
-			///
-			///The product attribute details common between all attribute types - properties, options, and extras.
-			///
 			public AttributeDetail AttributeDetail { get; set; }
 
-			///
-			///The fully qualified name of the attribute, which is a user defined attribute identifier.
-			///
 			public string AttributeFQN { get; set; }
 
-			///
-			///Indicates if the object has or can have multiple properties or values. If true, the object can have more than one value, selectable by shoppers through the storefront or configurable through the catalogs. 
-			///
 			public bool? IsMultiValue { get; set; }
 
-			///
-			///Indicates if the property, attribute, product option, or product extra is required. If true, the object must have a defined value.
-			///
 			public bool? IsRequired { get; set; }
 
-			///
-			///List of value data for objects.
-			///
 			public List<ProductOptionValue> Values { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductRuntime/ProductOptionSelection.cs b/Mozu.Api/Contracts/ProductRuntime/ProductOptionSelection.cs
old mode 100644
new mode 100755
index 16d97fac..ecf55086
--- a/Mozu.Api/Contracts/ProductRuntime/ProductOptionSelection.cs
+++ b/Mozu.Api/Contracts/ProductRuntime/ProductOptionSelection.cs
@@ -18,24 +18,12 @@ namespace Mozu.Api.Contracts.ProductRuntime
 		///
 		public class ProductOptionSelection
 		{
-			///
-			///The fully qualified name of the attribute, which is a user defined attribute identifier.
-			///
 			public string AttributeFQN { get; set; }
 
-			///
-			///Unique identifier of the attribute's value.
-			///
 			public int? AttributeValueId { get; set; }
 
-			///
-			///The value a shopper entered for an attribute that requires additional input for the product on a storefront. This entered value is a selected option or entered content for an extra, such as selecting a color or entering content for a monogram.
-			///
 			public object ShopperEnteredValue { get; set; }
 
-			///
-			///The value of a property, used by numerous objects within  including facets, attributes, products, localized content, metadata, capabilities ( and third-party), location inventory adjustment, and more. The value may be a string, integer, or double. Validation may be run against the entered and saved values depending on the object type.
-			///
 			public object Value { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductRuntime/ProductOptionSelections.cs b/Mozu.Api/Contracts/ProductRuntime/ProductOptionSelections.cs
old mode 100644
new mode 100755
index 9341219c..8ce06ec9
--- a/Mozu.Api/Contracts/ProductRuntime/ProductOptionSelections.cs
+++ b/Mozu.Api/Contracts/ProductRuntime/ProductOptionSelections.cs
@@ -19,14 +19,8 @@ namespace Mozu.Api.Contracts.ProductRuntime
 		///
 		public class ProductOptionSelections
 		{
-			///
-			///List of option attributes configured for an object. These values are associated and used by products, product bundles, and product types.
-			///
 			public List<ProductOptionSelection> Options { get; set; }
 
-			///
-			///Merchant-created code associated with a specific product variation. Variation product codes maintain an association with the base product code.
-			///
 			public string VariationProductCode { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductRuntime/ProductOptionValue.cs b/Mozu.Api/Contracts/ProductRuntime/ProductOptionValue.cs
old mode 100644
new mode 100755
index 995195f9..537cb51c
--- a/Mozu.Api/Contracts/ProductRuntime/ProductOptionValue.cs
+++ b/Mozu.Api/Contracts/ProductRuntime/ProductOptionValue.cs
@@ -14,63 +14,30 @@
 namespace Mozu.Api.Contracts.ProductRuntime
 {
 		///
-		///	Properties of a value associated with a product option attribute.
+		///	Represents the values that are the product option selections for a shopper to choose when ordering a product.
 		///
 		public class ProductOptionValue
 		{
-			///
-			///Unique identifier of the attribute's value.
-			///
 			public int AttributeValueId { get; set; }
 
-			///
-			///The bundled product of a product as extra
-			///
 			public BundledProduct BundledProduct { get; set; }
 
-			///
-			///If the product is in relative pricing mode, this is the difference between associated prices for a product, variation option, or extra. The difference is calculated by subtracting the base price from the associated price with this product, option, and/or extra. For example, if a product with a defined monogram extra costs an additional $10, the `deltaPrice `value is "10". Between options, a price for a medium may be $10 and a large $12 giving a `deltaPrice `value of "2".Refer to [Product Variant Pricing and Weight](../../../guides/catalog/products.htm#product_variant_pricing_and_weight) in the Products guides topic for more information.
-			///
 			public decimal? DeltaPrice { get; set; }
 
-			///
-			///The difference between the weight associated with this product, variation option, or extra and the base product. For example, if a product with a monogram weighs an extra 1/4 lb, the DeltaWeight value is "0.25". The amount of the delta is set by the weight type for the storefront.
-			///
 			public decimal? DeltaWeight { get; set; }
 
-			///
-			///Defines the intended display of this attribute in the storefront. Options include Drop Down, Image Picker, and Radio Buttons.
-			///
 			public AttributeVocabularyValueDisplayInfo DisplayInfo { get; set; }
 
-			///
-			///Indicates if the object is default. This indicator is used for product variations and site search settings. If true, the value/object is the default option. 
-			///
 			public bool? IsDefault { get; set; }
 
-			///
-			///Indicates if the object or process is enabled. This indicator is used on external payment workflows and product option values. For product options, if true, the product option value is available for a shopper to choose. During configuration, this property will be false if the option value is invalid with other selected options. For external payment workflows, if true, the workflow is enabled and available for routing payments for the submitted order.
-			///
 			public bool? IsEnabled { get; set; }
 
-			///
-			///If true, the entity is selected. If false, the entity is not selected.
-			///
 			public bool? IsSelected { get; set; }
 
-			///
-			///The value a shopper entered for an attribute that requires additional input for the product on a storefront. This entered value is a selected option or entered content for an extra, such as selecting a color or entering content for a monogram.
-			///
 			public object ShopperEnteredValue { get; set; }
 
-			///
-			///If the object value is a String, this value provides that string value, used by vocabulary property values, products, and options.
-			///
 			public string StringValue { get; set; }
 
-			///
-			///The value of a property, used by numerous objects within  including facets, attributes, products, localized content, metadata, capabilities ( and third-party), location inventory adjustment, and more. The value may be a string, integer, or double. Validation may be run against the entered and saved values depending on the object type.
-			///
 			public object Value { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductRuntime/ProductPrice.cs b/Mozu.Api/Contracts/ProductRuntime/ProductPrice.cs
old mode 100644
new mode 100755
index f03a8e60..c234712d
--- a/Mozu.Api/Contracts/ProductRuntime/ProductPrice.cs
+++ b/Mozu.Api/Contracts/ProductRuntime/ProductPrice.cs
@@ -14,7 +14,7 @@
 namespace Mozu.Api.Contracts.ProductRuntime
 {
 		///
-		///	The price of the product in the specified currency code (USD). This price can either be the sale price or the price for which the merchang intends to sell the product.
+		///	The price of the product in the specified currency code (USD). This price can either be the sale price or the price for which the merchant intends to sell the product.
 		///
 		public class ProductPrice
 		{
@@ -28,53 +28,32 @@ public class ProductPrice
 			///
 			public decimal? CatalogSalePrice { get; set; }
 
-			///
-			///The credit value of the product or bundled product. When the `goodsType `is `DigitalCredit`, this value is populated to indicate the value of the credit. This is used to create store credit in the fulfillment of gift cards.
-			///
 			public decimal? CreditValue { get; set; }
 
-			///
-			///Name of the discount added and applied to a shopping cart and order for a shopper's purchase. 
-			///
 			public AppliedDiscount Discount { get; set; }
 
-			///
-			///The price list code if a price list is applield to the product's pricing.
-			///
 			public string EffectivePricelistCode { get; set; }
 
 			///
-			///The manufacturer's suggested retail price (MSRP) for the product. This content may be defined by the supplier.
+			///The manufacturer's suggested retail price for the product.
 			///
 			public decimal? Msrp { get; set; }
 
-			///
-			///The price the merchant intends to charge for the product.
-			///
 			public decimal? Price { get; set; }
 
-			///
-			///The price list entry code that controls the product pricing, if a price list is applied to the product pricing.
-			///
 			public string PriceListEntryCode { get; set; }
 
-			///
-			///The pricing mode of the price list entry, if a price list is applied to the product pricing.The valid values are:* * A value of  indicates the product has volume pricing.
-			///
 			public string PriceListEntryMode { get; set; }
 
 			///
-			///The price type that displays in the price field on product listing pages and product detail pages on the storefront.The valid values are:* * * 
+			///The price type that displays on the storefront website for the Price field, which is List, MAP, or CatalogSalePrice
 			///
 			public string PriceType { get; set; }
 
-			///
-			///The set sale price for a product consisting of a price with a discount already applied.For price list entries, this property is the product's sale price if the  is set to .
-			///
 			public decimal? SalePrice { get; set; }
 
 			///
-			///The sale price type that displays in the sale price field on product listing pages and product detail pages on the storefront.The valid values are:* * * 
+			///The price type that displays on the storefront website for the Sale Price field, which is CatalogSalePrice, DiscountedList, or DiscountedCatalogSalePrice
 			///
 			public string SalePriceType { get; set; }
 
diff --git a/Mozu.Api/Contracts/ProductRuntime/ProductPriceRange.cs b/Mozu.Api/Contracts/ProductRuntime/ProductPriceRange.cs
old mode 100644
new mode 100755
index 23efdc70..c4ebfff7
--- a/Mozu.Api/Contracts/ProductRuntime/ProductPriceRange.cs
+++ b/Mozu.Api/Contracts/ProductRuntime/ProductPriceRange.cs
@@ -18,14 +18,8 @@ namespace Mozu.Api.Contracts.ProductRuntime
 		///
 		public class ProductPriceRange
 		{
-			///
-			///The lowest possible price value for a product with options that vary the cost of the product.
-			///
 			public ProductPrice Lower { get; set; }
 
-			///
-			///The highest possible price value for a product with options that vary the cost of the product.
-			///
 			public ProductPrice Upper { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductRuntime/ProductPricingBehaviorInfo.cs b/Mozu.Api/Contracts/ProductRuntime/ProductPricingBehaviorInfo.cs
old mode 100644
new mode 100755
index aed820a6..788be0da
--- a/Mozu.Api/Contracts/ProductRuntime/ProductPricingBehaviorInfo.cs
+++ b/Mozu.Api/Contracts/ProductRuntime/ProductPricingBehaviorInfo.cs
@@ -19,7 +19,7 @@ namespace Mozu.Api.Contracts.ProductRuntime
 		public class ProductPricingBehaviorInfo
 		{
 			///
-			///Indicates if the discount is restricted. If true, the system cannot apply any discounts to this product. Discount restrictions are defined at the master catalog level. Client administrators cannot override discount restrictions at the catalog level, but they can limit the restriction to a defined time interval.For price list entries, specifies whether discounts are restricted for the specific entry if  is set to .Refer to [Discount Restriction](../../../guides/catalog/price-lists.htm#discountrestriction) in the Price Lists guides topic for more information.
+			///If true, the system cannot apply any discounts to this product. Discount restrictions are defined at the master catalog level. Client administrators cannot override discount restrictions at the catalog level, but they can limit the restriction to a defined time interval.
 			///
 			public bool? DiscountsRestricted { get; set; }
 
diff --git a/Mozu.Api/Contracts/ProductRuntime/ProductProperty.cs b/Mozu.Api/Contracts/ProductRuntime/ProductProperty.cs
old mode 100644
new mode 100755
index 2a3efbf3..e5bd7770
--- a/Mozu.Api/Contracts/ProductRuntime/ProductProperty.cs
+++ b/Mozu.Api/Contracts/ProductRuntime/ProductProperty.cs
@@ -15,33 +15,18 @@
 namespace Mozu.Api.Contracts.ProductRuntime
 {
 		///
-		///	Details of a property defined for a product.
+		///	Details of a property attribute defined for a product.
 		///
 		public class ProductProperty
 		{
-			///
-			///The product attribute details common between all attribute types - properties, options, and extras.
-			///
 			public AttributeDetail AttributeDetail { get; set; }
 
-			///
-			///The fully qualified name of the attribute, which is a user defined attribute identifier.
-			///
 			public string AttributeFQN { get; set; }
 
-			///
-			///Indicates if the object is hidden or breaks inheritance, primarily used by facets, products, and attribute vocabulary values. For example, if true, the attribute vocabulary value does not appear in the list when defining a value for an attribute.
-			///
 			public bool? IsHidden { get; set; }
 
-			///
-			///Indicates if the object has or can have multiple properties or values. If true, the object can have more than one value, selectable by shoppers through the storefront or configurable through the catalogs. 
-			///
 			public bool? IsMultiValue { get; set; }
 
-			///
-			///List of value data for objects.
-			///
 			public List<ProductPropertyValue> Values { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductRuntime/ProductPropertyValue.cs b/Mozu.Api/Contracts/ProductRuntime/ProductPropertyValue.cs
old mode 100644
new mode 100755
index 12e353fb..39c923bf
--- a/Mozu.Api/Contracts/ProductRuntime/ProductPropertyValue.cs
+++ b/Mozu.Api/Contracts/ProductRuntime/ProductPropertyValue.cs
@@ -14,23 +14,14 @@
 namespace Mozu.Api.Contracts.ProductRuntime
 {
 		///
-		///	Properties of a value for a product property.
+		///	Values of a product property attribute.
 		///
 		public class ProductPropertyValue
 		{
-			///
-			///Defines the intended display of this attribute in the storefront. Options include Drop Down, Image Picker, and Radio Buttons.
-			///
 			public AttributeVocabularyValueDisplayInfo DisplayInfo { get; set; }
 
-			///
-			///If the object value is a String, this value provides that string value, used by vocabulary property values, products, and options.
-			///
 			public string StringValue { get; set; }
 
-			///
-			///The value of a property, used by numerous objects within  including facets, attributes, products, localized content, metadata, capabilities ( and third-party), location inventory adjustment, and more. The value may be a string, integer, or double. Validation may be run against the entered and saved values depending on the object type.
-			///
 			public object Value { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductRuntime/ProductPurchasableState.cs b/Mozu.Api/Contracts/ProductRuntime/ProductPurchasableState.cs
old mode 100644
new mode 100755
index 26608baf..fde068ef
--- a/Mozu.Api/Contracts/ProductRuntime/ProductPurchasableState.cs
+++ b/Mozu.Api/Contracts/ProductRuntime/ProductPurchasableState.cs
@@ -19,14 +19,8 @@ namespace Mozu.Api.Contracts.ProductRuntime
 		///
 		public class ProductPurchasableState
 		{
-			///
-			///If true, the entity has met all requirements and considered a purchasable entity.
-			///
 			public bool IsPurchasable { get; set; }
 
-			///
-			///Array list of validation and status messages associated with shipping rates, orders, and product purchasable state.
-			///
 			public List<ValidationMessage> Messages { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductRuntime/ProductSearchRandomAccessCursor.cs b/Mozu.Api/Contracts/ProductRuntime/ProductSearchRandomAccessCursor.cs
old mode 100644
new mode 100755
index da301d14..9f8e2964
--- a/Mozu.Api/Contracts/ProductRuntime/ProductSearchRandomAccessCursor.cs
+++ b/Mozu.Api/Contracts/ProductRuntime/ProductSearchRandomAccessCursor.cs
@@ -14,14 +14,8 @@
 
 namespace Mozu.Api.Contracts.ProductRuntime
 {
-		///
-		///	Mozu.ProductRuntime.Contracts.ProductSearchRandomAccessCursor ApiType DOCUMENT_HERE 
-		///
 		public class ProductSearchRandomAccessCursor
 		{
-			///
-			///A calculated set of cursor marks for a given query that can be accessed in any order, providing the ability to page through all results in a random or parallelized order. You provide one of the generated cursor mark sets to the  parameter of the  operation in the  resource or the  operation in the  resource.
-			///
 			public List<string> CursorMarks { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductRuntime/ProductSearchResult.cs b/Mozu.Api/Contracts/ProductRuntime/ProductSearchResult.cs
old mode 100644
new mode 100755
index 7abeeb3f..8fe5f66a
--- a/Mozu.Api/Contracts/ProductRuntime/ProductSearchResult.cs
+++ b/Mozu.Api/Contracts/ProductRuntime/ProductSearchResult.cs
@@ -19,41 +19,20 @@ namespace Mozu.Api.Contracts.ProductRuntime
 		///
 		public class ProductSearchResult
 		{
-			///
-			///The facets applied to index products in the product search result.
-			///
 			public List<Facet> Facets { get; set; }
 
-			///
-			///An array list of objects in the returned collection.
-			///
 			public List<Product> Items { get; set; }
 
-			///
-			///This parameter is associated with deep paging. If you started a deep paged request by specifying ,  returns an encoded value for the . In your most immediate subsequent request, set  to the same value you received for  to continue paging. When  is null, you've reached the end of paged results.
-			///
 			public string NextCursorMark { get; set; }
 
-			///
-			///The number of pages returned based on the startIndex and pageSize values specified. This value is system-supplied and read-only.
-			///
 			public int PageCount { get; set; }
 
-			///
-			///The number of results to display on each page when creating paged results from a query. The maximum value is 200.
-			///
 			public int PageSize { get; set; }
 
-			///
-			///Mozu.ProductRuntime.Contracts.ProductSearchResult solrDebugInfo ApiTypeMember DOCUMENT_HERE 
-			///
 			public SolrDebugInfo SolrDebugInfo { get; set; }
 
 			public int StartIndex { get; set; }
 
-			///
-			///The number of results listed in the query collection, represented by a signed 64-bit (8-byte) integer. This value is system-supplied and read-only.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductRuntime/ProductValidationSummary.cs b/Mozu.Api/Contracts/ProductRuntime/ProductValidationSummary.cs
old mode 100644
new mode 100755
index 130e73eb..e26f85d0
--- a/Mozu.Api/Contracts/ProductRuntime/ProductValidationSummary.cs
+++ b/Mozu.Api/Contracts/ProductRuntime/ProductValidationSummary.cs
@@ -20,48 +20,30 @@ namespace Mozu.Api.Contracts.ProductRuntime
 		public class ProductValidationSummary
 		{
 			///
-			///Properties of a collection of component products that make up a single product bundle with its own product code. Tenants can define product bundles for any product type that supports the Bundle product usage.
+			///Properties of a collection of component products that make up a single product bundle with its own product code.
 			///
 			public List<BundledProductSummary> BundledProducts { get; set; }
 
-			///
-			///The list of all categories associated with the product. These categories contain products, can have discounts associated, and define the grouping of products to display on the storefront.
-			///
 			public List<Category> Categories { get; set; }
 
 			///
-			///List of supported types of fulfillment for the product or variation. The types include direct ship, in-store pickup, or both.
+			///List of fulfillment types that the product supports.
 			///
 			public List<string> FulfillmentTypesSupported { get; set; }
 
-			///
-			///The type of goods in a bundled product. A bundled product is composed of products associated to sell together. Possible values include “Physical” and “DigitalCredit”. This comes from the `productType `of the product. Products are defaulted to a Physical `goodsType`. Gift cards have a `goodsType `of DigitalCredit.
-			///
 			public string GoodsType { get; set; }
 
-			///
-			///The image configured for the product on the storefront.
-			///
 			public ProductImage Image { get; set; }
 
-			///
-			///Properties and data of inventory information for configured and bundled products. If product stock is managed, the data specifies out of stock behavior.
-			///
 			public ProductInventoryInfo InventoryInfo { get; set; }
 
 			///
-			///Indicates if the product must be shipped alone in a container. This is used for products and products within a bundle. If true, this product cannot be shipped in a package with other items and must ship in a package by itself.
+			///If true, this product should not be packaged with other items and should ship by itself.
 			///
 			public bool? IsPackagedStandAlone { get; set; }
 
-			///
-			///Indicates if the item is subject to taxation, used by products, options, extras, cart and order items, line items, and wish lists. If true, the entity is subject to tax based on the relevant tax rate and rules.
-			///
 			public bool IsTaxable { get; set; }
 
-			///
-			///Dimensions of the packaged product.
-			///
 			public PackageMeasurements Measurements { get; set; }
 
 			///
@@ -69,59 +51,37 @@ public class ProductValidationSummary
 			///
 			public string MfgPartNumber { get; set; }
 
-			///
-			///Price that the merchant intends to sell the product which is not necessarily the list price. This is the price the merchant intends to sell the product if no sale price is present.
-			///
 			public ProductPrice Price { get; set; }
 
 			///
-			///Properties that describe the behavior the system uses when determining the price of products.
+			///Properties that describe the behavior the system uses when determining the price of the product.
 			///
 			public ProductPricingBehaviorInfo PricingBehavior { get; set; }
 
-			///
-			///Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.
-			///
 			public string ProductCode { get; set; }
 
-			///
-			///The name of the product that represents a line item in a taxable order or product bundle.
-			///
 			public string ProductName { get; set; }
 
-			///
-			///Brief text description of the product or component in a product bundle, typically used when the product is displayed in a list or in search results.
-			///
 			public string ProductShortDescription { get; set; }
 
-			///
-			///A product type is like a product template.
-			///
 			public string ProductType { get; set; }
 
 			///
-			///The usage type that applies to this product, which is Standard (a single product without configurable options), Configurable (a product that includes configurable option attributes), Bundle (a collection of products sold as a single entity), or Component (an invididual product that represents a component in a bundle).
+			///The usage type of this product, which is Standard (a single product without configurable options), Configurable (a product that includes configurable option attributes), Bundle (a collection of products sold as a single entity), or Component (an invididual product that represents a component in a bundle).
 			///
 			public string ProductUsage { get; set; }
 
-			///
-			///Collection of property attributes defined for the object. Properties are associated to all objects within , including documents, products, and product types.
-			///
 			public List<ProductProperty> Properties { get; set; }
 
-			///
-			///The current state of the configured product determines whether or not the product is eligible for purchase. Products with options are only purchasable if the shopper has selected all required options. If the product is not ready for purchase, a message lists missing options that are required.
-			///
 			public ProductPurchasableState PurchasableState { get; set; }
 
+			public string PurchaseLocation { get; set; }
+
 			///
-			///The universal product code (UPC) is the barcode defined for the product. The UPC is unique across all sales channels. 
+			///The universal product code defined for the product.
 			///
 			public string Upc { get; set; }
 
-			///
-			///Merchant-created code associated with a specific product variation. Variation product codes maintain an association with the base product code.
-			///
 			public string VariationProductCode { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductRuntime/ProductVolumePrice.cs b/Mozu.Api/Contracts/ProductRuntime/ProductVolumePrice.cs
old mode 100644
new mode 100755
index ef9b20b5..ec01bc3f
--- a/Mozu.Api/Contracts/ProductRuntime/ProductVolumePrice.cs
+++ b/Mozu.Api/Contracts/ProductRuntime/ProductVolumePrice.cs
@@ -13,34 +13,16 @@
 
 namespace Mozu.Api.Contracts.ProductRuntime
 {
-		///
-		///	The product price in the applicable volume band.
-		///
 		public class ProductVolumePrice
 		{
-			///
-			///Specifies whether the volume pricing is current for the product.
-			///
 			public bool IsCurrent { get; set; }
 
-			///
-			///The maximum product quantity of the volume price band. A shopper must purchase a quantity equal to or less than down to the  in order to receive the pricing in the volume band.
-			///
 			public int? MaxQty { get; set; }
 
-			///
-			///The minimum product quantity of the volume price band. A shopper must purchase a quantity equal to or greater than up to the  in order to receive the pricing in the volume band.
-			///
 			public int MinQty { get; set; }
 
-			///
-			///The product price in the applicable volume band.
-			///
 			public ProductPrice Price { get; set; }
 
-			///
-			///For products with options that vary the cost of the product, the range between lowest and highest possible price of the product based on the current selection of options.
-			///
 			public ProductPriceRange PriceRange { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductRuntime/ResolvedPriceList.cs b/Mozu.Api/Contracts/ProductRuntime/ResolvedPriceList.cs
old mode 100644
new mode 100755
index 7d93211f..2bc997b4
--- a/Mozu.Api/Contracts/ProductRuntime/ResolvedPriceList.cs
+++ b/Mozu.Api/Contracts/ProductRuntime/ResolvedPriceList.cs
@@ -13,29 +13,14 @@
 
 namespace Mozu.Api.Contracts.ProductRuntime
 {
-		///
-		///	Mozu.ProductRuntime.Contracts.ResolvedPriceList ApiType DOCUMENT_HERE 
-		///
 		public class ResolvedPriceList
 		{
-			///
-			///The localized description in text for the object, displayed per the locale code. For example, descriptions are used for product descriptions, attributes, and pre-authorization transaction types.
-			///
 			public string Description { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
-			///
-			///The code of the price list to which the customer resolves.
-			///
 			public string PriceListCode { get; set; }
 
-			///
-			///The internal id of the price list to which the customer resolves.
-			///
 			public int PriceListId { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductRuntime/SearchSuggestion.cs b/Mozu.Api/Contracts/ProductRuntime/SearchSuggestion.cs
old mode 100644
new mode 100755
index 2da9f388..4442332c
--- a/Mozu.Api/Contracts/ProductRuntime/SearchSuggestion.cs
+++ b/Mozu.Api/Contracts/ProductRuntime/SearchSuggestion.cs
@@ -18,14 +18,8 @@ namespace Mozu.Api.Contracts.ProductRuntime
 		///
 		public class SearchSuggestion
 		{
-			///
-			///A suggested entity based on the search query. Use the SuggestionType to determine the type of entity. Could be a SearchTerm, Product, or Category
-			///
 			public object Suggestion { get; set; }
 
-			///
-			///The type of Suggestion (e.g. Term, Product, Category). Will be one of the values of the SuggestionTypeConst type.
-			///
 			public string SuggestionType { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductRuntime/SearchSuggestionGroup.cs b/Mozu.Api/Contracts/ProductRuntime/SearchSuggestionGroup.cs
old mode 100644
new mode 100755
index 587b46ee..386ebe6d
--- a/Mozu.Api/Contracts/ProductRuntime/SearchSuggestionGroup.cs
+++ b/Mozu.Api/Contracts/ProductRuntime/SearchSuggestionGroup.cs
@@ -14,19 +14,10 @@
 
 namespace Mozu.Api.Contracts.ProductRuntime
 {
-		///
-		///	A group of product search terms to suggest to a customer based on defined queries.
-		///
 		public class SearchSuggestionGroup
 		{
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
-			///
-			///List of related SearchSuggestions
-			///
 			public List<SearchSuggestion> Suggestions { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductRuntime/SearchSuggestionResult.cs b/Mozu.Api/Contracts/ProductRuntime/SearchSuggestionResult.cs
old mode 100644
new mode 100755
index 8c8a1deb..744efb60
--- a/Mozu.Api/Contracts/ProductRuntime/SearchSuggestionResult.cs
+++ b/Mozu.Api/Contracts/ProductRuntime/SearchSuggestionResult.cs
@@ -14,19 +14,10 @@
 
 namespace Mozu.Api.Contracts.ProductRuntime
 {
-		///
-		///	The results of the suggested search terms made to the customer based on queries.
-		///
 		public class SearchSuggestionResult
 		{
-			///
-			///Text that the shopper types in a search query.
-			///
 			public string Query { get; set; }
 
-			///
-			///List of SearchSuggestionGroups
-			///
 			public List<SearchSuggestionGroup> SuggestionGroups { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductRuntime/SolrDebugInfo.cs b/Mozu.Api/Contracts/ProductRuntime/SolrDebugInfo.cs
old mode 100644
new mode 100755
index 42c57112..9da9754d
--- a/Mozu.Api/Contracts/ProductRuntime/SolrDebugInfo.cs
+++ b/Mozu.Api/Contracts/ProductRuntime/SolrDebugInfo.cs
@@ -14,34 +14,16 @@
 
 namespace Mozu.Api.Contracts.ProductRuntime
 {
-		///
-		///	A container of debugging information from Solr.
-		///
 		public class SolrDebugInfo
 		{
-			///
-			///A list of products that have been blocked in Solr by search tuning rules.
-			///
 			public List<string> BlockedProductCodes { get; set; }
 
-			///
-			///A list of products that have been boosted in Solr by search tuning rules.
-			///
 			public List<string> BoostedProductCodes { get; set; }
 
-			///
-			///A list of boost functions sent to Solr by search tuning rules.
-			///
 			public List<string> BoostFunctions { get; set; }
 
-			///
-			///A list of boost queries sent to Solr by search tuning rules.
-			///
 			public List<string> BoostQueries { get; set; }
 
-			///
-			///A list of search tuning rule codes sent to Solr.
-			///
 			public string SearchTuningRuleCode { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductRuntime/ValidationMessage.cs b/Mozu.Api/Contracts/ProductRuntime/ValidationMessage.cs
old mode 100644
new mode 100755
index fd776744..724ca7af
--- a/Mozu.Api/Contracts/ProductRuntime/ValidationMessage.cs
+++ b/Mozu.Api/Contracts/ProductRuntime/ValidationMessage.cs
@@ -18,29 +18,14 @@ namespace Mozu.Api.Contracts.ProductRuntime
 		///
 		public class ValidationMessage
 		{
-			///
-			///The text of the change message, such as "This product is no longer available." System-supplied and read-only.
-			///
 			public string Message { get; set; }
 
-			///
-			///The severity level of validation failures for shipping rates and products.
-			///
 			public string Severity { get; set; }
 
-			///
-			///Source for an action or container for originating content. Source is used as an origin for validation and notification messages based on successful or failed actions. For originating content, source is used for the facet source information, including the category, price, or attribute properties.
-			///
 			public string Source { get; set; }
 
-			///
-			///Unique identifier of the entity that triggered the validation.
-			///
 			public string SourceId { get; set; }
 
-			///
-			///Type of validation error that occurred. This can be checked programatically. Must be one of the values in ValidationTypeConst.
-			///
 			public string ValidationType { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductRuntime/VariationOption.cs b/Mozu.Api/Contracts/ProductRuntime/VariationOption.cs
old mode 100644
new mode 100755
index 2dfa4f2c..6ce8cb5a
--- a/Mozu.Api/Contracts/ProductRuntime/VariationOption.cs
+++ b/Mozu.Api/Contracts/ProductRuntime/VariationOption.cs
@@ -13,24 +13,12 @@
 
 namespace Mozu.Api.Contracts.ProductRuntime
 {
-		///
-		///	Mozu.ProductRuntime.Contracts.VariationOption ApiType DOCUMENT_HERE 
-		///
 		public class VariationOption
 		{
-			///
-			///The fully qualified name of the attribute. The attributeDefiniteId may be used to generate this name.
-			///
 			public string AttributeFQN { get; set; }
 
-			///
-			///The value of a property, used by numerous objects within  including facets, attributes, products, localized content, metadata, capabilities ( and third-party), location inventory adjustment, and more. The value may be a string, integer, or double. Validation may be run against the entered and saved values depending on the object type.
-			///
 			public object Value { get; set; }
 
-			///
-			///The number that denotes the order of the entity value within a list of entity values.
-			///
 			public int ValueSequence { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ProductRuntime/VariationSummary.cs b/Mozu.Api/Contracts/ProductRuntime/VariationSummary.cs
old mode 100644
new mode 100755
index 8e35d783..eb7d7fc0
--- a/Mozu.Api/Contracts/ProductRuntime/VariationSummary.cs
+++ b/Mozu.Api/Contracts/ProductRuntime/VariationSummary.cs
@@ -14,24 +14,12 @@
 
 namespace Mozu.Api.Contracts.ProductRuntime
 {
-		///
-		///	Mozu.ProductRuntime.Contracts.VariationSummary ApiType DOCUMENT_HERE 
-		///
 		public class VariationSummary
 		{
-			///
-			///Properties and data of inventory information for configured and bundled products. If product stock is managed, the data specifies out of stock behavior.
-			///
 			public ProductInventoryInfo InventoryInfo { get; set; }
 
-			///
-			///List of option attributes configured for an object. These values are associated and used by products, product bundles, and product types.
-			///
 			public List<VariationOption> Options { get; set; }
 
-			///
-			///The unique, user-defined product code of a product, used throughout  to reference and associate to a product.
-			///
 			public string ProductCode { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Reference/AddressSchema.cs b/Mozu.Api/Contracts/Reference/AddressSchema.cs
old mode 100644
new mode 100755
index f1aac4c9..8360d040
--- a/Mozu.Api/Contracts/Reference/AddressSchema.cs
+++ b/Mozu.Api/Contracts/Reference/AddressSchema.cs
@@ -19,24 +19,12 @@ namespace Mozu.Api.Contracts.Reference
 		///
 		public class AddressSchema
 		{
-			///
-			///The 2-letter geographic code representing the country for the physical or mailing address. Currently limited to the US.
-			///
 			public string CountryCode { get; set; }
 
-			///
-			///The label associated with this country.
-			///
 			public string CountryLabel { get; set; }
 
-			///
-			///The list of fields to display for a view or an associated schema. For example, the address schema would display fields for postal addresses.
-			///
 			public List<Field> Fields { get; set; }
 
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public int Id { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Reference/AddressSchemaCollection.cs b/Mozu.Api/Contracts/Reference/AddressSchemaCollection.cs
old mode 100644
new mode 100755
index 64112457..df09378e
--- a/Mozu.Api/Contracts/Reference/AddressSchemaCollection.cs
+++ b/Mozu.Api/Contracts/Reference/AddressSchemaCollection.cs
@@ -19,14 +19,8 @@ namespace Mozu.Api.Contracts.Reference
 		///
 		public class AddressSchemaCollection
 		{
-			///
-			///An array list of objects in the returned collection.
-			///
 			public List<AddressSchema> Items { get; set; }
 
-			///
-			///The number of results listed in the query collection, represented by a signed 64-bit (8-byte) integer. This value is system-supplied and read-only.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Reference/ContentLocale.cs b/Mozu.Api/Contracts/Reference/ContentLocale.cs
old mode 100644
new mode 100755
index e4acc4c5..218a32b3
--- a/Mozu.Api/Contracts/Reference/ContentLocale.cs
+++ b/Mozu.Api/Contracts/Reference/ContentLocale.cs
@@ -18,14 +18,8 @@ namespace Mozu.Api.Contracts.Reference
 		///
 		public class ContentLocale
 		{
-			///
-			///Language used for the entity. Currently, only "en-US" is supported.
-			///
 			public string Code { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Reference/ContentLocaleCollection.cs b/Mozu.Api/Contracts/Reference/ContentLocaleCollection.cs
old mode 100644
new mode 100755
index 3cf993b3..b6ff4263
--- a/Mozu.Api/Contracts/Reference/ContentLocaleCollection.cs
+++ b/Mozu.Api/Contracts/Reference/ContentLocaleCollection.cs
@@ -19,14 +19,8 @@ namespace Mozu.Api.Contracts.Reference
 		///
 		public class ContentLocaleCollection
 		{
-			///
-			///An array list of objects in the returned collection.
-			///
 			public List<ContentLocale> Items { get; set; }
 
-			///
-			///The number of results listed in the query collection, represented by a signed 64-bit (8-byte) integer. This value is system-supplied and read-only.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Reference/Country.cs b/Mozu.Api/Contracts/Reference/Country.cs
old mode 100644
new mode 100755
index a7b26d24..48973d93
--- a/Mozu.Api/Contracts/Reference/Country.cs
+++ b/Mozu.Api/Contracts/Reference/Country.cs
@@ -18,14 +18,8 @@ namespace Mozu.Api.Contracts.Reference
 		///
 		public class Country
 		{
-			///
-			///The 2-letter geographic code representing the country for the physical or mailing address. Currently limited to the US.
-			///
 			public string Code { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Reference/CountryCollection.cs b/Mozu.Api/Contracts/Reference/CountryCollection.cs
old mode 100644
new mode 100755
index cb257fa2..883a4f54
--- a/Mozu.Api/Contracts/Reference/CountryCollection.cs
+++ b/Mozu.Api/Contracts/Reference/CountryCollection.cs
@@ -19,14 +19,8 @@ namespace Mozu.Api.Contracts.Reference
 		///
 		public class CountryCollection
 		{
-			///
-			///An array list of objects in the returned collection.
-			///
 			public List<Country> Items { get; set; }
 
-			///
-			///The number of results listed in the query collection, represented by a signed 64-bit (8-byte) integer. This value is system-supplied and read-only.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Reference/CountryWithStates.cs b/Mozu.Api/Contracts/Reference/CountryWithStates.cs
old mode 100644
new mode 100755
index b64f5f7c..f8163009
--- a/Mozu.Api/Contracts/Reference/CountryWithStates.cs
+++ b/Mozu.Api/Contracts/Reference/CountryWithStates.cs
@@ -14,19 +14,10 @@
 
 namespace Mozu.Api.Contracts.Reference
 {
-		///
-		///	A country and its states. Contrains the 2-letter geographic code representing the country and any states within the country.
-		///
 		public class CountryWithStates
 		{
-			///
-			///The two character country code.
-			///
 			public string Code { get; set; }
 
-			///
-			///The state code, name, and tags, if applicable. 
-			///
 			public List<State> States { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Reference/CountryWithStatesCollection.cs b/Mozu.Api/Contracts/Reference/CountryWithStatesCollection.cs
old mode 100644
new mode 100755
index b5262319..2d99215a
--- a/Mozu.Api/Contracts/Reference/CountryWithStatesCollection.cs
+++ b/Mozu.Api/Contracts/Reference/CountryWithStatesCollection.cs
@@ -14,19 +14,10 @@
 
 namespace Mozu.Api.Contracts.Reference
 {
-		///
-		///	The paged collection of country codes and their corresponding names. 
-		///
 		public class CountryWithStatesCollection
 		{
-			///
-			///A list of requested items. All returned data is provided in an items array.For a failed request, the returned response may be success with an empty item array.
-			///
 			public List<CountryWithStates> Items { get; set; }
 
-			///
-			///The total number of items in the list.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Reference/Currency.cs b/Mozu.Api/Contracts/Reference/Currency.cs
old mode 100644
new mode 100755
index 7116c7e7..623bb6f7
--- a/Mozu.Api/Contracts/Reference/Currency.cs
+++ b/Mozu.Api/Contracts/Reference/Currency.cs
@@ -18,14 +18,8 @@ namespace Mozu.Api.Contracts.Reference
 		///
 		public class Currency
 		{
-			///
-			///3-letter ISO 4217 standard global currency code. Currently, only "USD" (US Dollar) is supported.
-			///
 			public string Code { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Reference/CurrencyCollection.cs b/Mozu.Api/Contracts/Reference/CurrencyCollection.cs
old mode 100644
new mode 100755
index 7fc4e786..12eead1a
--- a/Mozu.Api/Contracts/Reference/CurrencyCollection.cs
+++ b/Mozu.Api/Contracts/Reference/CurrencyCollection.cs
@@ -19,14 +19,8 @@ namespace Mozu.Api.Contracts.Reference
 		///
 		public class CurrencyCollection
 		{
-			///
-			///An array list of objects in the returned collection.
-			///
 			public List<Currency> Items { get; set; }
 
-			///
-			///The number of results listed in the query collection, represented by a signed 64-bit (8-byte) integer. This value is system-supplied and read-only.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Reference/Field.cs b/Mozu.Api/Contracts/Reference/Field.cs
old mode 100644
new mode 100755
index 2e3484a8..02c55c84
--- a/Mozu.Api/Contracts/Reference/Field.cs
+++ b/Mozu.Api/Contracts/Reference/Field.cs
@@ -19,29 +19,14 @@ namespace Mozu.Api.Contracts.Reference
 		///
 		public class Field
 		{
-			///
-			///Data for the field property.
-			///
 			public List<FieldData> Data { get; set; }
 
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public int Id { get; set; }
 
-			///
-			///Descriptive text used as a label for objects, such as field names, facets, date ranges, contact information, and package information.
-			///
 			public string Label { get; set; }
 
-			///
-			///Integer that represents the sequence order of the attribute.
-			///
 			public int Order { get; set; }
 
-			///
-			///Type of field.
-			///
 			public string Type { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Reference/FieldData.cs b/Mozu.Api/Contracts/Reference/FieldData.cs
old mode 100644
new mode 100755
index 2aaff084..f51277eb
--- a/Mozu.Api/Contracts/Reference/FieldData.cs
+++ b/Mozu.Api/Contracts/Reference/FieldData.cs
@@ -18,14 +18,8 @@ namespace Mozu.Api.Contracts.Reference
 		///
 		public class FieldData
 		{
-			///
-			///Code of the field.
-			///
 			public string Code { get; set; }
 
-			///
-			///The value of a property, used by numerous objects within  including facets, attributes, products, localized content, metadata, capabilities ( and third-party), location inventory adjustment, and more. The value may be a string, integer, or double. Validation may be run against the entered and saved values depending on the object type.
-			///
 			public string Value { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Reference/State.cs b/Mozu.Api/Contracts/Reference/State.cs
old mode 100644
new mode 100755
index 342fd47c..9eee1a14
--- a/Mozu.Api/Contracts/Reference/State.cs
+++ b/Mozu.Api/Contracts/Reference/State.cs
@@ -13,24 +13,12 @@
 
 namespace Mozu.Api.Contracts.Reference
 {
-		///
-		///	The state code, name, and tags, if applicable. 
-		///
 		public class State
 		{
-			///
-			///The two character state code. 
-			///
 			public string Code { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
-			///
-			///Distinguishing information about a state, such as IsArmedForces or IsUSTerritory
-			///
 			public string Tags { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Reference/TimeZone.cs b/Mozu.Api/Contracts/Reference/TimeZone.cs
old mode 100644
new mode 100755
index 10a82472..21ee83f9
--- a/Mozu.Api/Contracts/Reference/TimeZone.cs
+++ b/Mozu.Api/Contracts/Reference/TimeZone.cs
@@ -18,19 +18,10 @@ namespace Mozu.Api.Contracts.Reference
 		///
 		public class TimeZone
 		{
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public string Id { get; set; }
 
-			///
-			///If true, the time zone standard observes daylight savings time advancements, for example, twice a year so that evenings have more daylight and mornings have less. If false, the time zone standard does not adhere to daylight savings changes.
-			///
 			public bool IsDaylightSavingsTime { get; set; }
 
-			///
-			///The offset associated with the time zone, such as "-12".
-			///
 			public double Offset { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Reference/TimeZoneCollection.cs b/Mozu.Api/Contracts/Reference/TimeZoneCollection.cs
old mode 100644
new mode 100755
index 7d2cd912..b1fdb6de
--- a/Mozu.Api/Contracts/Reference/TimeZoneCollection.cs
+++ b/Mozu.Api/Contracts/Reference/TimeZoneCollection.cs
@@ -19,14 +19,8 @@ namespace Mozu.Api.Contracts.Reference
 		///
 		public class TimeZoneCollection
 		{
-			///
-			///An array list of objects in the returned collection.
-			///
 			public List<TimeZone> Items { get; set; }
 
-			///
-			///The number of results listed in the query collection, represented by a signed 64-bit (8-byte) integer. This value is system-supplied and read-only.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Reference/TopLevelDomainCollection.cs b/Mozu.Api/Contracts/Reference/TopLevelDomainCollection.cs
old mode 100644
new mode 100755
index 3cf01b69..4c2aff0d
--- a/Mozu.Api/Contracts/Reference/TopLevelDomainCollection.cs
+++ b/Mozu.Api/Contracts/Reference/TopLevelDomainCollection.cs
@@ -19,14 +19,8 @@ namespace Mozu.Api.Contracts.Reference
 		///
 		public class TopLevelDomainCollection
 		{
-			///
-			///An array list of objects in the returned collection.
-			///
 			public List<string> Items { get; set; }
 
-			///
-			///The number of results listed in the query collection, represented by a signed 64-bit (8-byte) integer. This value is system-supplied and read-only.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Reference/UnitOfMeasure.cs b/Mozu.Api/Contracts/Reference/UnitOfMeasure.cs
old mode 100644
new mode 100755
index 4d36a685..cb4cc06d
--- a/Mozu.Api/Contracts/Reference/UnitOfMeasure.cs
+++ b/Mozu.Api/Contracts/Reference/UnitOfMeasure.cs
@@ -18,24 +18,12 @@ namespace Mozu.Api.Contracts.Reference
 		///
 		public class UnitOfMeasure
 		{
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
-			///
-			///The plural name of the unit of measure, such as "feet".
-			///
 			public string PluralName { get; set; }
 
-			///
-			///The abbreviated symbol for the unit of measure, such as "ft".
-			///
 			public string Symbol { get; set; }
 
-			///
-			///The type of measurement, such as length or volume.
-			///
 			public string UnitOfMeasureType { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Reference/UnitOfMeasureCollection.cs b/Mozu.Api/Contracts/Reference/UnitOfMeasureCollection.cs
old mode 100644
new mode 100755
index 38449be9..e8e1da70
--- a/Mozu.Api/Contracts/Reference/UnitOfMeasureCollection.cs
+++ b/Mozu.Api/Contracts/Reference/UnitOfMeasureCollection.cs
@@ -19,14 +19,8 @@ namespace Mozu.Api.Contracts.Reference
 		///
 		public class UnitOfMeasureCollection
 		{
-			///
-			///An array list of objects in the returned collection.
-			///
 			public List<UnitOfMeasure> Items { get; set; }
 
-			///
-			///The number of results listed in the query collection, represented by a signed 64-bit (8-byte) integer. This value is system-supplied and read-only.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ShippingAdmin/CarrierConfiguration.cs b/Mozu.Api/Contracts/ShippingAdmin/CarrierConfiguration.cs
old mode 100644
new mode 100755
index 69538aa1..9cf2c9c7
--- a/Mozu.Api/Contracts/ShippingAdmin/CarrierConfiguration.cs
+++ b/Mozu.Api/Contracts/ShippingAdmin/CarrierConfiguration.cs
@@ -20,39 +20,18 @@ namespace Mozu.Api.Contracts.ShippingAdmin
 		///
 		public class CarrierConfiguration
 		{
-			///
-			///Specifies whether credentials for the carrier are set.
-			///
 			public bool AreCredentialsSet { get; set; }
 
-			///
-			///Identifier and datetime stamp information recorded when a user or application creates, updates, or deletes a resource entity. This value is system-supplied and read-only.
-			///
 			public AuditInfo AuditInfo { get; set; }
 
-			///
-			///A list of any custom table rates for the carrier.
-			///
 			public List<CustomTableRate> CustomTableRates { get; set; }
 
-			///
-			///Indicates if a capability, function tied to an Arc.js action, application, or price list is enabled for the tenant/site. If true, the capability/application/function/price list is enabled for the tenant. System-supplied and read-only with the exception of functions tied to an Arc.js action and price lists.
-			///
 			public bool Enabled { get; set; }
 
-			///
-			///Specifies whether the carrier is enabled for creating RMA labels.
-			///
 			public bool EnabledForReturns { get; set; }
 
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public string Id { get; set; }
 
-			///
-			///Wrapper for a group of properties such as a label that includes a value and a locale code, audit information, and a key-value pair.
-			///
 			public List<Setting> Settings { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ShippingAdmin/CarrierConfigurationCollection.cs b/Mozu.Api/Contracts/ShippingAdmin/CarrierConfigurationCollection.cs
old mode 100644
new mode 100755
index d8307c9d..f65e66b0
--- a/Mozu.Api/Contracts/ShippingAdmin/CarrierConfigurationCollection.cs
+++ b/Mozu.Api/Contracts/ShippingAdmin/CarrierConfigurationCollection.cs
@@ -19,26 +19,14 @@ namespace Mozu.Api.Contracts.ShippingAdmin
 		///
 		public class CarrierConfigurationCollection
 		{
-			///
-			///An array list of objects in the returned collection.
-			///
 			public List<CarrierConfiguration> Items { get; set; }
 
-			///
-			///The number of pages returned based on the startIndex and pageSize values specified. This value is system-supplied and read-only.
-			///
 			public int PageCount { get; set; }
 
-			///
-			///The number of results to display on each page when creating paged results from a query. The maximum value is 200.
-			///
 			public int PageSize { get; set; }
 
 			public int StartIndex { get; set; }
 
-			///
-			///The number of results listed in the query collection, represented by a signed 64-bit (8-byte) integer. This value is system-supplied and read-only.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ShippingAdmin/CustomTableRate.cs b/Mozu.Api/Contracts/ShippingAdmin/CustomTableRate.cs
old mode 100644
new mode 100755
index 596d7cc4..f96ec76a
--- a/Mozu.Api/Contracts/ShippingAdmin/CustomTableRate.cs
+++ b/Mozu.Api/Contracts/ShippingAdmin/CustomTableRate.cs
@@ -13,29 +13,14 @@
 
 namespace Mozu.Api.Contracts.ShippingAdmin
 {
-		///
-		///	Mozu.ShippingAdmin.Contracts.CustomTableRate ApiType DOCUMENT_HERE 
-		///
 		public class CustomTableRate
 		{
-			///
-			///Localizable content (such as a name and/or description) for an attribute. The content may be localized when displayed according to the locale code specified by the master catalog. Content can include descriptive text for product extensible attributes, catalog-level descriptions (displayed if isContentOverriden is true), product bundles, and customer account notes.
-			///
 			public CustomTableRateContent Content { get; set; }
 
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public string Id { get; set; }
 
-			///
-			///The type of the custom rate.
-			///
 			public string RateType { get; set; }
 
-			///
-			///The value of a property, used by numerous objects within  including facets, attributes, products, localized content, metadata, capabilities ( and third-party), location inventory adjustment, and more. The value may be a string, integer, or double. Validation may be run against the entered and saved values depending on the object type.
-			///
 			public decimal Value { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ShippingAdmin/CustomTableRateContent.cs b/Mozu.Api/Contracts/ShippingAdmin/CustomTableRateContent.cs
old mode 100644
new mode 100755
index 42a15fca..46bd9684
--- a/Mozu.Api/Contracts/ShippingAdmin/CustomTableRateContent.cs
+++ b/Mozu.Api/Contracts/ShippingAdmin/CustomTableRateContent.cs
@@ -13,19 +13,10 @@
 
 namespace Mozu.Api.Contracts.ShippingAdmin
 {
-		///
-		///	Mozu.ShippingAdmin.Contracts.CustomTableRateContent ApiType DOCUMENT_HERE 
-		///
 		public class CustomTableRateContent
 		{
-			///
-			///The two character locale code, per the country code provided. This code determines the localized content to use and display.
-			///
 			public string LocaleCode { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ShippingAdmin/LocalizableString.cs b/Mozu.Api/Contracts/ShippingAdmin/LocalizableString.cs
old mode 100644
new mode 100755
index f46d6519..4dd07598
--- a/Mozu.Api/Contracts/ShippingAdmin/LocalizableString.cs
+++ b/Mozu.Api/Contracts/ShippingAdmin/LocalizableString.cs
@@ -18,14 +18,8 @@ namespace Mozu.Api.Contracts.ShippingAdmin
 		///
 		public class LocalizableString
 		{
-			///
-			///Language used for the entity. Currently, only "en-US" is supported.
-			///
 			public string LocaleCode { get; set; }
 
-			///
-			///The value of a property, used by numerous objects within  including facets, attributes, products, localized content, metadata, capabilities ( and third-party), location inventory adjustment, and more. The value may be a string, integer, or double. Validation may be run against the entered and saved values depending on the object type.
-			///
 			public string Value { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ShippingAdmin/Profile/HandlingFeeRule.cs b/Mozu.Api/Contracts/ShippingAdmin/Profile/HandlingFeeRule.cs
old mode 100644
new mode 100755
index 8fe696aa..b59b202d
--- a/Mozu.Api/Contracts/ShippingAdmin/Profile/HandlingFeeRule.cs
+++ b/Mozu.Api/Contracts/ShippingAdmin/Profile/HandlingFeeRule.cs
@@ -16,54 +16,24 @@
 
 namespace Mozu.Api.Contracts.ShippingAdmin.Profile
 {
-		///
-		///	Mozu.ShippingAdmin.Contracts.Profile.HandlingFeeRule ApiType DOCUMENT_HERE 
-		///
 		public class HandlingFeeRule
 		{
-			///
-			///Specifies to what the handling fee rule applies.
-			///
 			public string AppliesTo { get; set; }
 
-			///
-			///Basic audit info about the object, including date, time, and user account. This data may be captured when creating, updating, and removing data.
-			///
 			public AuditInfo AuditInfo { get; set; }
 
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public string Id { get; set; }
 
-			///
-			///The unique codes of any product rules associated with the handling fee.
-			///
 			public List<string> ProductTargetRuleCodes { get; set; }
 
-			///
-			///The numeric order of objects, used by a vocabulary value defined for an extensible attribute, images, and categories.
-			///
 			public int Sequence { get; set; }
 
-			///
-			///An array of service type details that are associated with the handling fee.
-			///
 			public List<ServiceType> ServiceTypes { get; set; }
 
-			///
-			///The unique codes of any shipping target rules associated with the handling fee.
-			///
 			public List<string> ShippingTargetRuleCodes { get; set; }
 
-			///
-			///The value of a property, used by numerous objects within  including facets, attributes, products, localized content, metadata, capabilities ( and third-party), location inventory adjustment, and more. The value may be a string, integer, or double. Validation may be run against the entered and saved values depending on the object type.
-			///
 			public decimal Value { get; set; }
 
-			///
-			///An attribute value type is either predefined vocabulary by the admin during attribute set up or user-defined with an appropriate type (AdminEntered or ShopperEntered depending on the user). These types are used by products and attributes. The difference between predefined values versus manually entered values is such that the first choice is a set of options to choose from. AdminEntered and ShopperEntered are values that are entered rather than system-supplied and are not stored in the database, but captured during a live commerce operations such as during an order.
-			///
 			public string ValueType { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ShippingAdmin/Profile/HandlingFeeRuleCollection.cs b/Mozu.Api/Contracts/ShippingAdmin/Profile/HandlingFeeRuleCollection.cs
old mode 100644
new mode 100755
index b35bc322..6af1b080
--- a/Mozu.Api/Contracts/ShippingAdmin/Profile/HandlingFeeRuleCollection.cs
+++ b/Mozu.Api/Contracts/ShippingAdmin/Profile/HandlingFeeRuleCollection.cs
@@ -14,19 +14,10 @@
 
 namespace Mozu.Api.Contracts.ShippingAdmin.Profile
 {
-		///
-		///	Mozu.ShippingAdmin.Contracts.Profile.HandlingFeeRuleCollection ApiType DOCUMENT_HERE 
-		///
 		public class HandlingFeeRuleCollection
 		{
-			///
-			///A list of requested items. All returned data is provided in an items array.For a failed request, the returned response may be success with an empty item array.
-			///
 			public List<HandlingFeeRule> Items { get; set; }
 
-			///
-			///The total number of items in the list.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ShippingAdmin/Profile/ShippingInclusionRule.cs b/Mozu.Api/Contracts/ShippingAdmin/Profile/ShippingInclusionRule.cs
old mode 100644
new mode 100755
index 8f28176f..e873b223
--- a/Mozu.Api/Contracts/ShippingAdmin/Profile/ShippingInclusionRule.cs
+++ b/Mozu.Api/Contracts/ShippingAdmin/Profile/ShippingInclusionRule.cs
@@ -16,39 +16,18 @@
 
 namespace Mozu.Api.Contracts.ShippingAdmin.Profile
 {
-		///
-		///	Mozu.ShippingAdmin.Contracts.Profile.ShippingInclusionRule ApiType DOCUMENT_HERE 
-		///
 		public class ShippingInclusionRule
 		{
-			///
-			///Basic audit info about the object, including date, time, and user account. This data may be captured when creating, updating, and removing data.
-			///
 			public AuditInfo AuditInfo { get; set; }
 
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public string Id { get; set; }
 
-			///
-			///The unique codes of any product target rules associated with the shipping inclusion rule.
-			///
 			public List<string> ProductTargetRuleCodes { get; set; }
 
-			///
-			///The numeric order of objects, used by a vocabulary value defined for an extensible attribute, images, and categories.
-			///
 			public int Sequence { get; set; }
 
-			///
-			///An array of service type details that are associated with the shipping inclusion rule.
-			///
 			public List<ServiceType> ServiceTypes { get; set; }
 
-			///
-			///The unique codes of any shipping target rules associated with the shipping inclusion rule.
-			///
 			public List<string> ShippingTargetRuleCodes { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ShippingAdmin/Profile/ShippingInclusionRuleCollection.cs b/Mozu.Api/Contracts/ShippingAdmin/Profile/ShippingInclusionRuleCollection.cs
old mode 100644
new mode 100755
index cbbaa53e..0f2c1971
--- a/Mozu.Api/Contracts/ShippingAdmin/Profile/ShippingInclusionRuleCollection.cs
+++ b/Mozu.Api/Contracts/ShippingAdmin/Profile/ShippingInclusionRuleCollection.cs
@@ -14,19 +14,10 @@
 
 namespace Mozu.Api.Contracts.ShippingAdmin.Profile
 {
-		///
-		///	Mozu.ShippingAdmin.Contracts.Profile.ShippingInclusionRuleCollection ApiType DOCUMENT_HERE 
-		///
 		public class ShippingInclusionRuleCollection
 		{
-			///
-			///A list of requested items. All returned data is provided in an items array.For a failed request, the returned response may be success with an empty item array.
-			///
 			public List<ShippingInclusionRule> Items { get; set; }
 
-			///
-			///The total number of items in the list.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ShippingAdmin/Profile/ShippingProfile.cs b/Mozu.Api/Contracts/ShippingAdmin/Profile/ShippingProfile.cs
old mode 100644
new mode 100755
index 9c20acca..ff311661
--- a/Mozu.Api/Contracts/ShippingAdmin/Profile/ShippingProfile.cs
+++ b/Mozu.Api/Contracts/ShippingAdmin/Profile/ShippingProfile.cs
@@ -15,39 +15,18 @@
 
 namespace Mozu.Api.Contracts.ShippingAdmin.Profile
 {
-		///
-		///	Mozu.ShippingAdmin.Contracts.Profile.ShippingProfile ApiType DOCUMENT_HERE 
-		///
 		public class ShippingProfile
 		{
-			///
-			///Basic audit info about the object, including date, time, and user account. This data may be captured when creating, updating, and removing data.
-			///
 			public AuditInfo AuditInfo { get; set; }
 
-			///
-			///The unique code of the shipping profile.
-			///
 			public string Code { get; set; }
 
-			///
-			///A list of order handling fee rules and their details.
-			///
 			public List<HandlingFeeRule> OrderHandlingFeeRules { get; set; }
 
-			///
-			///A list of product handling fee rules and their details.
-			///
 			public List<HandlingFeeRule> ProductHandlingFeeRules { get; set; }
 
-			///
-			///A list of shipping inclusion rules and their details.
-			///
 			public List<ShippingInclusionRule> ShippingInclusionRules { get; set; }
 
-			///
-			///A list of unique site identifiers that the shipping profile targets.
-			///
 			public List<int> TargetedSiteIds { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ShippingAdmin/Profile/ShippingProfileCollection.cs b/Mozu.Api/Contracts/ShippingAdmin/Profile/ShippingProfileCollection.cs
old mode 100644
new mode 100755
index 8b0409bb..05a97f07
--- a/Mozu.Api/Contracts/ShippingAdmin/Profile/ShippingProfileCollection.cs
+++ b/Mozu.Api/Contracts/ShippingAdmin/Profile/ShippingProfileCollection.cs
@@ -14,19 +14,10 @@
 
 namespace Mozu.Api.Contracts.ShippingAdmin.Profile
 {
-		///
-		///	Mozu.ShippingAdmin.Contracts.Profile.ShippingProfileCollection ApiType DOCUMENT_HERE 
-		///
 		public class ShippingProfileCollection
 		{
-			///
-			///A list of requested items. All returned data is provided in an items array.For a failed request, the returned response may be success with an empty item array.
-			///
 			public List<ShippingProfile> Items { get; set; }
 
-			///
-			///The total number of items in the list.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ShippingAdmin/Profile/ShippingStates.cs b/Mozu.Api/Contracts/ShippingAdmin/Profile/ShippingStates.cs
old mode 100644
new mode 100755
index e5279520..c95635c1
--- a/Mozu.Api/Contracts/ShippingAdmin/Profile/ShippingStates.cs
+++ b/Mozu.Api/Contracts/ShippingAdmin/Profile/ShippingStates.cs
@@ -14,19 +14,10 @@
 
 namespace Mozu.Api.Contracts.ShippingAdmin.Profile
 {
-		///
-		///	Mozu.ShippingAdmin.Contracts.Profile.ShippingStates ApiType DOCUMENT_HERE 
-		///
 		public class ShippingStates
 		{
-			///
-			///The 2-letter geographic code representing the country for the physical or mailing address. Currently limited to the US.
-			///
 			public string CountryCode { get; set; }
 
-			///
-			///The states of the shipping profile.
-			///
 			public List<State> States { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ShippingAdmin/Profile/State.cs b/Mozu.Api/Contracts/ShippingAdmin/Profile/State.cs
old mode 100644
new mode 100755
index 1cadc85c..73c7b38d
--- a/Mozu.Api/Contracts/ShippingAdmin/Profile/State.cs
+++ b/Mozu.Api/Contracts/ShippingAdmin/Profile/State.cs
@@ -13,19 +13,10 @@
 
 namespace Mozu.Api.Contracts.ShippingAdmin.Profile
 {
-		///
-		///	Mozu.ShippingAdmin.Contracts.Profile.State ApiType DOCUMENT_HERE 
-		///
 		public class State
 		{
-			///
-			///code ApiType DOCUMENT_HERE 
-			///
 			public string Code { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ShippingAdmin/ServiceType.cs b/Mozu.Api/Contracts/ShippingAdmin/ServiceType.cs
old mode 100644
new mode 100755
index 8cebf37e..89f22fa1
--- a/Mozu.Api/Contracts/ShippingAdmin/ServiceType.cs
+++ b/Mozu.Api/Contracts/ShippingAdmin/ServiceType.cs
@@ -18,14 +18,8 @@ namespace Mozu.Api.Contracts.ShippingAdmin
 		///
 		public class ServiceType
 		{
-			///
-			///The service type code supplied by the carrier. Service type codes include a prefix that indicates the carrier name. For example: FEDEX_INTERNATIONAL_STANDARD.
-			///
 			public string Code { get; set; }
 
-			///
-			///Complex type that contains content for a language specified by LocaleCode.
-			///
 			public ServiceTypeLocalizedContent Content { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ShippingAdmin/ServiceTypeLocalizedContent.cs b/Mozu.Api/Contracts/ShippingAdmin/ServiceTypeLocalizedContent.cs
old mode 100644
new mode 100755
index 47eaffc0..ee631526
--- a/Mozu.Api/Contracts/ShippingAdmin/ServiceTypeLocalizedContent.cs
+++ b/Mozu.Api/Contracts/ShippingAdmin/ServiceTypeLocalizedContent.cs
@@ -18,14 +18,8 @@ namespace Mozu.Api.Contracts.ShippingAdmin
 		///
 		public class ServiceTypeLocalizedContent
 		{
-			///
-			///Language used for the entity. Currently, only "en-US" is supported.
-			///
 			public string LocaleCode { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ShippingAdmin/Setting.cs b/Mozu.Api/Contracts/ShippingAdmin/Setting.cs
old mode 100644
new mode 100755
index 0f6c3356..a3f1d021
--- a/Mozu.Api/Contracts/ShippingAdmin/Setting.cs
+++ b/Mozu.Api/Contracts/ShippingAdmin/Setting.cs
@@ -19,24 +19,12 @@ namespace Mozu.Api.Contracts.ShippingAdmin
 		///
 		public class Setting
 		{
-			///
-			///Identifier and datetime stamp information recorded when a user or application creates, updates, or deletes a resource entity. This value is system-supplied and read-only.
-			///
 			public AuditInfo AuditInfo { get; set; }
 
-			///
-			///Key used for metadata defined for objects, including extensible attributes, custom attributes associated with a shipping provider, and search synonyms definitions. This content may be user-defined depending on the object and usage.For search synonym definitions, refer to [Synonym Expansion Types](https://www.mozu.com/docs/Developer/api-guides/search-settings.htm#synonym_expansion_types) for more information about the key usage.
-			///
 			public string Key { get; set; }
 
-			///
-			///Descriptive text used as a label for objects, such as field names, facets, date ranges, contact information, and package information.
-			///
 			public LocalizableString Label { get; set; }
 
-			///
-			///The value of a property, used by numerous objects within  including facets, attributes, products, localized content, metadata, capabilities ( and third-party), location inventory adjustment, and more. The value may be a string, integer, or double. Validation may be run against the entered and saved values depending on the object type.
-			///
 			public string Value { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ShippingAdmin/TargetRule.cs b/Mozu.Api/Contracts/ShippingAdmin/TargetRule.cs
old mode 100644
new mode 100755
index 42fb12fd..4283f534
--- a/Mozu.Api/Contracts/ShippingAdmin/TargetRule.cs
+++ b/Mozu.Api/Contracts/ShippingAdmin/TargetRule.cs
@@ -13,29 +13,14 @@
 
 namespace Mozu.Api.Contracts.ShippingAdmin
 {
-		///
-		///	Mozu.ShippingAdmin.Contracts.TargetRule ApiType DOCUMENT_HERE 
-		///
 		public class TargetRule
 		{
-			///
-			///code ApiType DOCUMENT_HERE 
-			///
 			public string Code { get; set; }
 
-			///
-			///The localized description in text for the object, displayed per the locale code. For example, descriptions are used for product descriptions, attributes, and pre-authorization transaction types.
-			///
 			public string Description { get; set; }
 
-			///
-			///Properties of the domain that the tenant is associated with such as the domain name, the zone string, audit information (system-supplied and read-only), assignment data, and whether or not the domain is primary or requires a SSL for authentication.
-			///
 			public string Domain { get; set; }
 
-			///
-			///expression ApiType DOCUMENT_HERE 
-			///
 			public string Expression { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ShippingAdmin/TargetRuleCollection.cs b/Mozu.Api/Contracts/ShippingAdmin/TargetRuleCollection.cs
old mode 100644
new mode 100755
index 1aa13dc6..e5cd051e
--- a/Mozu.Api/Contracts/ShippingAdmin/TargetRuleCollection.cs
+++ b/Mozu.Api/Contracts/ShippingAdmin/TargetRuleCollection.cs
@@ -14,19 +14,10 @@
 
 namespace Mozu.Api.Contracts.ShippingAdmin
 {
-		///
-		///	Mozu.ShippingAdmin.Contracts.TargetRuleCollection ApiType DOCUMENT_HERE 
-		///
 		public class TargetRuleCollection
 		{
-			///
-			///A list of requested items. All returned data is provided in an items array.For a failed request, the returned response may be success with an empty item array.
-			///
 			public List<TargetRule> Items { get; set; }
 
-			///
-			///The total number of items in the list.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ShippingRuntime/CarrierRatesResponse.cs b/Mozu.Api/Contracts/ShippingRuntime/CarrierRatesResponse.cs
old mode 100644
new mode 100755
index 0e0a0e89..9c4f82f5
--- a/Mozu.Api/Contracts/ShippingRuntime/CarrierRatesResponse.cs
+++ b/Mozu.Api/Contracts/ShippingRuntime/CarrierRatesResponse.cs
@@ -19,19 +19,10 @@ namespace Mozu.Api.Contracts.ShippingRuntime
 		///
 		public class CarrierRatesResponse
 		{
-			///
-			///Unique identifier of the shipping carrier.
-			///
 			public string CarrierId { get; set; }
 
-			///
-			///Collection of carrier-specific key-value attribute pairs associated with a shipping carrier. These are required to retrieve a shipping rate request and are returned for the generated shipping label.
-			///
 			public List<CustomAttribute> CustomAttributes { get; set; }
 
-			///
-			///Array list of calculated shipping rates for the specified carrier.
-			///
 			public List<ShippingRate> ShippingRates { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ShippingRuntime/Category.cs b/Mozu.Api/Contracts/ShippingRuntime/Category.cs
old mode 100644
new mode 100755
index b4ef6361..5fbdb3eb
--- a/Mozu.Api/Contracts/ShippingRuntime/Category.cs
+++ b/Mozu.Api/Contracts/ShippingRuntime/Category.cs
@@ -13,19 +13,10 @@
 
 namespace Mozu.Api.Contracts.ShippingRuntime
 {
-		///
-		///	A descriptive container that groups products. A category is merchant defined with associated products and discounts as configured. GThe storefront displays products in a hierarchy of categories. As such, categories can include a nesting of sub-categories to organize products and product options per set guidelines such as color, brand, material, and size.
-		///
 		public class Category
 		{
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public int Id { get; set; }
 
-			///
-			///If applicable, the parent category in the category tree. This can be associated to a product as the parent category.
-			///
 			public Category Parent { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ShippingRuntime/CustomAttribute.cs b/Mozu.Api/Contracts/ShippingRuntime/CustomAttribute.cs
old mode 100644
new mode 100755
index a947a115..2641112d
--- a/Mozu.Api/Contracts/ShippingRuntime/CustomAttribute.cs
+++ b/Mozu.Api/Contracts/ShippingRuntime/CustomAttribute.cs
@@ -19,19 +19,10 @@ namespace Mozu.Api.Contracts.ShippingRuntime
 		///
 		public class CustomAttribute
 		{
-			///
-			///Collection of child attributes associated with a shipping provider integration.
-			///
 			public List<CustomAttribute> ChildAttributes { get; set; }
 
-			///
-			///Key used for metadata defined for objects, including extensible attributes, custom attributes associated with a shipping provider, and search synonyms definitions. This content may be user-defined depending on the object and usage.For search synonym definitions, refer to [Synonym Expansion Types](https://www.mozu.com/docs/Developer/api-guides/search-settings.htm#synonym_expansion_types) for more information about the key usage.
-			///
 			public string Key { get; set; }
 
-			///
-			///The value of a property, used by numerous objects within  including facets, attributes, products, localized content, metadata, capabilities ( and third-party), location inventory adjustment, and more. The value may be a string, integer, or double. Validation may be run against the entered and saved values depending on the object type.
-			///
 			public string Value { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ShippingRuntime/ItemMeasurements.cs b/Mozu.Api/Contracts/ShippingRuntime/ItemMeasurements.cs
old mode 100644
new mode 100755
index e6d8217f..78158f20
--- a/Mozu.Api/Contracts/ShippingRuntime/ItemMeasurements.cs
+++ b/Mozu.Api/Contracts/ShippingRuntime/ItemMeasurements.cs
@@ -19,29 +19,14 @@ namespace Mozu.Api.Contracts.ShippingRuntime
 		///
 		public class ItemMeasurements
 		{
-			///
-			///Girth of the package in imperial units of feet and inches.
-			///
 			public decimal? Girth { get; set; }
 
-			///
-			///Height of the package in imperial units of feet and inches.
-			///
 			public Measurement Height { get; set; }
 
-			///
-			///Length of the package in imperial units of feet and inches.
-			///
 			public Measurement Length { get; set; }
 
-			///
-			///Weight of the package in imperial units of pounds and ounces.
-			///
 			public Measurement Weight { get; set; }
 
-			///
-			///Width of the package in imperial units of feet and inches.
-			///
 			public Measurement Width { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ShippingRuntime/ProductOption.cs b/Mozu.Api/Contracts/ShippingRuntime/ProductOption.cs
old mode 100644
new mode 100755
index ff78b505..f05dce85
--- a/Mozu.Api/Contracts/ShippingRuntime/ProductOption.cs
+++ b/Mozu.Api/Contracts/ShippingRuntime/ProductOption.cs
@@ -13,24 +13,12 @@
 
 namespace Mozu.Api.Contracts.ShippingRuntime
 {
-		///
-		///	Properties of the product option to create such as attribute detail, fully qualified name, and list of product option values.
-		///
 		public class ProductOption
 		{
-			///
-			///The fully qualified name of the attribute. The attributeDefiniteId may be used to generate this name.
-			///
 			public string AttributeFQN { get; set; }
 
-			///
-			///The data type of the source product property, typically of type Bool, DateTime, Number, or String.
-			///
 			public string DataType { get; set; }
 
-			///
-			///The value of a property, used by numerous objects within  including facets, attributes, products, localized content, metadata, capabilities ( and third-party), location inventory adjustment, and more. The value may be a string, integer, or double. Validation may be run against the entered and saved values depending on the object type.
-			///
 			public object Value { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ShippingRuntime/ProductProperty.cs b/Mozu.Api/Contracts/ShippingRuntime/ProductProperty.cs
old mode 100644
new mode 100755
index 74c8d61d..5d8eca37
--- a/Mozu.Api/Contracts/ShippingRuntime/ProductProperty.cs
+++ b/Mozu.Api/Contracts/ShippingRuntime/ProductProperty.cs
@@ -14,24 +14,12 @@
 
 namespace Mozu.Api.Contracts.ShippingRuntime
 {
-		///
-		///	Details of a property defined for a product.
-		///
 		public class ProductProperty
 		{
-			///
-			///The fully qualified name of the attribute. The attributeDefiniteId may be used to generate this name.
-			///
 			public string AttributeFQN { get; set; }
 
-			///
-			///The data type of the source product property, typically of type Bool, DateTime, Number, or String.
-			///
 			public string DataType { get; set; }
 
-			///
-			///List of value data for objects.
-			///
 			public List<object> Values { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ShippingRuntime/ProductSummary.cs b/Mozu.Api/Contracts/ShippingRuntime/ProductSummary.cs
old mode 100644
new mode 100755
index 138ef0c4..c9676d95
--- a/Mozu.Api/Contracts/ShippingRuntime/ProductSummary.cs
+++ b/Mozu.Api/Contracts/ShippingRuntime/ProductSummary.cs
@@ -14,54 +14,24 @@
 
 namespace Mozu.Api.Contracts.ShippingRuntime
 {
-		///
-		///	Properties of summary data for a product, including all data for name, code, categories, options, types, measurements, and more.
-		///
 		public class ProductSummary
 		{
-			///
-			///The list of all categories associated with the product. These categories contain products, can have discounts associated, and define the grouping of products to display on the storefront.
-			///
 			public List<Category> Categories { get; set; }
 
-			///
-			///List of option attributes configured for an object. These values are associated and used by products, product bundles, and product types.
-			///
 			public List<ProductOption> Options { get; set; }
 
-			///
-			///Price (unit price * quantity)
-			///
 			public decimal Price { get; set; }
 
-			///
-			///The unique, user-defined product code of a product, used throughout  to reference and associate to a product.
-			///
 			public string ProductCode { get; set; }
 
-			///
-			///Product name/description
-			///
 			public string ProductDescription { get; set; }
 
-			///
-			///A product type is like a product template.
-			///
 			public string ProductType { get; set; }
 
-			///
-			///Collection of property attributes defined for the object. Properties are associated to all objects within , including documents, products, and product types.
-			///
 			public List<ProductProperty> Properties { get; set; }
 
-			///
-			///The specified quantity of objects and items. This property is used for numerous object types including products, options, components within a product bundle, cart and order items, returned items, shipping line items, items in a digital product. and items associated with types and reservations.
-			///
 			public int Quantity { get; set; }
 
-			///
-			///Product specific dimensions used for shipping, used by product summary and rate request items. The dimensions can differ between the two uses as a `RateRequestItem `package may contain one or more products.
-			///
 			public ItemMeasurements UnitMeasurements { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ShippingRuntime/RateRequest.cs b/Mozu.Api/Contracts/ShippingRuntime/RateRequest.cs
old mode 100644
new mode 100755
index 3a5a10a2..dff92061
--- a/Mozu.Api/Contracts/ShippingRuntime/RateRequest.cs
+++ b/Mozu.Api/Contracts/ShippingRuntime/RateRequest.cs
@@ -21,9 +21,6 @@ namespace Mozu.Api.Contracts.ShippingRuntime
 		///
 		public class RateRequest
 		{
-			///
-			///Collection of attributes that may be paged list or a list, depending on the usage per object and API type.
-			///
 			public List<RateRequestAttribute> Attributes { get; set; }
 
 			///
@@ -32,63 +29,38 @@ public class RateRequest
 			public List<string> CarrierIds { get; set; }
 
 			///
-			///Collection of carrier-specific key-value attribute pairs associated with a shipping carrier. These are required to retrieve a shipping rate request and are returned for the generated shipping label.
+			///List of key-value pairs that represent custom attributes associated with the request.
 			///
 			public List<CustomAttribute> CustomAttributes { get; set; }
 
-			///
-			///Data included in the shipping rate information.
-			///
 			public JObject Data { get; set; }
 
-			///
-			///The physical address orders are sent to as a shipping destination. This address may contain multiple lines, city, state/province, country, and zip/postal code. The destination is used to calculate shipping costs.
-			///
 			public Address DestinationAddress { get; set; }
 
 			///
-			///The estimated date and time the shipment will be shipped to the shopper. This calculation is based on product stock, availability, date of order entry, and location.
+			///The date and time the shipment will be shipped to the shopper.
 			///
 			public DateTime? EstimatedShipmentDate { get; set; }
 
-			///
-			///If true, the destination address associated with the shipping rate request is a commercial address.
-			///
+			public string Id { get; set; }
+
 			public bool? IsDestinationAddressCommercial { get; set; }
 
-			///
-			///3-letter ISO 4217 standard global currency code. Currently, only "USD" (US Dollar) is supported.
-			///
 			public string IsoCurrencyCode { get; set; }
 
-			///
-			///A list of requested items. All returned data is provided in an items array.For a failed request, the returned response may be success with an empty item array.
-			///
 			public List<RateRequestItem> Items { get; set; }
 
-			///
-			///The sub total of the order including all applicable discounts.
-			///
 			public decimal? OrderDiscountedSubTotal { get; set; }
 
-			///
-			///The total monetary amount of the order. This amount is used to calculate the shipping rate estimate.
-			///
 			public decimal? OrderTotal { get; set; }
 
 			///
-			///The physical address from which the order or shipment will ship.
+			///The physical address from which the shipment will ship.
 			///
 			public Address OriginAddress { get; set; }
 
-			///
-			///The unique identifier of the order to which the shipping rate is related.You can use Arc.js in combination with this property to retrieve other properties of the related order.
-			///
 			public string RelatedOrderId { get; set; }
 
-			///
-			///The order number that the customer sees on the storefront when they place the order.
-			///
 			public int? RelatedOrderNumber { get; set; }
 
 			///
diff --git a/Mozu.Api/Contracts/ShippingRuntime/RateRequestAttribute.cs b/Mozu.Api/Contracts/ShippingRuntime/RateRequestAttribute.cs
old mode 100644
new mode 100755
index 99331bb2..f01e1930
--- a/Mozu.Api/Contracts/ShippingRuntime/RateRequestAttribute.cs
+++ b/Mozu.Api/Contracts/ShippingRuntime/RateRequestAttribute.cs
@@ -14,24 +14,12 @@
 
 namespace Mozu.Api.Contracts.ShippingRuntime
 {
-		///
-		///	Mozu.ShippingRuntime.Contracts.RateRequestAttribute ApiType DOCUMENT_HERE 
-		///
 		public class RateRequestAttribute
 		{
-			///
-			///Unique identifier of the attribute definition.
-			///
 			public int? AttributeDefinitionId { get; set; }
 
-			///
-			///Fully qualified name of the attribute for the order or customer.
-			///
 			public string FullyQualifiedName { get; set; }
 
-			///
-			///List of value data for objects.
-			///
 			public List<object> Values { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ShippingRuntime/RateRequestGroup.cs b/Mozu.Api/Contracts/ShippingRuntime/RateRequestGroup.cs
new file mode 100755
index 00000000..a8151cb3
--- /dev/null
+++ b/Mozu.Api/Contracts/ShippingRuntime/RateRequestGroup.cs
@@ -0,0 +1,25 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+
+
+namespace Mozu.Api.Contracts.ShippingRuntime
+{
+		public class RateRequestGroup
+		{
+			public string Id { get; set; }
+
+			public List<RateRequest> RateRequests { get; set; }
+
+		}
+
+}
\ No newline at end of file
diff --git a/Mozu.Api/Contracts/ShippingRuntime/RateRequestItem.cs b/Mozu.Api/Contracts/ShippingRuntime/RateRequestItem.cs
old mode 100644
new mode 100755
index 48ae6983..f539a014
--- a/Mozu.Api/Contracts/ShippingRuntime/RateRequestItem.cs
+++ b/Mozu.Api/Contracts/ShippingRuntime/RateRequestItem.cs
@@ -21,34 +21,16 @@ namespace Mozu.Api.Contracts.ShippingRuntime
 		///
 		public class RateRequestItem
 		{
-			///
-			///Data unique to the shipping rate for the item.
-			///
 			public JObject Data { get; set; }
 
-			///
-			///Unique identifier of an item used to calculate or request a shipping rate.
-			///
 			public string ItemId { get; set; }
 
-			///
-			///If Product Summaries are populated, this information will be utilized in Product Rules (e.g. ProductCode eq "ABC" or (Weight.Unit eq "lbs" and Weight.Value ge 50)
-			///
 			public List<ProductSummary> ProductSummaries { get; set; }
 
-			///
-			///The specified quantity of objects and items. This property is used for numerous object types including products, options, components within a product bundle, cart and order items, returned items, shipping line items, items in a digital product. and items associated with types and reservations.
-			///
 			public int? Quantity { get; set; }
 
-			///
-			///If true, this item must ship separately from other items in a shipment.
-			///
 			public bool? ShipsByItself { get; set; }
 
-			///
-			///Product specific dimensions used for shipping, used by product summary and rate request items. The dimensions can differ between the two uses as a `RateRequestItem `package may contain one or more products.
-			///
 			public ItemMeasurements UnitMeasurements { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ShippingRuntime/RatesResponse.cs b/Mozu.Api/Contracts/ShippingRuntime/RatesResponse.cs
old mode 100644
new mode 100755
index 7e292089..85ee6d96
--- a/Mozu.Api/Contracts/ShippingRuntime/RatesResponse.cs
+++ b/Mozu.Api/Contracts/ShippingRuntime/RatesResponse.cs
@@ -19,19 +19,12 @@ namespace Mozu.Api.Contracts.ShippingRuntime
 		///
 		public class RatesResponse
 		{
-			///
-			///Arrayed list of calculated shipping rates for each assocuated carrier.
-			///
+			public string Id { get; set; }
+
 			public List<CarrierRatesResponse> Rates { get; set; }
 
-			///
-			///Resolved Shipping Zone Code. This value can be null if the tenant/site does not have shipping zones defined or there are no matching shipping zones for the request (e.g. the only zone defined is "UNITED-STATES" and the destination address of the rate request is in Canada)
-			///
 			public string ResolvedShippingZoneCode { get; set; }
 
-			///
-			///A code denoting a zone for shipping rates. Zip and postal codes are associated to these zones, determining set rates and costs for shipping origin and destination points.
-			///
 			public List<string> ShippingZoneCodes { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ShippingRuntime/RatesResponseGroup.cs b/Mozu.Api/Contracts/ShippingRuntime/RatesResponseGroup.cs
new file mode 100755
index 00000000..9a3d1cda
--- /dev/null
+++ b/Mozu.Api/Contracts/ShippingRuntime/RatesResponseGroup.cs
@@ -0,0 +1,27 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+
+
+namespace Mozu.Api.Contracts.ShippingRuntime
+{
+		public class RatesResponseGroup
+		{
+			public List<RatesResponse> ComponentRates { get; set; }
+
+			public string Id { get; set; }
+
+			public RatesResponse RatesResponse { get; set; }
+
+		}
+
+}
\ No newline at end of file
diff --git a/Mozu.Api/Contracts/ShippingRuntime/ShippingItemRate.cs b/Mozu.Api/Contracts/ShippingRuntime/ShippingItemRate.cs
old mode 100644
new mode 100755
index 77695ac7..ad9e2029
--- a/Mozu.Api/Contracts/ShippingRuntime/ShippingItemRate.cs
+++ b/Mozu.Api/Contracts/ShippingRuntime/ShippingItemRate.cs
@@ -18,19 +18,10 @@ namespace Mozu.Api.Contracts.ShippingRuntime
 		///
 		public class ShippingItemRate
 		{
-			///
-			///The calculated shipping amount for an item in a shipment.
-			///
 			public decimal? Amount { get; set; }
 
-			///
-			///Unique identifier of an item used to calculate or request a shipping rate.
-			///
 			public string ItemId { get; set; }
 
-			///
-			///The specified quantity of objects and items. This property is used for numerous object types including products, options, components within a product bundle, cart and order items, returned items, shipping line items, items in a digital product. and items associated with types and reservations.
-			///
 			public int? Quantity { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ShippingRuntime/ShippingRate.cs b/Mozu.Api/Contracts/ShippingRuntime/ShippingRate.cs
old mode 100644
new mode 100755
index 79eb00a0..484ada24
--- a/Mozu.Api/Contracts/ShippingRuntime/ShippingRate.cs
+++ b/Mozu.Api/Contracts/ShippingRuntime/ShippingRate.cs
@@ -21,29 +21,14 @@ namespace Mozu.Api.Contracts.ShippingRuntime
 		///
 		public class ShippingRate
 		{
-			///
-			///The total calculated shipping amount requested for the package or shipment.
-			///
 			public decimal? Amount { get; set; }
 
-			///
-			///The carrier-defined alphanumeric code associated with this shipping rate.
-			///
 			public string Code { get; set; }
 
-			///
-			///Localizable content (such as a name and/or description) for an attribute. The content may be localized when displayed according to the locale code specified by the master catalog. Content can include descriptive text for product extensible attributes, catalog-level descriptions (displayed if isContentOverriden is true), product bundles, and customer account notes.
-			///
 			public ShippingRateLocalizedContent Content { get; set; }
 
-			///
-			///Collection of carrier-specific key-value attribute pairs associated with a shipping carrier. These are required to retrieve a shipping rate request and are returned for the generated shipping label.
-			///
 			public List<CustomAttribute> CustomAttributes { get; set; }
 
-			///
-			///Shipping rate data.
-			///
 			public JObject Data { get; set; }
 
 			///
@@ -51,14 +36,8 @@ public class ShippingRate
 			///
 			public int? DaysInTransit { get; set; }
 
-			///
-			///Array list of validation and status messages associated with shipping rates, orders, and product purchasable state.
-			///
 			public List<ShippingRateValidationMessage> Messages { get; set; }
 
-			///
-			///Properties of a calculated shipping rate for individual line items in a shipment.
-			///
 			public List<ShippingItemRate> ShippingItemRates { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ShippingRuntime/ShippingRateLocalizedContent.cs b/Mozu.Api/Contracts/ShippingRuntime/ShippingRateLocalizedContent.cs
old mode 100644
new mode 100755
index 03c13a18..de8114ef
--- a/Mozu.Api/Contracts/ShippingRuntime/ShippingRateLocalizedContent.cs
+++ b/Mozu.Api/Contracts/ShippingRuntime/ShippingRateLocalizedContent.cs
@@ -18,14 +18,8 @@ namespace Mozu.Api.Contracts.ShippingRuntime
 		///
 		public class ShippingRateLocalizedContent
 		{
-			///
-			///Language used for the entity. Currently, only "en-US" is supported.
-			///
 			public string LocaleCode { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/ShippingRuntime/ShippingRateValidationMessage.cs b/Mozu.Api/Contracts/ShippingRuntime/ShippingRateValidationMessage.cs
old mode 100644
new mode 100755
index e3f393bf..90bc763a
--- a/Mozu.Api/Contracts/ShippingRuntime/ShippingRateValidationMessage.cs
+++ b/Mozu.Api/Contracts/ShippingRuntime/ShippingRateValidationMessage.cs
@@ -18,19 +18,10 @@ namespace Mozu.Api.Contracts.ShippingRuntime
 		///
 		public class ShippingRateValidationMessage
 		{
-			///
-			///URL displayed with the shipping validation message that links to help information.
-			///
 			public string HelpLink { get; set; }
 
-			///
-			///The text of the change message, such as "This product is no longer available." System-supplied and read-only.
-			///
 			public string Message { get; set; }
 
-			///
-			///The severity level of validation failures for shipping rates and products.
-			///
 			public string Severity { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/SiteSettings/Application/Application.cs b/Mozu.Api/Contracts/SiteSettings/Application/Application.cs
old mode 100644
new mode 100755
index 3ab99883..ce835bc7
--- a/Mozu.Api/Contracts/SiteSettings/Application/Application.cs
+++ b/Mozu.Api/Contracts/SiteSettings/Application/Application.cs
@@ -19,44 +19,23 @@ namespace Mozu.Api.Contracts.SiteSettings.Application
 		///
 		public class Application
 		{
-			///
-			///Unique identifier of an app available in your  tenant or within  Dev Center. This ID is unique across all apps installed, initialized, and enabled in the  and those in development through the Dev Center Console.
-			///
 			public string AppId { get; set; }
 
-			///
-			///denotes the Application Key for the app.
-			///
 			public string AppKey { get; set; }
 
-			///
-			///List of capabilities installed in a tenant.
-			///
 			public List<Capability> Capabilities { get; set; }
 
-			///
-			///Indicates if a capability, function tied to an Arc.js action, application, or price list is enabled for the tenant/site. If true, the capability/application/function/price list is enabled for the tenant. System-supplied and read-only with the exception of functions tied to an Arc.js action and price lists.
-			///
 			public bool? Enabled { get; set; }
 
-			///
-			///Indicates if an app is initialized and capable of being enabled in the tenant and site. Apps will need to be installed and configured to become initialized, such as validating credentials and/or API keys with a third-party service. If true, the app is initialized and can be enabled for usage.
-			///
 			public bool? Initialized { get; set; }
 
 			///
-			///Indicates if the installed application is of type extension. An extension is an application that extends upon the  infrastructure. Examples of extensions include Arc.js applications and applications that integrate third-party services.
+			///If true, the application type is Extension.
 			///
 			public bool? IsExtension { get; set; }
 
-			///
-			///Indicates if the installed application is a  certified application.
-			///
 			public bool? IsExtensionCertified { get; set; }
 
-			///
-			///The URL defined for the application that represents the configuration website for the capability. This value is used by installed applications or the site.
-			///
 			public string UiConfigurationUrl { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/SiteSettings/Application/Capability.cs b/Mozu.Api/Contracts/SiteSettings/Application/Capability.cs
old mode 100644
new mode 100755
index 8b1d1098..49238985
--- a/Mozu.Api/Contracts/SiteSettings/Application/Capability.cs
+++ b/Mozu.Api/Contracts/SiteSettings/Application/Capability.cs
@@ -26,17 +26,17 @@ public class Capability
 			public List<string> ActiveCreditTypes { get; set; }
 
 			///
-			///Array list of the countries (by country code) to which this capability can actively ship. The entered shipping country is validated against a list of supported shipping countries. Messages return if the country code is not supported or duplicated. Supported carriers are also checked per country code.
+			///Array list of the countries to which this capability can actively ship.
 			///
 			public List<ActiveShippingCountry> ActiveShippingCountries { get; set; }
 
 			///
-			///Array list of the countries (by country code) for which this capability can actively shop. All active shopping countries must be in the supported shopping country list. Validation rules determine the supported validity of the entered country against the list.
+			///Array list of the countries for which this capability can actively shop.
 			///
 			public List<string> ActiveShoppingCountries { get; set; }
 
 			///
-			///The enablement mode of the capability, typically read only.
+			///The enablement mode of the capability.
 			///
 			public string CapabilityMode { get; set; }
 
@@ -46,17 +46,17 @@ public class Capability
 			public string CapabilityType { get; set; }
 
 			///
-			///Indicates if a capability, function tied to an Arc.js action, application, or price list is enabled for the tenant/site. If true, the capability/application/function/price list is enabled for the tenant. System-supplied and read-only with the exception of functions tied to an Arc.js action and price lists.
+			///If true, the capability is enabled in the installed tenant.
 			///
 			public bool? Enabled { get; set; }
 
 			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
+			///Unique identifier of the capability.
 			///
 			public string Id { get; set; }
 
 			///
-			///Indicates if an app is initialized and capable of being enabled in the tenant and site. Apps will need to be installed and configured to become initialized, such as validating credentials and/or API keys with a third-party service. If true, the app is initialized and can be enabled for usage.
+			///If true, the application is initialized with the defined settings.
 			///
 			public bool? Initialized { get; set; }
 
@@ -66,17 +66,17 @@ public class Capability
 			public List<OperationUrl> OperationUrls { get; set; }
 
 			///
-			///The unique identifier of the scope. For example, if your scope type is site, then this value would be the site id.
+			///Unique identifier of the developer account or tenant associated for which the capability is entitled.
 			///
 			public int? ScopeId { get; set; }
 
 			///
-			///The type of scope associated with the documentList. For example, if the documentList is pageTemplateContent, the scopeType is Site.Valid values are: "Tenant", "MasterCatalog", and "Site".
+			///The type of scope for which the tenant is entitled, which is developer or tenant.
 			///
 			public string ScopeType { get; set; }
 
 			///
-			///List of credit types this capability supports.
+			///Array list of credit types this capability supports.
 			///
 			public List<InitializablePropertyValue> SupportedCreditTypes { get; set; }
 
@@ -86,7 +86,7 @@ public class Capability
 			public List<InitializableShippingCountryPropertyValue> SupportedShippingCountries { get; set; }
 
 			///
-			///List of countries this capability supports for shopping.
+			///Array list of countries this capability supports for shopping.
 			///
 			public List<InitializablePropertyValue> SupportedShoppingCountries { get; set; }
 
diff --git a/Mozu.Api/Contracts/SiteSettings/General/CacheSettings.cs b/Mozu.Api/Contracts/SiteSettings/General/CacheSettings.cs
old mode 100644
new mode 100755
index c09cf52b..98a82053
--- a/Mozu.Api/Contracts/SiteSettings/General/CacheSettings.cs
+++ b/Mozu.Api/Contracts/SiteSettings/General/CacheSettings.cs
@@ -13,14 +13,8 @@
 
 namespace Mozu.Api.Contracts.SiteSettings.General
 {
-		///
-		///	Settings related to the CDN cache.
-		///
 		public class CacheSettings
 		{
-			///
-			///A random string value appended to the URLs of CDN content. When a user clicks the Bust Cache button in , the random number in the URL forces the cache to point to the latest version of the CDN content.
-			///
 			public string CdnCacheBustKey { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/SiteSettings/General/EmailTransactionSettings.cs b/Mozu.Api/Contracts/SiteSettings/General/EmailTransactionSettings.cs
old mode 100644
new mode 100755
index 9327e633..9aea803c
--- a/Mozu.Api/Contracts/SiteSettings/General/EmailTransactionSettings.cs
+++ b/Mozu.Api/Contracts/SiteSettings/General/EmailTransactionSettings.cs
@@ -13,89 +13,38 @@
 
 namespace Mozu.Api.Contracts.SiteSettings.General
 {
-		///
-		///	Mozu.SiteSettings.General.Contracts.EmailTransactionSettings ApiType DOCUMENT_HERE 
-		///
 		public class EmailTransactionSettings
 		{
-			///
-			///A flag that determines if an email is sent to a shopper account when the described condition is met.
-			///
 			public bool? BackInStock { get; set; }
 
-			///
-			///A flag that determines if an email is sent to a shopper account when the described condition is met.
-			///
 			public bool? GiftCardCreated { get; set; }
 
-			///
-			///A flag that determines if an email is sent to a shopper account when the described condition is met.
-			///
 			public bool? OrderChanged { get; set; }
 
-			///
-			///A flag that determines if an email is sent to a shopper account when the described condition is met.
-			///
 			public bool? OrderFulfillmentDetailsChanged { get; set; }
 
-			///
-			///A flag that determines if an email is sent to a shopper account when the described condition is met.
-			///
 			public bool? OrderShipped { get; set; }
 
-			///
-			///A flag that determines if an email is sent to a shopper account when the described condition is met.
-			///
 			public bool? RefundCreated { get; set; }
 
-			///
-			///A flag that determines if an email is sent to a shopper account when the described condition is met.
-			///
 			public bool? ReturnAuthorized { get; set; }
 
-			///
-			///There is no corresponding template for this in the Core theme.
-			///
 			public bool? ReturnCancelled { get; set; }
 
-			///
-			///This controls "email/product-return-received" in the Core theme.
-			///
 			public bool? ReturnClosed { get; set; }
 
-			///
-			///A flag that determines if an email is sent to a shopper account when the described condition is met.
-			///
 			public bool? ReturnCreated { get; set; }
 
-			///
-			///A flag that determines if an email is sent to a shopper account when the described condition is met.
-			///
 			public bool? ReturnRejected { get; set; }
 
-			///
-			///A flag that determines if an email is sent to a shopper account when the described condition is met.
-			///
 			public bool? ReturnUpdated { get; set; }
 
-			///
-			///A flag that determines if an email is sent to a shopper account when the described condition is met.
-			///
 			public bool? ShopperLoginCreated { get; set; }
 
-			///
-			///A flag that determines if an email is sent to a shopper account when the described condition is met.
-			///
 			public bool? ShopperPasswordReset { get; set; }
 
-			///
-			///A flag that determines if an email is sent to a shopper account when the described condition is met.
-			///
 			public bool? StoreCreditCreated { get; set; }
 
-			///
-			///A flag that determines if an email is sent to a shopper account when the described condition is met.
-			///
 			public bool? StoreCreditUpdated { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/SiteSettings/General/EmailTypeSetting.cs b/Mozu.Api/Contracts/SiteSettings/General/EmailTypeSetting.cs
old mode 100644
new mode 100755
index 9e8d1014..a8e6b519
--- a/Mozu.Api/Contracts/SiteSettings/General/EmailTypeSetting.cs
+++ b/Mozu.Api/Contracts/SiteSettings/General/EmailTypeSetting.cs
@@ -13,34 +13,16 @@
 
 namespace Mozu.Api.Contracts.SiteSettings.General
 {
-		///
-		///	Mozu.SiteSettings.General.Contracts.EmailTypeSetting ApiType DOCUMENT_HERE 
-		///
 		public class EmailTypeSetting
 		{
-			///
-			///Overwrites the Bcc email address for the given template.
-			///
 			public string BccEmailAddressOverride { get; set; }
 
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public string Id { get; set; }
 
-			///
-			///Overwrites the Reply-to email address for the given template.
-			///
 			public string ReplyToEmailAddressOverride { get; set; }
 
-			///
-			///Overwrites the Sender email address for the given template.
-			///
 			public string SenderEmailAddressOverride { get; set; }
 
-			///
-			///Overwrites the Sender email alias for the given template.
-			///
 			public string SenderEmailAliasOverride { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/SiteSettings/General/General/Routing/CustomRouteSettings.cs b/Mozu.Api/Contracts/SiteSettings/General/General/Routing/CustomRouteSettings.cs
old mode 100644
new mode 100755
index 285410c1..5bef7cc7
--- a/Mozu.Api/Contracts/SiteSettings/General/General/Routing/CustomRouteSettings.cs
+++ b/Mozu.Api/Contracts/SiteSettings/General/General/Routing/CustomRouteSettings.cs
@@ -14,24 +14,12 @@
 
 namespace Mozu.Api.Contracts.SiteSettings.General.General.Routing
 {
-		///
-		///	Mozu.SiteSettings.General.Contracts.General.Routing.CustomRouteSettings ApiType DOCUMENT_HERE 
-		///
 		public class CustomRouteSettings
 		{
-			///
-			///The mappings configured for the site. Mappings allow you to map the values of URL parameters to other JSON variables or to  objects such as facet values. 
-			///
 			public Dictionary<String,Mapping> Mappings { get; set; }
 
-			///
-			///The routes configured for the site. Routes contain all the information necessary to match incoming URLs to a specific page in .
-			///
 			public List<Route> Routes { get; set; }
 
-			///
-			///The validators configured for a site. Validators require that URL parameters meet certain conditions before  considers the template a match. 
-			///
 			public Dictionary<String,Validator> Validators { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/SiteSettings/General/General/Routing/Mapping.cs b/Mozu.Api/Contracts/SiteSettings/General/General/Routing/Mapping.cs
old mode 100644
new mode 100755
index 2d8d3f28..27553b4a
--- a/Mozu.Api/Contracts/SiteSettings/General/General/Routing/Mapping.cs
+++ b/Mozu.Api/Contracts/SiteSettings/General/General/Routing/Mapping.cs
@@ -14,54 +14,24 @@
 
 namespace Mozu.Api.Contracts.SiteSettings.General.General.Routing
 {
-		///
-		///	Mozu.SiteSettings.General.Contracts.General.Routing.Mapping ApiType DOCUMENT_HERE 
-		///
 		public class Mapping
 		{
-			///
-			///beforeRouting ApiType DOCUMENT_HERE 
-			///
 			public bool? BeforeRouting { get; set; }
 
-			///
-			///docId ApiType DOCUMENT_HERE 
-			///
 			public string DocId { get; set; }
 
-			///
-			///facetId ApiType DOCUMENT_HERE 
-			///
 			public string FacetId { get; set; }
 
-			///
-			///The fully qualified name of the document list.
-			///
 			public string ListFqn { get; set; }
 
-			///
-			///mappings ApiType DOCUMENT_HERE 
-			///
 			public Dictionary<String,Object> Mappings { get; set; }
 
-			///
-			///mapTo ApiType DOCUMENT_HERE 
-			///
 			public string MapTo { get; set; }
 
-			///
-			///pattern ApiType DOCUMENT_HERE 
-			///
 			public string Pattern { get; set; }
 
-			///
-			///replacement ApiType DOCUMENT_HERE 
-			///
 			public string Replacement { get; set; }
 
-			///
-			///type ApiType DOCUMENT_HERE 
-			///
 			public string Type { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/SiteSettings/General/General/Routing/Route.cs b/Mozu.Api/Contracts/SiteSettings/General/General/Routing/Route.cs
old mode 100644
new mode 100755
index 159d7e62..08906c23
--- a/Mozu.Api/Contracts/SiteSettings/General/General/Routing/Route.cs
+++ b/Mozu.Api/Contracts/SiteSettings/General/General/Routing/Route.cs
@@ -14,49 +14,22 @@
 
 namespace Mozu.Api.Contracts.SiteSettings.General.General.Routing
 {
-		///
-		///	Mozu.SiteSettings.General.Contracts.General.Routing.Route ApiType DOCUMENT_HERE 
-		///
 		public class Route
 		{
-			///
-			///When true, specifies that the route is a canonical route.
-			///
 			public bool? Canonical { get; set; }
 
-			///
-			///An array of key-value pairs that provide default values for required route parameters.
-			///
 			public Dictionary<String,Object> Defaults { get; set; }
 
-			///
-			///For Arc.js routes, specifies the Arc.js function name to create a route to. For example:
-			///
 			public string FunctionId { get; set; }
 
-			///
-			///Specifies the internal route to use for a particular URL template. For example, the "ProductDetails" internal route routes matching URLs to a product page.
-			///
 			public string InternalRoute { get; set; }
 
-			///
-			///The list of mappings that a particular route uses.
-			///
 			public Dictionary<String,String[]> Mappings { get; set; }
 
-			///
-			///Specifies the pattern of URL constants, variables, and segments that result in a match for a particular route.
-			///
 			public string Template { get; set; }
 
-			///
-			///Specifies whether a custom route uses an  or  protocol. This allows you to set encryption on a route generated from a non-secure request, or vice-versa.
-			///
 			public string UrlScheme { get; set; }
 
-			///
-			///Specifies the validators that a particular route uses.
-			///
 			public Dictionary<String,String[]> Validators { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/SiteSettings/General/General/Routing/Validator.cs b/Mozu.Api/Contracts/SiteSettings/General/General/Routing/Validator.cs
old mode 100644
new mode 100755
index 27dfd5f4..cf0c2feb
--- a/Mozu.Api/Contracts/SiteSettings/General/General/Routing/Validator.cs
+++ b/Mozu.Api/Contracts/SiteSettings/General/General/Routing/Validator.cs
@@ -14,44 +14,20 @@
 
 namespace Mozu.Api.Contracts.SiteSettings.General.General.Routing
 {
-		///
-		///	Mozu.SiteSettings.General.Contracts.General.Routing.Validator ApiType DOCUMENT_HERE 
-		///
 		public class Validator
 		{
-			///
-			///The fully qualified name of the attribute. The attributeDefiniteId may be used to generate this name.
-			///
 			public string AttributeFQN { get; set; }
 
-			///
-			///docId ApiType DOCUMENT_HERE 
-			///
 			public string DocId { get; set; }
 
-			///
-			///field ApiType DOCUMENT_HERE 
-			///
 			public string Field { get; set; }
 
-			///
-			///The fully qualified name of the document list.
-			///
 			public string ListFqn { get; set; }
 
-			///
-			///pattern ApiType DOCUMENT_HERE 
-			///
 			public string Pattern { get; set; }
 
-			///
-			///type ApiType DOCUMENT_HERE 
-			///
 			public string Type { get; set; }
 
-			///
-			///List of value data for objects.
-			///
 			public List<string> Values { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/SiteSettings/General/General/ViewAuthorizations.cs b/Mozu.Api/Contracts/SiteSettings/General/General/ViewAuthorizations.cs
old mode 100644
new mode 100755
index 25b4185c..7a9d3311
--- a/Mozu.Api/Contracts/SiteSettings/General/General/ViewAuthorizations.cs
+++ b/Mozu.Api/Contracts/SiteSettings/General/General/ViewAuthorizations.cs
@@ -13,24 +13,12 @@
 
 namespace Mozu.Api.Contracts.SiteSettings.General.General
 {
-		///
-		///	Set whether you require users to be authenticated to preview content or view the live site.
-		///
 		public class ViewAuthorizations
 		{
-			///
-			///Specifies whether to enable secure communication across your entire site, using the SSL (Secure Socket Layer) security protocol. Every page on your site will display as an HTTPS page and contain an SSL certificate.
-			///
 			public bool? EnforceSitewideSSL { get; set; }
 
-			///
-			///Require log in to view live storefront site.
-			///
 			public bool RequireAuthForLive { get; set; }
 
-			///
-			///Require log in to view pending storefront site.
-			///
 			public bool RequireAuthForPending { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/SiteSettings/General/GeneralSettings.cs b/Mozu.Api/Contracts/SiteSettings/General/GeneralSettings.cs
old mode 100644
new mode 100755
index d00dc932..9c6ff9d4
--- a/Mozu.Api/Contracts/SiteSettings/General/GeneralSettings.cs
+++ b/Mozu.Api/Contracts/SiteSettings/General/GeneralSettings.cs
@@ -22,134 +22,58 @@ namespace Mozu.Api.Contracts.SiteSettings.General
 		///
 		public class GeneralSettings
 		{
-			///
-			///If true, the site allows entry of addresses not verified by an address validation service.
-			///
 			public bool? AllowInvalidAddresses { get; set; }
 
-			///
-			///Identifier and datetime stamp information recorded when a user or application creates, updates, or deletes a resource entity. This value is system-supplied and read-only.
-			///
 			public AuditInfo AuditInfo { get; set; }
 
-			///
-			///An email address to blind carbon copy anytime an automatic email is sent from  to a shopper.
-			///
 			public string BccEmailAddress { get; set; }
 
-			///
-			///Set of settings to deal with site caching.
-			///
 			public CacheSettings CacheSettings { get; set; }
 
-			///
-			///Custom override of the default subdomain for CDN-hosted content. For example, for SEO reasons you may prefer that the subdomain for your CDN content be  instead of the default subdomain, which might be something like .
-			///
 			public string CustomCdnHostName { get; set; }
 
-			///
-			///Site-level settings for custom routing, which allows you to use your own custom URL patterns for common  pages.
-			///
 			public CustomRouteSettings CustomRoutes { get; set; }
 
-			///
-			///Set this property to  to disable automatically sending order confirmation emails after an order is submitted. If you enable this property, order confirmation emails are triggered only by the  API operation or a Resend Order Confirmation Email event (which can be triggered by an  user).
-			///
 			public EmailTransactionSettings EmailTransactionsOnlyOnRequest { get; set; }
 
-			///
-			///A collection of overrides that allow you to apply unique email settings to the email template(s) of your choice.
-			///
 			public List<EmailTypeSetting> EmailTypes { get; set; }
 
-			///
-			///The physical directory path or URL where the mobile favicon image file is stored. The favicon icon is generally 57x57 pixels. The icon appears on a mobile website or on the mobile device's OS Home.
-			///
 			public string FavIconMobilePath { get; set; }
 
-			///
-			///The physical directory path or URL where the mobile favicon image file is stored. The favicon icon is generally 16x16 pixels. The icon appears on a a browser tab as the website's mini logo or on a browser address bar, or next to the page name in a list of bookmarks.
-			///
 			public string FavIconPath { get; set; }
 
-			///
-			///The Google Analytics code associated with a particular store. This could be the web tracking code.
-			///
 			public string GoogleAnalyticsCode { get; set; }
 
-			///
-			///If true, a service to verify addresses as valid is enabled for the site.
-			///
 			public bool? IsAddressValidationEnabled { get; set; }
 
-			///
-			///If true, the Google analytics for eCommerce is enabled for this site. If false, the analytics are not enabled.
-			///
 			public bool? IsGoogleAnalyticsEcommerceEnabled { get; set; }
 
-			///
-			///If true, enable Google analytics for this site. If false, analytics are not enabled.
-			///
 			public bool? IsGoogleAnalyticsEnabled { get; set; }
 
-			///
-			///If true, this site represents a -hosted web storefront.
-			///
 			public bool IsMozuWebSite { get; set; }
 
-			///
-			///If true, shoppers on this site can create customer wish lists.
-			///
+			public bool? IsMultishipEnabled { get; set; }
+
 			public bool? IsWishlistCreationEnabled { get; set; }
 
-			///
-			///The physical directory path or URL where the website logo is stored.
-			///
 			public string LogoPath { get; set; }
 
-			///
-			///The tagline or text that appears when hovering over the site logo.
-			///
 			public string LogoText { get; set; }
 
-			///
-			///Assigns an image to render in place of broken images and unspecified product images (and unspecified category images, if your theme developer has enabled category images). Specified by the name or ID of the CMS image within .
-			///
 			public string MissingImageSubstitute { get; set; }
 
-			///
-			///The name of the theme to use when viewing this website on a mobile device.
-			///
 			public string MobileTheme { get; set; }
 
-			///
-			///The email shoppers should use to reply to an automatically-generated email.
-			///
 			public string ReplyToEmailAddress { get; set; }
 
-			///
-			///Email address to set up so that shoppers and users browsing the site can use to contact the merchant.
-			///
 			public string SenderEmailAddress { get; set; }
 
-			///
-			///An alternate name for the sender email. For example, if your sender email is , you might want to use an alias of .
-			///
 			public string SenderEmailAlias { get; set; }
 
-			///
-			///Choose a format to use on the site: 12-hour (hh:mm:ss tt) or 24-hour format (HH:mm:ss).
-			///
 			public string SiteTimeFormat { get; set; }
 
-			///
-			///Choose the time zone to use for the site.
-			///
 			public string SiteTimeZone { get; set; }
 
-			///
-			///Supressed emails. Setting any of these to 'true' will block  from sending that email and an event will be published instead.
-			///
 			public EmailTransactionSettings SupressedEmailTransactions { get; set; }
 
 			///
@@ -157,29 +81,14 @@ public class GeneralSettings
 			///
 			public string TabletTheme { get; set; }
 
-			///
-			///The territories configured for the site that are subject to sales tax.
-			///
 			public List<TaxableTerritory> TaxableTerritories { get; set; }
 
-			///
-			///Unique identifier of the tenant site that site uses to render content for the shopper. For example, if this site represents a third-party sales channel such as Amazon but the company wants to send shopper emails, this value represents the -hosted web storefront site that maintains this content.
-			///
 			public int? TemplateSiteId { get; set; }
 
-			///
-			///The name of the theme used on the storefront.
-			///
 			public string Theme { get; set; }
 
-			///
-			///A collection of authorizations that control access to viewing the pending and live sites.
-			///
 			public ViewAuthorizations ViewAuthorizations { get; set; }
 
-			///
-			///The name of the website to display on the storefront with no spaces.
-			///
 			public string WebsiteName { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/SiteSettings/General/TaxableTerritory.cs b/Mozu.Api/Contracts/SiteSettings/General/TaxableTerritory.cs
old mode 100644
new mode 100755
index 45480e37..2aecf506
--- a/Mozu.Api/Contracts/SiteSettings/General/TaxableTerritory.cs
+++ b/Mozu.Api/Contracts/SiteSettings/General/TaxableTerritory.cs
@@ -18,19 +18,10 @@ namespace Mozu.Api.Contracts.SiteSettings.General
 		///
 		public class TaxableTerritory
 		{
-			///
-			///The 2-letter geographic code representing the country for the physical or mailing address. Currently limited to the US.
-			///
 			public string CountryCode { get; set; }
 
-			///
-			///If true, all shipping charges for this territory are subject to sales tax.
-			///
 			public bool? IsShippingTaxable { get; set; }
 
-			///
-			///The two-letter geographic code representing the state for the physical or mailing address. This is currently limited to the US.
-			///
 			public string StateOrProvinceCode { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/SiteSettings/Order/CartSettings.cs b/Mozu.Api/Contracts/SiteSettings/Order/CartSettings.cs
old mode 100644
new mode 100755
index b6ff37b6..195b4a39
--- a/Mozu.Api/Contracts/SiteSettings/Order/CartSettings.cs
+++ b/Mozu.Api/Contracts/SiteSettings/Order/CartSettings.cs
@@ -14,19 +14,10 @@
 
 namespace Mozu.Api.Contracts.SiteSettings.Order
 {
-		///
-		///	Mozu.SiteSettings.Order.Contracts.CartSettings ApiType DOCUMENT_HERE 
-		///
 		public class CartSettings
 		{
-			///
-			///Basic audit info about the object, including date, time, and user account. This data may be captured when creating, updating, and removing data.
-			///
 			public AuditInfo AuditInfo { get; set; }
 
-			///
-			///Set this property to  if you want to include handling fees in the calculation of the cart cost.
-			///
 			public bool EnableHandlingFee { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/SiteSettings/Order/CheckoutSettings.cs b/Mozu.Api/Contracts/SiteSettings/Order/CheckoutSettings.cs
old mode 100644
new mode 100755
index 18b1386b..5ae9a1db
--- a/Mozu.Api/Contracts/SiteSettings/Order/CheckoutSettings.cs
+++ b/Mozu.Api/Contracts/SiteSettings/Order/CheckoutSettings.cs
@@ -18,19 +18,10 @@ namespace Mozu.Api.Contracts.SiteSettings.Order
 		///
 		public class CheckoutSettings
 		{
-			///
-			///Settings for the checkout login. Choose whether or not shoppers must first login before a purchase can be processed. Choose the option for guests to purchase without logging in, prompt guests to login, or require them to login before a purchase can be completed.
-			///
 			public CustomerCheckoutSettings CustomerCheckoutSettings { get; set; }
 
-			///
-			///Credit card payment authorization setting defined for the site for order processing.
-			///
 			public OrderProcessingSettings OrderProcessingSettings { get; set; }
 
-			///
-			///Payment gateway settings defined for the site. A payment gateway is an eCommerce application service provider that authorizes payments for eBusinesses, online retailers, and other stores that have an online commerce component.
-			///
 			public PaymentSettings PaymentSettings { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/SiteSettings/Order/CustomerCheckoutSettings.cs b/Mozu.Api/Contracts/SiteSettings/Order/CustomerCheckoutSettings.cs
old mode 100644
new mode 100755
index 5e8092b1..ae43b77f
--- a/Mozu.Api/Contracts/SiteSettings/Order/CustomerCheckoutSettings.cs
+++ b/Mozu.Api/Contracts/SiteSettings/Order/CustomerCheckoutSettings.cs
@@ -19,14 +19,8 @@ namespace Mozu.Api.Contracts.SiteSettings.Order
 		///
 		public class CustomerCheckoutSettings
 		{
-			///
-			///Identifier and datetime stamp information recorded when a user or application creates, updates, or deletes a resource entity. This value is system-supplied and read-only.
-			///
 			public AuditInfo AuditInfo { get; set; }
 
-			///
-			///The type of customer checking out in the order such as a guest who has not logged in or a customer who has logged in. Valid strings are either "LoginOptional," where shoppers are prompted to sign in but are not required to do so, or "LoginRequired," where shopppers must login before purchasing.
-			///
 			public string CustomerCheckoutType { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/SiteSettings/Order/ExternalPaymentWorkflowDefinition.cs b/Mozu.Api/Contracts/SiteSettings/Order/ExternalPaymentWorkflowDefinition.cs
old mode 100644
new mode 100755
index 25457da5..835652b5
--- a/Mozu.Api/Contracts/SiteSettings/Order/ExternalPaymentWorkflowDefinition.cs
+++ b/Mozu.Api/Contracts/SiteSettings/Order/ExternalPaymentWorkflowDefinition.cs
@@ -19,34 +19,16 @@ namespace Mozu.Api.Contracts.SiteSettings.Order
 		///
 		public class ExternalPaymentWorkflowDefinition
 		{
-			///
-			///The credential fields required to communicate with the external payment processor.
-			///
 			public List<ThirdPartyCredentialField> Credentials { get; set; }
 
-			///
-			///The localized description in text for the object, displayed per the locale code. For example, descriptions are used for product descriptions, attributes, and pre-authorization transaction types.
-			///
 			public string Description { get; set; }
 
-			///
-			///Fully qualified name of the attribute for the order or customer. 
-			///
 			public string FullyQualifiedName { get; set; }
 
-			///
-			///Indicates if the object or process is enabled. This indicator is used on external payment workflows and product option values. For product options, if true, the product option value is available for a shopper to choose. During configuration, this property will be false if the option value is invalid with other selected options. For external payment workflows, if true, the workflow is enabled and available for routing payments for the submitted order.
-			///
 			public bool IsEnabled { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
-			///
-			///The namespace for the accessible APIs and source capabilities in the core of  APIs.
-			///
 			public string Namespace { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/SiteSettings/Order/Gateway.cs b/Mozu.Api/Contracts/SiteSettings/Order/Gateway.cs
old mode 100644
new mode 100755
index c8501441..e972364c
--- a/Mozu.Api/Contracts/SiteSettings/Order/Gateway.cs
+++ b/Mozu.Api/Contracts/SiteSettings/Order/Gateway.cs
@@ -20,24 +20,12 @@ namespace Mozu.Api.Contracts.SiteSettings.Order
 		///
 		public class Gateway
 		{
-			///
-			///If true, the credential fields for the gateway are configured with valid values. For security purposes,  does not return the credential fields for the gateway subresource.
-			///
 			public bool AreGatewayCredentialFieldsSet { get; set; }
 
-			///
-			///Account information associated with the specified payment gateway.
-			///
 			public GatewayAccount GatewayAccount { get; set; }
 
-			///
-			///Properties of the payment gateway definition.
-			///
 			public GatewayDefinition GatewayDefinition { get; set; }
 
-			///
-			///The types of credit cards supported by the payment gateway.
-			///
 			public List<string> SupportedCards { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/SiteSettings/Order/LocalizedContent.cs b/Mozu.Api/Contracts/SiteSettings/Order/LocalizedContent.cs
old mode 100644
new mode 100755
index 4a544b2e..1c4e2fe9
--- a/Mozu.Api/Contracts/SiteSettings/Order/LocalizedContent.cs
+++ b/Mozu.Api/Contracts/SiteSettings/Order/LocalizedContent.cs
@@ -13,19 +13,10 @@
 
 namespace Mozu.Api.Contracts.SiteSettings.Order
 {
-		///
-		///	The localized content associated with the object.
-		///
 		public class LocalizedContent
 		{
-			///
-			///The two character locale code, per the country code provided. This code determines the localized content to use and display.
-			///
 			public string LocaleCode { get; set; }
 
-			///
-			///The value of a property, used by numerous objects within  including facets, attributes, products, localized content, metadata, capabilities ( and third-party), location inventory adjustment, and more. The value may be a string, integer, or double. Validation may be run against the entered and saved values depending on the object type.
-			///
 			public string Value { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/SiteSettings/Order/OrderProcessingSettings.cs b/Mozu.Api/Contracts/SiteSettings/Order/OrderProcessingSettings.cs
old mode 100644
new mode 100755
index 99d9d63a..a2d0d21d
--- a/Mozu.Api/Contracts/SiteSettings/Order/OrderProcessingSettings.cs
+++ b/Mozu.Api/Contracts/SiteSettings/Order/OrderProcessingSettings.cs
@@ -24,19 +24,10 @@ public class OrderProcessingSettings
 			///
 			public int? AbandonedOrderThresholdInMinutes { get; set; }
 
-			///
-			///Identifier and datetime stamp information recorded when a user or application creates, updates, or deletes a resource entity. This value is system-supplied and read-only.
-			///
 			public AuditInfo AuditInfo { get; set; }
 
-			///
-			///Determines whether payment authorization occurs when the order is placed or when the order is shipped.
-			///
 			public string PaymentProcessingFlowType { get; set; }
 
-			///
-			///If true, use the override price defined for products in the order to calculate discounts for the order.
-			///
 			public bool UseOverridePriceToCalculateDiscounts { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/SiteSettings/Order/PaymentSettings.cs b/Mozu.Api/Contracts/SiteSettings/Order/PaymentSettings.cs
old mode 100644
new mode 100755
index 711879b1..71fea0d5
--- a/Mozu.Api/Contracts/SiteSettings/Order/PaymentSettings.cs
+++ b/Mozu.Api/Contracts/SiteSettings/Order/PaymentSettings.cs
@@ -20,29 +20,14 @@ namespace Mozu.Api.Contracts.SiteSettings.Order
 		///
 		public class PaymentSettings
 		{
-			///
-			///Identifier and datetime stamp information recorded when a user or application creates, updates, or deletes a resource entity. This value is system-supplied and read-only.
-			///
 			public AuditInfo AuditInfo { get; set; }
 
-			///
-			///The external payment workflwo definitions configured for the site's payment settings. At this time, only PayPal Express is supported.
-			///
 			public List<ExternalPaymentWorkflowDefinition> ExternalPaymentWorkflowDefinitions { get; set; }
 
-			///
-			///List of name and account information for a payment gateway.
-			///
 			public List<Gateway> Gateways { get; set; }
 
-			///
-			///Settings that provide for the ability to pay for an order by mail.
-			///
 			public bool PayByMail { get; set; }
 
-			///
-			///The purchase order payment type settings associated with a site.Refer to [Enable the Purchase Order Payment Type](https://www.mozu.com/docs/guides/orders/purchase-order.htm#enable_the_purchase_order_payment_type) in the Purchase Orders guides topic for more information.
-			///
 			public PurchaseOrderPaymentDefinition PurchaseOrder { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/SiteSettings/Order/PurchaseOrderCustomField.cs b/Mozu.Api/Contracts/SiteSettings/Order/PurchaseOrderCustomField.cs
old mode 100644
new mode 100755
index 8b8a8820..faedb0c6
--- a/Mozu.Api/Contracts/SiteSettings/Order/PurchaseOrderCustomField.cs
+++ b/Mozu.Api/Contracts/SiteSettings/Order/PurchaseOrderCustomField.cs
@@ -13,34 +13,16 @@
 
 namespace Mozu.Api.Contracts.SiteSettings.Order
 {
-		///
-		///	The details of the custom fields associated with the purchase order payment.Refer to [Custom Text Fields](https://www.mozu.com/docs/guides/orders/purchase-order.htm#custom_text_fields) in the Purchase Orders guides topic for more information.
-		///
 		public class PurchaseOrderCustomField
 		{
-			///
-			///The unique code of the custom field associated with the purchase order payment type.Refer to [Custom Text Fields](https://www.mozu.com/docs/guides/orders/purchase-order.htm#custom_text_fields) in the Purchase Orders guides topic for more information.
-			///
 			public string Code { get; set; }
 
-			///
-			///Indicates if the object or process is enabled. This indicator is used on external payment workflows and product option values. For product options, if true, the product option value is available for a shopper to choose. During configuration, this property will be false if the option value is invalid with other selected options. For external payment workflows, if true, the workflow is enabled and available for routing payments for the submitted order.
-			///
 			public bool IsEnabled { get; set; }
 
-			///
-			///Indicates if the property, attribute, product option, or product extra is required. If true, the object must have a defined value.
-			///
 			public bool IsRequired { get; set; }
 
-			///
-			///Descriptive text used as a label for objects, such as field names, facets, date ranges, contact information, and package information.
-			///
 			public string Label { get; set; }
 
-			///
-			///The order/sequence position in which  displays the custom field.
-			///
 			public int SequenceNumber { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/SiteSettings/Order/PurchaseOrderPaymentDefinition.cs b/Mozu.Api/Contracts/SiteSettings/Order/PurchaseOrderPaymentDefinition.cs
old mode 100644
new mode 100755
index 4cab83b5..dda93db4
--- a/Mozu.Api/Contracts/SiteSettings/Order/PurchaseOrderPaymentDefinition.cs
+++ b/Mozu.Api/Contracts/SiteSettings/Order/PurchaseOrderPaymentDefinition.cs
@@ -14,29 +14,14 @@
 
 namespace Mozu.Api.Contracts.SiteSettings.Order
 {
-		///
-		///	The details of the purchase order payment.
-		///
 		public class PurchaseOrderPaymentDefinition
 		{
-			///
-			///Specifies whether another payment can be used with the purchase order.
-			///
 			public bool AllowSplitPayment { get; set; }
 
-			///
-			///The details of the custom fields associated with the purchase order payment type for the specific site.You can create custom text fields that customers or CSRs can fill out when they use the purchase order payment method before submitting the order.Refer to [Custom Text Fields](https://www.mozu.com/docs/guides/orders/purchase-order.htm#custom_text_fields) in the Purchase Orders guides topic for more information.
-			///
 			public List<PurchaseOrderCustomField> CustomFields { get; set; }
 
-			///
-			///Indicates if the object or process is enabled. This indicator is used on external payment workflows and product option values. For product options, if true, the product option value is available for a shopper to choose. During configuration, this property will be false if the option value is invalid with other selected options. For external payment workflows, if true, the workflow is enabled and available for routing payments for the submitted order.
-			///
 			public bool IsEnabled { get; set; }
 
-			///
-			///The complete set of payment terms details for which all your customers are possibly applicable on that specific site.Refer to [Payment Terms](https://www.mozu.com/docs/guides/orders/purchase-order.htm#payment_terms) in the Purchase Orders guides topic for more information.
-			///
 			public List<PurchaseOrderPaymentTerm> PaymentTerms { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/SiteSettings/Order/PurchaseOrderPaymentTerm.cs b/Mozu.Api/Contracts/SiteSettings/Order/PurchaseOrderPaymentTerm.cs
old mode 100644
new mode 100755
index 9916f2ed..d04a4eb8
--- a/Mozu.Api/Contracts/SiteSettings/Order/PurchaseOrderPaymentTerm.cs
+++ b/Mozu.Api/Contracts/SiteSettings/Order/PurchaseOrderPaymentTerm.cs
@@ -13,24 +13,12 @@
 
 namespace Mozu.Api.Contracts.SiteSettings.Order
 {
-		///
-		///	The details of the payment terms assocaited with the purchase order payment.Refer to [Payment Terms](https://www.mozu.com/docs/guides/orders/purchase-order.htm#payment_terms) in the Purchase Orders guides topic for more information.
-		///
 		public class PurchaseOrderPaymentTerm
 		{
-			///
-			///The unique code for the payment term associated with the purchase order payment type.Refer to [Payment Terms](https://www.mozu.com/docs/guides/orders/purchase-order.htm#payment_terms) in the Purchase Orders guides topic for more information.
-			///
 			public string Code { get; set; }
 
-			///
-			///The localized description in text for the object, displayed per the locale code. For example, descriptions are used for product descriptions, attributes, and pre-authorization transaction types.
-			///
 			public string Description { get; set; }
 
-			///
-			///The order/sequence position in which  displays the payment term.
-			///
 			public int SequenceNumber { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/SiteSettings/Order/ThirdPartyCredentialField.cs b/Mozu.Api/Contracts/SiteSettings/Order/ThirdPartyCredentialField.cs
old mode 100644
new mode 100755
index 89a6921b..d391c0ce
--- a/Mozu.Api/Contracts/SiteSettings/Order/ThirdPartyCredentialField.cs
+++ b/Mozu.Api/Contracts/SiteSettings/Order/ThirdPartyCredentialField.cs
@@ -19,34 +19,16 @@ namespace Mozu.Api.Contracts.SiteSettings.Order
 		///
 		public class ThirdPartyCredentialField
 		{
-			///
-			///System-supplied API name required to communicate with the external payment processor.
-			///
 			public string ApiName { get; set; }
 
-			///
-			///The name that displays for the payment gateway or third-party credentials field. 
-			///
 			public string DisplayName { get; set; }
 
-			///
-			///The type of input selection used to define a value for the attribute, including Yes/No, Date, DateTime, List, TextBox, or TextArea.
-			///
 			public string InputType { get; set; }
 
-			///
-			///A flag to determine if the field holds sensitive information.
-			///
 			public bool? IsSensitive { get; set; }
 
-			///
-			///The value of a property, used by numerous objects within  including facets, attributes, products, localized content, metadata, capabilities ( and third-party), location inventory adjustment, and more. The value may be a string, integer, or double. Validation may be run against the entered and saved values depending on the object type.
-			///
 			public string Value { get; set; }
 
-			///
-			///List of valid vocabulary values defined for an attribute.
-			///
 			public List<VocabularyValue> VocabularyValues { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/SiteSettings/Order/VocabularyValue.cs b/Mozu.Api/Contracts/SiteSettings/Order/VocabularyValue.cs
old mode 100644
new mode 100755
index 1b19b2a5..78231f32
--- a/Mozu.Api/Contracts/SiteSettings/Order/VocabularyValue.cs
+++ b/Mozu.Api/Contracts/SiteSettings/Order/VocabularyValue.cs
@@ -14,19 +14,10 @@
 
 namespace Mozu.Api.Contracts.SiteSettings.Order
 {
-		///
-		///	Mozu.SiteSettings.Order.Contracts.VocabularyValue ApiType DOCUMENT_HERE 
-		///
 		public class VocabularyValue
 		{
-			///
-			///Contents of the vocabulary values that have been defined for an attribute.
-			///
 			public List<LocalizedContent> Contents { get; set; }
 
-			///
-			///Key used for metadata defined for objects, including extensible attributes, custom attributes associated with a shipping provider, and search synonyms definitions. This content may be user-defined depending on the object and usage.For search synonym definitions, refer to [Synonym Expansion Types](https://www.mozu.com/docs/Developer/api-guides/search-settings.htm#synonym_expansion_types) for more information about the key usage.
-			///
 			public string Key { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/SiteSettings/Shipping/SiteShippingHandlingFee.cs b/Mozu.Api/Contracts/SiteSettings/Shipping/SiteShippingHandlingFee.cs
old mode 100644
new mode 100755
index c051912f..c09bfb7d
--- a/Mozu.Api/Contracts/SiteSettings/Shipping/SiteShippingHandlingFee.cs
+++ b/Mozu.Api/Contracts/SiteSettings/Shipping/SiteShippingHandlingFee.cs
@@ -18,9 +18,6 @@ namespace Mozu.Api.Contracts.SiteSettings.Shipping
 		///
 		public class SiteShippingHandlingFee
 		{
-			///
-			///The amount of the order handling fee.
-			///
 			public decimal? Amount { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/SiteSettings/Shipping/SiteShippingSettings.cs b/Mozu.Api/Contracts/SiteSettings/Shipping/SiteShippingSettings.cs
old mode 100644
new mode 100755
index 4f2144a4..1e576933
--- a/Mozu.Api/Contracts/SiteSettings/Shipping/SiteShippingSettings.cs
+++ b/Mozu.Api/Contracts/SiteSettings/Shipping/SiteShippingSettings.cs
@@ -19,19 +19,10 @@ namespace Mozu.Api.Contracts.SiteSettings.Shipping
 		///
 		public class SiteShippingSettings
 		{
-			///
-			///Identifier and datetime stamp information recorded when a user or application creates, updates, or deletes a resource entity. This value is system-supplied and read-only.
-			///
 			public AuditInfo AuditInfo { get; set; }
 
-			///
-			///The combined price for all items in the order, including all selected options but excluding any discounts.
-			///
 			public SiteShippingHandlingFee OrderHandlingFee { get; set; }
 
-			///
-			///Properties of the package signature requirements for the site.
-			///
 			public SiteShippingSignatureRequirement SignatureRequirement { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/SiteSettings/Shipping/SiteShippingSignatureRequirement.cs b/Mozu.Api/Contracts/SiteSettings/Shipping/SiteShippingSignatureRequirement.cs
old mode 100644
new mode 100755
index e13b5dcd..fe48c1f3
--- a/Mozu.Api/Contracts/SiteSettings/Shipping/SiteShippingSignatureRequirement.cs
+++ b/Mozu.Api/Contracts/SiteSettings/Shipping/SiteShippingSignatureRequirement.cs
@@ -18,14 +18,8 @@ namespace Mozu.Api.Contracts.SiteSettings.Shipping
 		///
 		public class SiteShippingSignatureRequirement
 		{
-			///
-			///If true, this site requires signatures on shipments for orders that exceed the minimum value threshold.
-			///
 			public bool? IsSignatureRequired { get; set; }
 
-			///
-			///The minimum order amount that requires a signature on shipments. For example, if you want to require customer signatures on all orders over $5,000, the MinimumValueThreshold would be 5001.
-			///
 			public decimal? MinimumValueThreshold { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Tenant/Catalog.cs b/Mozu.Api/Contracts/Tenant/Catalog.cs
old mode 100644
new mode 100755
index 57e84824..be79267f
--- a/Mozu.Api/Contracts/Tenant/Catalog.cs
+++ b/Mozu.Api/Contracts/Tenant/Catalog.cs
@@ -14,65 +14,22 @@
 namespace Mozu.Api.Contracts.Tenant
 {
 		///
-		///	Properties of an individual product catalog.
+		///	Properties of a product catalog associated with a tenant.
 		///
 		public class Catalog
 		{
-			///
-			///The date and time in UTC format set when the object was created.
-			///
-			public DateTime CreateDate { get; set; }
-
-			///
-			///The default three-letter ISO currency code for monetary amounts. Currently, only "USD" is supported for U.S. Dollar.
-			///
 			public string DefaultCurrencyCode { get; set; }
 
-			///
-			///The two-letter default locale code for setting the localized text content. Currently, only "en-US" is supported for U.S. English.
-			///
 			public string DefaultLocaleCode { get; set; }
 
-			///
-			///The date and time the object was deleted. 
-			///
-			public DateTime DeleteDate { get; set; }
-
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public int Id { get; set; }
 
-			///
-			///Indicates if the object is deleted. If true, the object has been deleted. This may affect associated child members and objects. For example, a deleted master catalog affects all associated catalogs. 
-			///
-			public bool IsDeleted { get; set; }
-
-			///
-			///Unique identifier for the master catalog. 
-			///
 			public int MasterCatalogId { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
-			///
-			///The current status of the object.This value is read only. Valid values for this field are: "Active", "Expired", and "Inactive".
-			///
-			public string Status { get; set; }
-
-			///
-			///Unique identifier of the Mozu tenant.
-			///
 			public int TenantId { get; set; }
 
-			///
-			///The date and time in UTC format the object was updated most recently.
-			///
-			public DateTime UpdateDate { get; set; }
-
 		}
 
 }
\ No newline at end of file
diff --git a/Mozu.Api/Contracts/Tenant/MasterCatalog.cs b/Mozu.Api/Contracts/Tenant/MasterCatalog.cs
old mode 100644
new mode 100755
index fde583b7..2e61bcba
--- a/Mozu.Api/Contracts/Tenant/MasterCatalog.cs
+++ b/Mozu.Api/Contracts/Tenant/MasterCatalog.cs
@@ -15,65 +15,22 @@
 namespace Mozu.Api.Contracts.Tenant
 {
 		///
-		///	Properties of a master product catalog defined for a tenant. All catalogs and sites associated with a master catalog share product definitions.
+		///	Properties of a master catalog defined for a tenant. All catalogs associated with a master catalog share product definitions.
 		///
 		public class MasterCatalog
 		{
-			///
-			///Collection of product catalogs that use product definitions from the master catalog.
-			///
 			public List<Catalog> Catalogs { get; set; }
 
-			///
-			///The date and time in UTC format set when the object was created.
-			///
-			public DateTime CreateDate { get; set; }
-
-			///
-			///The default three-letter ISO currency code for monetary amounts. Currently, only "USD" is supported for U.S. Dollar.
-			///
 			public string DefaultCurrencyCode { get; set; }
 
-			///
-			///The two-letter default locale code for setting the localized text content. Currently, only "en-US" is supported for U.S. English.
-			///
 			public string DefaultLocaleCode { get; set; }
 
-			///
-			///The date and time the object was deleted. 
-			///
-			public DateTime DeleteDate { get; set; }
-
-			///
-			///Unique identifier of the source property, such as a catalog, discount, order, or email template.For a product field it will be the name of the field.For a category ID, must be a positive integer not greater than 2000000. By default,  auto-generates a category ID when categories are created. If you want to specify an ID during creation (which preserves category link relationships when migrating tenant data from one sandbox to another), you must also include the  query string in the endpoint. For example, . Then, use the  property to specify the desired category ID.For a product attribute it will be the Attribute FQN.For a document, the ID must be specified as a 32 character, case-insensitive, alphanumeric string. You can specify the ID as 32 sequential characters or as groups separated by dashes in the format 8-4-4-4-12. For example, or.For email templates, the ID must be one of the following values:			
-			///
 			public int Id { get; set; }
 
-			///
-			///Indicates if the object is deleted. If true, the object has been deleted. This may affect associated child members and objects. For example, a deleted master catalog affects all associated catalogs. 
-			///
-			public bool IsDeleted { get; set; }
-
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
-			///
-			///The current status of the object.This value is read only. Valid values for this field are: "Active", "Expired", and "Inactive".
-			///
-			public string Status { get; set; }
-
-			///
-			///Unique identifier of the Mozu tenant.
-			///
 			public int TenantId { get; set; }
 
-			///
-			///The date and time in UTC format the object was updated most recently.
-			///
-			public DateTime UpdateDate { get; set; }
-
 		}
 
 }
\ No newline at end of file
diff --git a/Mozu.Api/Contracts/Tenant/Site.cs b/Mozu.Api/Contracts/Tenant/Site.cs
old mode 100644
new mode 100755
index de4bad19..4a29913a
--- a/Mozu.Api/Contracts/Tenant/Site.cs
+++ b/Mozu.Api/Contracts/Tenant/Site.cs
@@ -9,6 +9,7 @@
 //------------------------------------------------------------------------------
 
 using System;
+using System.Collections.Generic;
 
 
 namespace Mozu.Api.Contracts.Tenant
@@ -18,43 +19,24 @@ namespace Mozu.Api.Contracts.Tenant
 		///
 		public class Site
 		{
-			///
-			///The unique identifier of the catalog of products used by a site.
-			///
+			public List<TenantAttribute> Attributes { get; set; }
+
 			public int CatalogId { get; set; }
 
 			public string CountryCode { get; set; }
 
-			///
-			///3-letter ISO 4217 standard global currency code. Currently, only "USD" (US Dollar) is supported.
-			///
 			public string CurrencyCode { get; set; }
 
-			///
-			///Properties of the domain that the tenant is associated with such as the domain name, the zone string, audit information (system-supplied and read-only), assignment data, and whether or not the domain is primary or requires a SSL for authentication.
-			///
 			public string Domain { get; set; }
 
 			public int Id { get; set; }
 
-			///
-			///Language used for the entity. Currently, only "en-US" is supported.
-			///
 			public string LocaleCode { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
-			///
-			///The primary custom domain of the site.
-			///
 			public string PrimaryCustomDomain { get; set; }
 
-			///
-			///Unique identifier of the Mozu tenant.
-			///
 			public int TenantId { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Tenant/Tenant.cs b/Mozu.Api/Contracts/Tenant/Tenant.cs
old mode 100644
new mode 100755
index 882a19a4..34e25db8
--- a/Mozu.Api/Contracts/Tenant/Tenant.cs
+++ b/Mozu.Api/Contracts/Tenant/Tenant.cs
@@ -19,34 +19,16 @@ namespace Mozu.Api.Contracts.Tenant
 		///
 		public class Tenant
 		{
-			///
-			///Properties of the domain that the tenant is associated with such as the domain name, the zone string, audit information (system-supplied and read-only), assignment data, and whether or not the domain is primary or requires a SSL for authentication.
-			///
 			public string Domain { get; set; }
 
-			///
-			///Unique identifier of the Mozu tenant.
-			///
 			public int Id { get; set; }
 
-			///
-			///Indicates if the tenant is a development tenant. If true, the tenant represents a collection of master catalogs and catalogs for a development tenant, used by a developer account to test applications and themes.
-			///
 			public bool IsDevTenant { get; set; }
 
-			///
-			///Collection of master catalogs associated with the tenant.
-			///
 			public List<MasterCatalog> MasterCatalogs { get; set; }
 
-			///
-			///The user supplied name that appears in . You can use this field for identification purposes.
-			///
 			public string Name { get; set; }
 
-			///
-			///Collection of sites associated with the tenant.
-			///
 			public List<Site> Sites { get; set; }
 
 		}
diff --git a/Mozu.Api/Contracts/Tenant/TenantAttribute.cs b/Mozu.Api/Contracts/Tenant/TenantAttribute.cs
new file mode 100755
index 00000000..bc317791
--- /dev/null
+++ b/Mozu.Api/Contracts/Tenant/TenantAttribute.cs
@@ -0,0 +1,32 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+
+
+namespace Mozu.Api.Contracts.Tenant
+{
+		public class TenantAttribute
+		{
+			public string CreateBy { get; set; }
+
+			public DateTime CreateDate { get; set; }
+
+			public string Name { get; set; }
+
+			public string UpdateBy { get; set; }
+
+			public DateTime UpdateDate { get; set; }
+
+			public object Value { get; set; }
+
+		}
+
+}
\ No newline at end of file
diff --git a/Mozu.Api/Contracts/Tenant/TenantCollection.cs b/Mozu.Api/Contracts/Tenant/TenantCollection.cs
old mode 100644
new mode 100755
index c654d690..03544628
--- a/Mozu.Api/Contracts/Tenant/TenantCollection.cs
+++ b/Mozu.Api/Contracts/Tenant/TenantCollection.cs
@@ -19,29 +19,14 @@ namespace Mozu.Api.Contracts.Tenant
 		///
 		public class TenantCollection
 		{
-			///
-			///An array list of objects in the returned collection.
-			///
 			public List<Tenant> Items { get; set; }
 
-			///
-			///The number of pages returned based on the startIndex and pageSize values specified. This value is system-supplied and read-only.
-			///
 			public int PageCount { get; set; }
 
-			///
-			///The number of results to display on each page when creating paged results from a query. The maximum value is 200.
-			///
 			public int PageSize { get; set; }
 
-			///
-			///When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.
-			///
 			public int StartIndex { get; set; }
 
-			///
-			///The number of results listed in the query collection, represented by a signed 64-bit (8-byte) integer. This value is system-supplied and read-only.
-			///
 			public int TotalCount { get; set; }
 
 		}
diff --git a/Mozu.Api/Events/IApplicationEvents.cs b/Mozu.Api/Events/IApplicationEvents.cs
old mode 100644
new mode 100755
diff --git a/Mozu.Api/Events/IAttributeEvents.cs b/Mozu.Api/Events/IAttributeEvents.cs
old mode 100644
new mode 100755
diff --git a/Mozu.Api/Events/ICartEvents.cs b/Mozu.Api/Events/ICartEvents.cs
old mode 100644
new mode 100755
diff --git a/Mozu.Api/Events/ICategoryEvents.cs b/Mozu.Api/Events/ICategoryEvents.cs
old mode 100644
new mode 100755
diff --git a/Mozu.Api/Events/ICreditEvents.cs b/Mozu.Api/Events/ICreditEvents.cs
old mode 100644
new mode 100755
diff --git a/Mozu.Api/Events/ICustomerAccountEvents.cs b/Mozu.Api/Events/ICustomerAccountEvents.cs
old mode 100644
new mode 100755
diff --git a/Mozu.Api/Events/ICustomerSegmentEvents.cs b/Mozu.Api/Events/ICustomerSegmentEvents.cs
old mode 100644
new mode 100755
diff --git a/Mozu.Api/Events/IDiscountEvents.cs b/Mozu.Api/Events/IDiscountEvents.cs
old mode 100644
new mode 100755
diff --git a/Mozu.Api/Events/IEmailEvents.cs b/Mozu.Api/Events/IEmailEvents.cs
old mode 100644
new mode 100755
diff --git a/Mozu.Api/Events/IFacetEvents.cs b/Mozu.Api/Events/IFacetEvents.cs
old mode 100644
new mode 100755
diff --git a/Mozu.Api/Events/ILocationTypeEvents.cs b/Mozu.Api/Events/ILocationTypeEvents.cs
old mode 100644
new mode 100755
diff --git a/Mozu.Api/Events/IOrderEvents.cs b/Mozu.Api/Events/IOrderEvents.cs
old mode 100644
new mode 100755
diff --git a/Mozu.Api/Events/IPriceListEntryEvents.cs b/Mozu.Api/Events/IPriceListEntryEvents.cs
old mode 100644
new mode 100755
diff --git a/Mozu.Api/Events/IPriceListEvents.cs b/Mozu.Api/Events/IPriceListEvents.cs
old mode 100644
new mode 100755
diff --git a/Mozu.Api/Events/IProductDraftEvents.cs b/Mozu.Api/Events/IProductDraftEvents.cs
old mode 100644
new mode 100755
diff --git a/Mozu.Api/Events/IProductEvents.cs b/Mozu.Api/Events/IProductEvents.cs
old mode 100644
new mode 100755
diff --git a/Mozu.Api/Events/IProductInventoryEvents.cs b/Mozu.Api/Events/IProductInventoryEvents.cs
old mode 100644
new mode 100755
diff --git a/Mozu.Api/Events/IProductTypeEvents.cs b/Mozu.Api/Events/IProductTypeEvents.cs
old mode 100644
new mode 100755
diff --git a/Mozu.Api/Events/IReturnEvents.cs b/Mozu.Api/Events/IReturnEvents.cs
old mode 100644
new mode 100755
diff --git a/Mozu.Api/Events/ISearchSettingsEvents.cs b/Mozu.Api/Events/ISearchSettingsEvents.cs
old mode 100644
new mode 100755
diff --git a/Mozu.Api/Events/IShipmentEvents.cs b/Mozu.Api/Events/IShipmentEvents.cs
old mode 100644
new mode 100755
diff --git a/Mozu.Api/Events/ISiteEvents.cs b/Mozu.Api/Events/ISiteEvents.cs
old mode 100644
new mode 100755
diff --git a/Mozu.Api/Events/ITenantEvents.cs b/Mozu.Api/Events/ITenantEvents.cs
old mode 100644
new mode 100755
diff --git a/Mozu.Api/Events/IWishListEvents.cs b/Mozu.Api/Events/IWishListEvents.cs
old mode 100644
new mode 100755
diff --git a/Mozu.Api/Events/Topics.cs b/Mozu.Api/Events/Topics.cs
old mode 100644
new mode 100755
diff --git a/Mozu.Api/Logging/DefaultLogger.cs b/Mozu.Api/Logging/DefaultLogger.cs
index 16a97f0a..5e029540 100644
--- a/Mozu.Api/Logging/DefaultLogger.cs
+++ b/Mozu.Api/Logging/DefaultLogger.cs
@@ -26,7 +26,7 @@ public void Warn(object message, Exception ex = null, object properties = null)
 
         public void Debug(object message, Exception ex = null, object properties = null)
         {
-			Console.WriteLine(message);
+			 Console.WriteLine(message);
 		}
 
         public void Error(object message, Exception ex = null, object properties = null)
@@ -36,7 +36,7 @@ public void Error(object message, Exception ex = null, object properties = null)
 
         public void Fatal(object message, Exception ex = null, object properties = null)
         {
-			Console.WriteLine(message);
+			 Console.WriteLine(message);
 		}
     }
 }
diff --git a/Mozu.Api/Mozu.Api.csproj b/Mozu.Api/Mozu.Api.csproj
index 449b8d2a..3035a8ea 100644
--- a/Mozu.Api/Mozu.Api.csproj
+++ b/Mozu.Api/Mozu.Api.csproj
@@ -100,968 +100,1037 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Security\SHA256Generator.cs" />
     <Compile Include="Security\RefreshInterval.cs" />
-    <Compile Include="Clients\Commerce\Admin\LocationClient.cs" />
-    <Compile Include="Clients\Commerce\Admin\LocationTypeClient.cs" />
-    <Compile Include="Clients\Commerce\CartClient.cs" />
-    <Compile Include="Clients\Commerce\Carts\AppliedDiscountClient.cs" />
-    <Compile Include="Clients\Commerce\Carts\CartItemClient.cs" />
-    <Compile Include="Clients\Commerce\Carts\ChangeMessageClient.cs" />
-    <Compile Include="Clients\Commerce\Carts\ExtendedPropertyClient.cs" />
-    <Compile Include="Clients\Commerce\Catalog\Admin\Attributedefinition\AttributeClient.cs" />
-    <Compile Include="Clients\Commerce\Catalog\Admin\Attributedefinition\Attributes\AttributeLocalizedContentClient.cs" />
-    <Compile Include="Clients\Commerce\Catalog\Admin\Attributedefinition\Attributes\AttributeTypeRuleClient.cs" />
-    <Compile Include="Clients\Commerce\Catalog\Admin\Attributedefinition\Attributes\AttributeVocabularyValueClient.cs" />
-    <Compile Include="Clients\Commerce\Catalog\Admin\Attributedefinition\ProductTypeClient.cs" />
-    <Compile Include="Clients\Commerce\Catalog\Admin\Attributedefinition\Producttypes\ProductTypeExtraClient.cs" />
-    <Compile Include="Clients\Commerce\Catalog\Admin\Attributedefinition\Producttypes\ProductTypeOptionClient.cs" />
-    <Compile Include="Clients\Commerce\Catalog\Admin\Attributedefinition\Producttypes\ProductTypePropertyClient.cs" />
-    <Compile Include="Clients\Commerce\Catalog\Admin\Attributedefinition\Producttypes\ProductTypeVariationClient.cs" />
-    <Compile Include="Clients\Commerce\Catalog\Admin\CategoryClient.cs" />
-    <Compile Include="Clients\Commerce\Catalog\Admin\CouponSetClient.cs" />
-    <Compile Include="Clients\Commerce\Catalog\Admin\Couponsets\AssignedDiscountClient.cs" />
-    <Compile Include="Clients\Commerce\Catalog\Admin\Couponsets\CouponClient.cs" />
-    <Compile Include="Clients\Commerce\Catalog\Admin\DiscountClient.cs" />
-    <Compile Include="Clients\Commerce\Catalog\Admin\Discounts\DiscountTargetClient.cs" />
-    <Compile Include="Clients\Commerce\Catalog\Admin\FacetClient.cs" />
-    <Compile Include="Clients\Commerce\Catalog\Admin\LocationInventoryClient.cs" />
-    <Compile Include="Clients\Commerce\Catalog\Admin\MasterCatalogClient.cs" />
-    <Compile Include="Clients\Commerce\Catalog\Admin\PriceListClient.cs" />
-    <Compile Include="Clients\Commerce\Catalog\Admin\Pricelists\PriceListEntryClient.cs" />
-    <Compile Include="Clients\Commerce\Catalog\Admin\ProductClient.cs" />
-    <Compile Include="Clients\Commerce\Catalog\Admin\ProductReservationClient.cs" />
-    <Compile Include="Clients\Commerce\Catalog\Admin\Products\LocationInventoryClient.cs" />
-    <Compile Include="Clients\Commerce\Catalog\Admin\Products\ProductExtraClient.cs" />
-    <Compile Include="Clients\Commerce\Catalog\Admin\Products\ProductOptionClient.cs" />
-    <Compile Include="Clients\Commerce\Catalog\Admin\Products\ProductPropertyClient.cs" />
-    <Compile Include="Clients\Commerce\Catalog\Admin\Products\ProductVariationClient.cs" />
-    <Compile Include="Clients\Commerce\Catalog\Admin\PublishingScopeClient.cs" />
-    <Compile Include="Clients\Commerce\Catalog\Admin\SearchClient.cs" />
-    <Compile Include="Clients\Commerce\Catalog\Admin\SoftAllocationClient.cs" />
-    <Compile Include="Clients\Commerce\Catalog\Storefront\CategoryClient.cs" />
-    <Compile Include="Clients\Commerce\Catalog\Storefront\OrderTaxContextClient.cs" />
-    <Compile Include="Clients\Commerce\Catalog\Storefront\PriceListClient.cs" />
-    <Compile Include="Clients\Commerce\Catalog\Storefront\ProductClient.cs" />
-    <Compile Include="Clients\Commerce\Catalog\Storefront\ProductSearchResultClient.cs" />
-    <Compile Include="Clients\Commerce\Catalog\Storefront\ShippingClient.cs" />
-    <Compile Include="Clients\Commerce\ChannelClient.cs" />
-    <Compile Include="Clients\Commerce\ChannelGroupClient.cs" />
-    <Compile Include="Clients\Commerce\Customer\Accounts\CardClient.cs" />
-    <Compile Include="Clients\Commerce\Customer\Accounts\CustomerAttributeClient.cs" />
-    <Compile Include="Clients\Commerce\Customer\Accounts\CustomerAuditEntryClient.cs" />
-    <Compile Include="Clients\Commerce\Customer\Accounts\CustomerContactClient.cs" />
-    <Compile Include="Clients\Commerce\Customer\Accounts\CustomerNoteClient.cs" />
-    <Compile Include="Clients\Commerce\Customer\Accounts\CustomerPurchaseOrderAccountClient.cs" />
-    <Compile Include="Clients\Commerce\Customer\Accounts\CustomerSegmentClient.cs" />
-    <Compile Include="Clients\Commerce\Customer\Accounts\TransactionClient.cs" />
-    <Compile Include="Clients\Commerce\Customer\AddressValidationRequestClient.cs" />
-    <Compile Include="Clients\Commerce\Customer\Attributedefinition\AttributeClient.cs" />
-    <Compile Include="Clients\Commerce\Customer\CreditClient.cs" />
-    <Compile Include="Clients\Commerce\Customer\Credits\CreditAuditEntryClient.cs" />
-    <Compile Include="Clients\Commerce\Customer\Credits\CreditTransactionClient.cs" />
-    <Compile Include="Clients\Commerce\Customer\CustomerAccountClient.cs" />
-    <Compile Include="Clients\Commerce\Customer\CustomerAuthTicketClient.cs" />
-    <Compile Include="Clients\Commerce\Customer\CustomerSegmentClient.cs" />
-    <Compile Include="Clients\Commerce\Customer\CustomerSetClient.cs" />
-    <Compile Include="Clients\Commerce\Customer\VisitClient.cs" />
-    <Compile Include="Clients\Commerce\InStockNotificationSubscriptionClient.cs" />
-    <Compile Include="Clients\Commerce\LocationClient.cs" />
-    <Compile Include="Clients\Commerce\OrderClient.cs" />
-    <Compile Include="Clients\Commerce\Orders\AdjustmentClient.cs" />
-    <Compile Include="Clients\Commerce\Orders\AppliedDiscountClient.cs" />
-    <Compile Include="Clients\Commerce\Orders\Attributedefinition\AttributeClient.cs" />
-    <Compile Include="Clients\Commerce\Orders\BillingInfoClient.cs" />
-    <Compile Include="Clients\Commerce\Orders\DigitalPackageClient.cs" />
-    <Compile Include="Clients\Commerce\Orders\ExtendedPropertyClient.cs" />
-    <Compile Include="Clients\Commerce\Orders\FulfillmentActionClient.cs" />
-    <Compile Include="Clients\Commerce\Orders\FulfillmentInfoClient.cs" />
-    <Compile Include="Clients\Commerce\Orders\OrderAttributeClient.cs" />
-    <Compile Include="Clients\Commerce\Orders\OrderItemClient.cs" />
-    <Compile Include="Clients\Commerce\Orders\OrderNoteClient.cs" />
-    <Compile Include="Clients\Commerce\Orders\OrderReturnableItemClient.cs" />
-    <Compile Include="Clients\Commerce\Orders\OrderValidationResultClient.cs" />
-    <Compile Include="Clients\Commerce\Orders\PackageClient.cs" />
-    <Compile Include="Clients\Commerce\Orders\PaymentClient.cs" />
-    <Compile Include="Clients\Commerce\Orders\PickupClient.cs" />
-    <Compile Include="Clients\Commerce\Orders\RefundClient.cs" />
-    <Compile Include="Clients\Commerce\Orders\ShipmentClient.cs" />
-    <Compile Include="Clients\Commerce\Payments\FraudScreenClient.cs" />
-    <Compile Include="Clients\Commerce\Payments\PublicCardClient.cs" />
-    <Compile Include="Clients\Commerce\ReturnClient.cs" />
-    <Compile Include="Clients\Commerce\Returns\OrderNoteClient.cs" />
-    <Compile Include="Clients\Commerce\Returns\PackageClient.cs" />
-    <Compile Include="Clients\Commerce\Returns\ShipmentClient.cs" />
-    <Compile Include="Clients\Commerce\Settings\ApplicationClient.cs" />
-    <Compile Include="Clients\Commerce\Settings\CartSettingsClient.cs" />
-    <Compile Include="Clients\Commerce\Settings\Checkout\CustomerCheckoutSettingsClient.cs" />
-    <Compile Include="Clients\Commerce\Settings\Checkout\PaymentSettingsClient.cs" />
-    <Compile Include="Clients\Commerce\Settings\CheckoutSettingsClient.cs" />
-    <Compile Include="Clients\Commerce\Settings\General\CustomRouteSettingsClient.cs" />
-    <Compile Include="Clients\Commerce\Settings\General\TaxableTerritoryClient.cs" />
-    <Compile Include="Clients\Commerce\Settings\GeneralSettingsClient.cs" />
-    <Compile Include="Clients\Commerce\Settings\LocationUsageClient.cs" />
-    <Compile Include="Clients\Commerce\Settings\Shipping\SiteShippingHandlingFeeClient.cs" />
-    <Compile Include="Clients\Commerce\Settings\SiteShippingSettingsClient.cs" />
-    <Compile Include="Clients\Commerce\Shipping\Admin\CarrierConfigurationClient.cs" />
-    <Compile Include="Clients\Commerce\Shipping\Admin\Profiles\HandlingFeeRuleClient.cs" />
-    <Compile Include="Clients\Commerce\Shipping\Admin\Profiles\ShippingInclusionRuleClient.cs" />
-    <Compile Include="Clients\Commerce\Shipping\Admin\Profiles\ShippingStatesClient.cs" />
-    <Compile Include="Clients\Commerce\Shipping\Admin\ShippingProfileClient.cs" />
-    <Compile Include="Clients\Commerce\TargetRuleClient.cs" />
-    <Compile Include="Clients\Commerce\WishlistClient.cs" />
-    <Compile Include="Clients\Commerce\Wishlists\WishlistItemClient.cs" />
-    <Compile Include="Clients\Content\DocumentDraftSummaryClient.cs" />
-    <Compile Include="Clients\Content\DocumentListClient.cs" />
-    <Compile Include="Clients\Content\Documentlists\DocumentClient.cs" />
-    <Compile Include="Clients\Content\Documentlists\DocumentTreeClient.cs" />
-    <Compile Include="Clients\Content\Documentlists\FacetClient.cs" />
-    <Compile Include="Clients\Content\Documentlists\ViewClient.cs" />
-    <Compile Include="Clients\Content\DocumentListTypeClient.cs" />
-    <Compile Include="Clients\Content\DocumentTypeClient.cs" />
-    <Compile Include="Clients\Content\PropertyTypeClient.cs" />
-    <Compile Include="Clients\Content\PublishSetSummaryClient.cs" />
-    <Compile Include="Clients\Event\EventNotificationClient.cs" />
-    <Compile Include="Clients\Event\Push\SubscriptionClient.cs" />
-    <Compile Include="Clients\Event\Push\Subscriptions\EventDeliverySummaryClient.cs" />
-    <Compile Include="Clients\Platform\Adminuser\AdminUserClient.cs" />
-    <Compile Include="Clients\Platform\Adminuser\TenantAdminUserAuthTicketClient.cs" />
-    <Compile Include="Clients\Platform\Appdev\PackageClient.cs" />
-    <Compile Include="Clients\Platform\ApplicationClient.cs" />
-    <Compile Include="Clients\Platform\Applications\AuthTicketClient.cs" />
-    <Compile Include="Clients\Platform\Developer\DeveloperAdminUserAuthTicketClient.cs" />
-    <Compile Include="Clients\Platform\EntityListClient.cs" />
-    <Compile Include="Clients\Platform\Entitylists\EntityClient.cs" />
-    <Compile Include="Clients\Platform\Entitylists\EntityContainerClient.cs" />
-    <Compile Include="Clients\Platform\Entitylists\ListViewClient.cs" />
-    <Compile Include="Clients\Platform\Extensions\CredentialStoreEntryClient.cs" />
-    <Compile Include="Clients\Platform\ReferenceDataClient.cs" />
-    <Compile Include="Clients\Platform\SecureAppDataClient.cs" />
-    <Compile Include="Clients\Platform\SiteDataClient.cs" />
-    <Compile Include="Clients\Platform\TenantClient.cs" />
-    <Compile Include="Clients\Platform\TenantDataClient.cs" />
-    <Compile Include="Clients\Platform\TenantExtensionsClient.cs" />
-    <Compile Include="Clients\Platform\UserDataClient.cs" />
-    <Compile Include="Contracts\AdminUser\DeveloperAccount.cs" />
-    <Compile Include="Contracts\AdminUser\DeveloperAdminUserAuthTicket.cs" />
-    <Compile Include="Contracts\AdminUser\TenantAdminUserAuthTicket.cs" />
-    <Compile Include="Contracts\AppDev\AppAuthInfo.cs" />
-    <Compile Include="Contracts\AppDev\ApplicationAttribute.cs" />
-    <Compile Include="Contracts\AppDev\ApplicationBehavior.cs" />
-    <Compile Include="Contracts\AppDev\ApplicationCapability.cs" />
-    <Compile Include="Contracts\AppDev\ApplicationCapabilityDomain.cs" />
-    <Compile Include="Contracts\AppDev\ApplicationCapabilityDomainValue.cs" />
-    <Compile Include="Contracts\AppDev\ApplicationCapabilityType.cs" />
-    <Compile Include="Contracts\AppDev\ApplicationEntitlement.cs" />
-    <Compile Include="Contracts\AppDev\ApplicationSubscription.cs" />
-    <Compile Include="Contracts\AppDev\ApplicationSummary.cs" />
-    <Compile Include="Contracts\AppDev\ApplicationSummaryCollection.cs" />
-    <Compile Include="Contracts\AppDev\ApplicationTransaction.cs" />
-    <Compile Include="Contracts\AppDev\ApplicationVersionsCollection.cs" />
-    <Compile Include="Contracts\AppDev\AppVersion.cs" />
-    <Compile Include="Contracts\AppDev\Attribute.cs" />
-    <Compile Include="Contracts\AppDev\AuthTicket.cs" />
-    <Compile Include="Contracts\AppDev\AuthTicketRequest.cs" />
-    <Compile Include="Contracts\AppDev\Event.cs" />
-    <Compile Include="Contracts\AppDev\FileMetadata.cs" />
-    <Compile Include="Contracts\AppDev\FolderMetadata.cs" />
-    <Compile Include="Contracts\AppDev\Package.cs" />
-    <Compile Include="Contracts\AppDev\PackageCollection.cs" />
-    <Compile Include="Contracts\AppDev\PackageNamesCollection.cs" />
-    <Compile Include="Contracts\AppDev\PackageRequest.cs" />
-    <Compile Include="Contracts\AppDev\PackageSummary.cs" />
-    <Compile Include="Contracts\AppDev\PackageSummaryCollection.cs" />
-    <Compile Include="Contracts\AppDev\RenameInfo.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Carts\Cart.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Carts\CartChangeMessageCollection.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Carts\CartItem.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Carts\CartItemCollection.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Carts\CartMessage.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Carts\CartSummary.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Channels\Channel.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Channels\ChannelCollection.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Channels\ChannelGroup.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Channels\ChannelGroupCollection.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Commerce\Adjustment.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Commerce\ChangeMessage.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Commerce\CommerceUnitPrice.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Commerce\ExtendedProperty.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Commerce\PackageMeasurements.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Discounts\AppliedDiscount.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Discounts\AppliedLineItemProductDiscount.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Discounts\AppliedLineItemShippingDiscount.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Discounts\Discount.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Discounts\InvalidCoupon.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Discounts\ShippingDiscount.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Fulfillment\DigitalPackage.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Fulfillment\DigitalPackageItem.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Fulfillment\FulfillmentAction.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Fulfillment\FulfillmentInfo.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Fulfillment\Package.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Fulfillment\PackageItem.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Fulfillment\Pickup.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Fulfillment\PickupItem.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Fulfillment\Shipment.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Fulfillment\ShippingRate.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Orders\DigitalWallet.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Orders\Order.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Orders\OrderAction.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Orders\OrderAttribute.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Orders\OrderCollection.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Orders\OrderItem.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Orders\OrderItemCollection.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Orders\OrderNote.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Orders\OrderReturnableItem.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Orders\OrderReturnableItemCollection.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Orders\OrderValidationMessage.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Orders\OrderValidationResult.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Orders\ShopperNotes.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Payments\BillingInfo.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Payments\CheckPayment.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Payments\Payment.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Payments\PaymentAction.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Payments\PaymentCard.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Payments\PaymentCollection.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Payments\PaymentGatewayInteraction.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Payments\PaymentGatewayResponseData.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Payments\PaymentInteraction.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Payments\PurchaseOrderCustomField.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Payments\PurchaseOrderPayment.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Payments\PurchaseOrderPaymentTerm.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Products\BundledProduct.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Products\Category.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Products\Product.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Products\ProductOption.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Products\ProductPrice.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Products\ProductProperty.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Products\ProductPropertyValue.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Refunds\Refund.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Returns\ReasonCollection.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Returns\Return.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Returns\ReturnAction.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Returns\ReturnBundle.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Returns\ReturnCollection.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Returns\ReturnItem.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Returns\ReturnItemCollection.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Returns\ReturnItemSpecifier.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Returns\ReturnReason.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Wishlists\Wishlist.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Wishlists\WishlistCollection.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Wishlists\WishlistItem.cs" />
-    <Compile Include="Contracts\CommerceRuntime\Wishlists\WishlistItemCollection.cs" />
-    <Compile Include="Contracts\Content\ActiveDateRange.cs" />
-    <Compile Include="Contracts\Content\AddOrDeletePublishItem.cs" />
-    <Compile Include="Contracts\Content\Document.cs" />
-    <Compile Include="Contracts\Content\DocumentCollection.cs" />
-    <Compile Include="Contracts\Content\DocumentDraftSummary.cs" />
-    <Compile Include="Contracts\Content\DocumentDraftSummaryPagedCollection.cs" />
-    <Compile Include="Contracts\Content\DocumentInstallation.cs" />
-    <Compile Include="Contracts\Content\DocumentList.cs" />
-    <Compile Include="Contracts\Content\DocumentListCollection.cs" />
-    <Compile Include="Contracts\Content\DocumentListType.cs" />
-    <Compile Include="Contracts\Content\DocumentListTypeCollection.cs" />
-    <Compile Include="Contracts\Content\DocumentType.cs" />
-    <Compile Include="Contracts\Content\DocumentTypeCollection.cs" />
-    <Compile Include="Contracts\Content\Facet.cs" />
-    <Compile Include="Contracts\Content\Property.cs" />
-    <Compile Include="Contracts\Content\PropertyType.cs" />
-    <Compile Include="Contracts\Content\PropertyTypeCollection.cs" />
-    <Compile Include="Contracts\Content\PublishSetSummary.cs" />
-    <Compile Include="Contracts\Content\PublishSetSummaryPagedCollection.cs" />
-    <Compile Include="Contracts\Content\View.cs" />
-    <Compile Include="Contracts\Content\ViewField.cs" />
-    <Compile Include="Contracts\Core\Address.cs" />
-    <Compile Include="Contracts\Core\AuditInfo.cs" />
-    <Compile Include="Contracts\Core\Behavior.cs" />
-    <Compile Include="Contracts\Core\BehaviorCategory.cs" />
-    <Compile Include="Contracts\Core\BehaviorCategoryCollection.cs" />
-    <Compile Include="Contracts\Core\BehaviorCollection.cs" />
-    <Compile Include="Contracts\Core\Contact.cs" />
-    <Compile Include="Contracts\Core\Extensible\Attribute.cs" />
-    <Compile Include="Contracts\Core\Extensible\AttributeCollection.cs" />
-    <Compile Include="Contracts\Core\Extensible\AttributeLocalizedContent.cs" />
-    <Compile Include="Contracts\Core\Extensible\AttributeMetadataItem.cs" />
-    <Compile Include="Contracts\Core\Extensible\AttributeValidation.cs" />
-    <Compile Include="Contracts\Core\Extensible\AttributeValueLocalizedContent.cs" />
-    <Compile Include="Contracts\Core\Extensible\AttributeVocabularyValue.cs" />
-    <Compile Include="Contracts\Core\Measurement.cs" />
-    <Compile Include="Contracts\Core\Phone.cs" />
-    <Compile Include="Contracts\Core\ThirdParty\ActiveShippingCountry.cs" />
-    <Compile Include="Contracts\Core\ThirdParty\InitializablePropertyValue.cs" />
-    <Compile Include="Contracts\Core\ThirdParty\InitializableShippingCountryPropertyValue.cs" />
-    <Compile Include="Contracts\Core\ThirdParty\OperationUrl.cs" />
-    <Compile Include="Contracts\Core\User.cs" />
-    <Compile Include="Contracts\Core\UserAuthInfo.cs" />
-    <Compile Include="Contracts\Core\UserProfile.cs" />
-    <Compile Include="Contracts\Core\UserRole.cs" />
-    <Compile Include="Contracts\Core\UserScope.cs" />
-    <Compile Include="Contracts\Core\UserSystemData.cs" />
-    <Compile Include="Contracts\Customer\AccountPasswordInfo.cs" />
-    <Compile Include="Contracts\Customer\AccountPasswordInfoCollection.cs" />
-    <Compile Include="Contracts\Customer\AddressValidationRequest.cs" />
-    <Compile Include="Contracts\Customer\AddressValidationResponse.cs" />
-    <Compile Include="Contracts\Customer\Card.cs" />
-    <Compile Include="Contracts\Customer\CardCollection.cs" />
-    <Compile Include="Contracts\Customer\ChangePasswordResult.cs" />
-    <Compile Include="Contracts\Customer\ChangePasswordResultCollection.cs" />
-    <Compile Include="Contracts\Customer\CommerceSummary.cs" />
-    <Compile Include="Contracts\Customer\ContactType.cs" />
-    <Compile Include="Contracts\Customer\Credit\Credit.cs" />
-    <Compile Include="Contracts\Customer\Credit\CreditAuditEntry.cs" />
-    <Compile Include="Contracts\Customer\Credit\CreditAuditEntryCollection.cs" />
-    <Compile Include="Contracts\Customer\Credit\CreditCollection.cs" />
-    <Compile Include="Contracts\Customer\Credit\CreditTransaction.cs" />
-    <Compile Include="Contracts\Customer\Credit\CreditTransactionCollection.cs" />
-    <Compile Include="Contracts\Customer\CurrencyAmount.cs" />
-    <Compile Include="Contracts\Customer\CustomerAccount.cs" />
-    <Compile Include="Contracts\Customer\CustomerAccountAndAuthInfo.cs" />
-    <Compile Include="Contracts\Customer\CustomerAccountCollection.cs" />
-    <Compile Include="Contracts\Customer\CustomerAttribute.cs" />
-    <Compile Include="Contracts\Customer\CustomerAttributeCollection.cs" />
-    <Compile Include="Contracts\Customer\CustomerAuditEntry.cs" />
-    <Compile Include="Contracts\Customer\CustomerAuditEntryCollection.cs" />
-    <Compile Include="Contracts\Customer\CustomerAuthTicket.cs" />
-    <Compile Include="Contracts\Customer\CustomerContact.cs" />
-    <Compile Include="Contracts\Customer\CustomerContactCollection.cs" />
-    <Compile Include="Contracts\Customer\CustomerLoginInfo.cs" />
-    <Compile Include="Contracts\Customer\CustomerNote.cs" />
-    <Compile Include="Contracts\Customer\CustomerNoteCollection.cs" />
-    <Compile Include="Contracts\Customer\CustomerPurchaseOrderAccount.cs" />
-    <Compile Include="Contracts\Customer\CustomerPurchaseOrderAccountCollection.cs" />
-    <Compile Include="Contracts\Customer\CustomerPurchaseOrderPaymentTerm.cs" />
-    <Compile Include="Contracts\Customer\CustomerSegment.cs" />
-    <Compile Include="Contracts\Customer\CustomerSegmentCollection.cs" />
-    <Compile Include="Contracts\Customer\CustomerSet.cs" />
-    <Compile Include="Contracts\Customer\CustomerSetAggregateInfo.cs" />
-    <Compile Include="Contracts\Customer\CustomerSetCollection.cs" />
-    <Compile Include="Contracts\Customer\CustomerSetSite.cs" />
-    <Compile Include="Contracts\Customer\CustomerUserAuthInfo.cs" />
-    <Compile Include="Contracts\Customer\InStockNotificationSubscription.cs" />
-    <Compile Include="Contracts\Customer\InStockNotificationSubscriptionCollection.cs" />
-    <Compile Include="Contracts\Customer\LoginState.cs" />
-    <Compile Include="Contracts\Customer\PasswordInfo.cs" />
-    <Compile Include="Contracts\Customer\PurchaseOrderTransaction.cs" />
-    <Compile Include="Contracts\Customer\PurchaseOrderTransactionCollection.cs" />
-    <Compile Include="Contracts\Customer\ResetPasswordInfo.cs" />
-    <Compile Include="Contracts\Customer\Transaction.cs" />
-    <Compile Include="Contracts\Customer\Visit.cs" />
-    <Compile Include="Contracts\Customer\VisitCollection.cs" />
-    <Compile Include="Contracts\Event\Event.cs" />
-    <Compile Include="Contracts\Event\EventCollection.cs" />
-    <Compile Include="Contracts\Event\EventDeliveryAttempt.cs" />
-    <Compile Include="Contracts\Event\EventDeliverySummary.cs" />
-    <Compile Include="Contracts\Event\EventDeliverySummaryCollection.cs" />
-    <Compile Include="Contracts\Event\EventExtendedProperty.cs" />
-    <Compile Include="Contracts\Event\EventSummary.cs" />
-    <Compile Include="Contracts\Event\HttpStatus.cs" />
-    <Compile Include="Contracts\Event\SubscribingSite.cs" />
-    <Compile Include="Contracts\Event\SubscribingTenant.cs" />
-    <Compile Include="Contracts\Event\Subscription.cs" />
-    <Compile Include="Contracts\Event\SubscriptionCollection.cs" />
-    <Compile Include="Contracts\InstalledApplications\Application.cs" />
-    <Compile Include="Contracts\InstalledApplications\Capability.cs" />
-    <Compile Include="Contracts\InstalledApplications\CredentialStoreEntry.cs" />
-    <Compile Include="Contracts\InstalledApplications\CustomFunction.cs" />
-    <Compile Include="Contracts\InstalledApplications\CustomFunctionsForAction.cs" />
-    <Compile Include="Contracts\InstalledApplications\CustomFunctionsForContext.cs" />
-    <Compile Include="Contracts\InstalledApplications\ExtensionConfiguration.cs" />
-    <Compile Include="Contracts\InstalledApplications\TenantExtensions.cs" />
-    <Compile Include="Contracts\Location\Coordinates.cs" />
-    <Compile Include="Contracts\Location\FulfillmentType.cs" />
-    <Compile Include="Contracts\Location\Hours.cs" />
-    <Compile Include="Contracts\Location\Location.cs" />
-    <Compile Include="Contracts\Location\LocationCollection.cs" />
-    <Compile Include="Contracts\Location\LocationType.cs" />
-    <Compile Include="Contracts\Location\LocationUsage.cs" />
-    <Compile Include="Contracts\Location\LocationUsageCollection.cs" />
-    <Compile Include="Contracts\Location\RegularHours.cs" />
-    <Compile Include="Contracts\Location\ShippingOriginContact.cs" />
-    <Compile Include="Contracts\MZDB\EntityCollection.cs" />
-    <Compile Include="Contracts\MZDB\EntityContainer.cs" />
-    <Compile Include="Contracts\MZDB\EntityContainerCollection.cs" />
-    <Compile Include="Contracts\MZDB\EntityList.cs" />
-    <Compile Include="Contracts\MZDB\EntityListCollection.cs" />
-    <Compile Include="Contracts\MZDB\IndexedProperty.cs" />
-    <Compile Include="Contracts\MZDB\ListView.cs" />
-    <Compile Include="Contracts\MZDB\ListViewCollection.cs" />
-    <Compile Include="Contracts\MZDB\ListViewField.cs" />
-    <Compile Include="Contracts\PaymentService\Address.cs" />
-    <Compile Include="Contracts\PaymentService\Contact.cs" />
-    <Compile Include="Contracts\PaymentService\CustomData.cs" />
-    <Compile Include="Contracts\PaymentService\FraudScreenResponseData.cs" />
-    <Compile Include="Contracts\PaymentService\GatewayAccount.cs" />
-    <Compile Include="Contracts\PaymentService\GatewayCredentialFieldDefinition.cs" />
-    <Compile Include="Contracts\PaymentService\GatewayCredentialFieldValue.cs" />
-    <Compile Include="Contracts\PaymentService\GatewayDefinition.cs" />
-    <Compile Include="Contracts\PaymentService\OrderItem.cs" />
-    <Compile Include="Contracts\PaymentService\PreAuthorizeDefinition.cs" />
-    <Compile Include="Contracts\PaymentService\PreAuthorizeTransactionTypeDataContract.cs" />
-    <Compile Include="Contracts\PaymentService\Product.cs" />
-    <Compile Include="Contracts\PaymentService\PublicCard.cs" />
-    <Compile Include="Contracts\PaymentService\Request\FraudScreenRequest.cs" />
-    <Compile Include="Contracts\PaymentService\Response\FraudScreen.cs" />
-    <Compile Include="Contracts\PaymentService\Response\SyncResponse.cs" />
-    <Compile Include="Contracts\PaymentService\SupportedCard.cs" />
-    <Compile Include="Contracts\PricingRuntime\ItemTaxContext.cs" />
-    <Compile Include="Contracts\PricingRuntime\OrderTaxContext.cs" />
-    <Compile Include="Contracts\PricingRuntime\ProductAttribute.cs" />
-    <Compile Include="Contracts\PricingRuntime\ProductProperty.cs" />
-    <Compile Include="Contracts\PricingRuntime\ProductPropertyValue.cs" />
-    <Compile Include="Contracts\PricingRuntime\TaxableLineItem.cs" />
-    <Compile Include="Contracts\PricingRuntime\TaxableOrder.cs" />
-    <Compile Include="Contracts\PricingRuntime\TaxAttribute.cs" />
-    <Compile Include="Contracts\PricingRuntime\TaxContext.cs" />
-    <Compile Include="Contracts\PricingRuntime\ThirdParty\ItemTaxContext.cs" />
-    <Compile Include="Contracts\PricingRuntime\ThirdParty\OrderTaxContext.cs" />
-    <Compile Include="Contracts\PricingRuntime\ThirdParty\TaxableOrder.cs" />
-    <Compile Include="Contracts\PricingRuntime\ThirdParty\TaxContext.cs" />
-    <Compile Include="Contracts\ProductAdmin\ActiveDateRange.cs" />
-    <Compile Include="Contracts\ProductAdmin\AssignedDiscount.cs" />
-    <Compile Include="Contracts\ProductAdmin\Attribute.cs" />
-    <Compile Include="Contracts\ProductAdmin\AttributeCollection.cs" />
-    <Compile Include="Contracts\ProductAdmin\AttributeInProductType.cs" />
-    <Compile Include="Contracts\ProductAdmin\AttributeInProductTypeDisplayInfo.cs" />
-    <Compile Include="Contracts\ProductAdmin\AttributeLocalizedContent.cs" />
-    <Compile Include="Contracts\ProductAdmin\AttributeMetadataItem.cs" />
-    <Compile Include="Contracts\ProductAdmin\AttributeSearchSettings.cs" />
-    <Compile Include="Contracts\ProductAdmin\AttributeTypeRule.cs" />
-    <Compile Include="Contracts\ProductAdmin\AttributeTypeRuleCollection.cs" />
-    <Compile Include="Contracts\ProductAdmin\AttributeValidation.cs" />
-    <Compile Include="Contracts\ProductAdmin\AttributeVocabularyValue.cs" />
-    <Compile Include="Contracts\ProductAdmin\AttributeVocabularyValueDisplayInfo.cs" />
-    <Compile Include="Contracts\ProductAdmin\AttributeVocabularyValueInProductType.cs" />
-    <Compile Include="Contracts\ProductAdmin\AttributeVocabularyValueLocalizedContent.cs" />
-    <Compile Include="Contracts\ProductAdmin\BundledProduct.cs" />
-    <Compile Include="Contracts\ProductAdmin\Category.cs" />
-    <Compile Include="Contracts\ProductAdmin\CategoryCollection.cs" />
-    <Compile Include="Contracts\ProductAdmin\CategoryDiscountCondition.cs" />
-    <Compile Include="Contracts\ProductAdmin\CategoryLocalizedContent.cs" />
-    <Compile Include="Contracts\ProductAdmin\CategoryLocalizedImage.cs" />
-    <Compile Include="Contracts\ProductAdmin\CategoryPagedCollection.cs" />
-    <Compile Include="Contracts\ProductAdmin\Coupon.cs" />
-    <Compile Include="Contracts\ProductAdmin\CouponCollection.cs" />
-    <Compile Include="Contracts\ProductAdmin\CouponSet.cs" />
-    <Compile Include="Contracts\ProductAdmin\CouponSetCollection.cs" />
-    <Compile Include="Contracts\ProductAdmin\CustomerSegment.cs" />
-    <Compile Include="Contracts\ProductAdmin\Discount.cs" />
-    <Compile Include="Contracts\ProductAdmin\DiscountCollection.cs" />
-    <Compile Include="Contracts\ProductAdmin\DiscountCondition.cs" />
-    <Compile Include="Contracts\ProductAdmin\DiscountLocalizedContent.cs" />
-    <Compile Include="Contracts\ProductAdmin\DiscountTarget.cs" />
-    <Compile Include="Contracts\ProductAdmin\DynamicExpression.cs" />
-    <Compile Include="Contracts\ProductAdmin\Expression.cs" />
-    <Compile Include="Contracts\ProductAdmin\Facet.cs" />
-    <Compile Include="Contracts\ProductAdmin\FacetRangeQuery.cs" />
-    <Compile Include="Contracts\ProductAdmin\FacetSet.cs" />
-    <Compile Include="Contracts\ProductAdmin\FacetSource.cs" />
-    <Compile Include="Contracts\ProductAdmin\FacetValidity.cs" />
-    <Compile Include="Contracts\ProductAdmin\LocationInventory.cs" />
-    <Compile Include="Contracts\ProductAdmin\LocationInventoryAdjustment.cs" />
-    <Compile Include="Contracts\ProductAdmin\LocationInventoryCollection.cs" />
-    <Compile Include="Contracts\ProductAdmin\MasterCatalog.cs" />
-    <Compile Include="Contracts\ProductAdmin\MasterCatalogCollection.cs" />
-    <Compile Include="Contracts\ProductAdmin\PriceList.cs" />
-    <Compile Include="Contracts\ProductAdmin\PriceListCollection.cs" />
-    <Compile Include="Contracts\ProductAdmin\PriceListEntry.cs" />
-    <Compile Include="Contracts\ProductAdmin\PriceListEntryCollection.cs" />
-    <Compile Include="Contracts\ProductAdmin\PriceListEntryExtra.cs" />
-    <Compile Include="Contracts\ProductAdmin\PriceListEntryPrice.cs" />
-    <Compile Include="Contracts\ProductAdmin\Product.cs" />
-    <Compile Include="Contracts\ProductAdmin\ProductCategory.cs" />
-    <Compile Include="Contracts\ProductAdmin\ProductCodeRename.cs" />
-    <Compile Include="Contracts\ProductAdmin\ProductCollection.cs" />
-    <Compile Include="Contracts\ProductAdmin\ProductCost.cs" />
-    <Compile Include="Contracts\ProductAdmin\ProductDiscountCondition.cs" />
-    <Compile Include="Contracts\ProductAdmin\ProductExtra.cs" />
-    <Compile Include="Contracts\ProductAdmin\ProductExtraValue.cs" />
-    <Compile Include="Contracts\ProductAdmin\ProductExtraValueDeltaPrice.cs" />
-    <Compile Include="Contracts\ProductAdmin\ProductInCatalogInfo.cs" />
-    <Compile Include="Contracts\ProductAdmin\ProductInventoryInfo.cs" />
-    <Compile Include="Contracts\ProductAdmin\ProductLocalizedContent.cs" />
-    <Compile Include="Contracts\ProductAdmin\ProductLocalizedImage.cs" />
-    <Compile Include="Contracts\ProductAdmin\ProductLocalizedSEOContent.cs" />
-    <Compile Include="Contracts\ProductAdmin\ProductOption.cs" />
-    <Compile Include="Contracts\ProductAdmin\ProductOptionValue.cs" />
-    <Compile Include="Contracts\ProductAdmin\ProductPrice.cs" />
-    <Compile Include="Contracts\ProductAdmin\ProductPricingBehaviorInfo.cs" />
-    <Compile Include="Contracts\ProductAdmin\ProductProperty.cs" />
-    <Compile Include="Contracts\ProductAdmin\ProductPropertyValue.cs" />
-    <Compile Include="Contracts\ProductAdmin\ProductPropertyValueLocalizedContent.cs" />
-    <Compile Include="Contracts\ProductAdmin\ProductPublishingInfo.cs" />
-    <Compile Include="Contracts\ProductAdmin\ProductReservation.cs" />
-    <Compile Include="Contracts\ProductAdmin\ProductReservationCollection.cs" />
-    <Compile Include="Contracts\ProductAdmin\ProductSupplierInfo.cs" />
-    <Compile Include="Contracts\ProductAdmin\ProductType.cs" />
-    <Compile Include="Contracts\ProductAdmin\ProductTypeCollection.cs" />
-    <Compile Include="Contracts\ProductAdmin\ProductVariation.cs" />
-    <Compile Include="Contracts\ProductAdmin\ProductVariationCollection.cs" />
-    <Compile Include="Contracts\ProductAdmin\ProductVariationDeltaPrice.cs" />
-    <Compile Include="Contracts\ProductAdmin\ProductVariationFixedPrice.cs" />
-    <Compile Include="Contracts\ProductAdmin\ProductVariationOption.cs" />
-    <Compile Include="Contracts\ProductAdmin\ProductVariationPagedCollection.cs" />
-    <Compile Include="Contracts\ProductAdmin\PublishingScope.cs" />
-    <Compile Include="Contracts\ProductAdmin\PublishSet.cs" />
-    <Compile Include="Contracts\ProductAdmin\PublishSetCollection.cs" />
-    <Compile Include="Contracts\ProductAdmin\Search\SearchSynonymSettings.cs" />
-    <Compile Include="Contracts\ProductAdmin\Search\SearchTuningRule.cs" />
-    <Compile Include="Contracts\ProductAdmin\Search\SearchTuningRuleCollection.cs" />
-    <Compile Include="Contracts\ProductAdmin\Search\SearchTuningRuleFilter.cs" />
-    <Compile Include="Contracts\ProductAdmin\Search\SearchTuningRuleSortFields.cs" />
-    <Compile Include="Contracts\ProductAdmin\Search\SynonymDefinition.cs" />
-    <Compile Include="Contracts\ProductAdmin\Search\SynonymDefinitionCollection.cs" />
-    <Compile Include="Contracts\ProductAdmin\Search\SynonymDefinitionPagedCollection.cs" />
-    <Compile Include="Contracts\ProductAdmin\SearchSettings.cs" />
-    <Compile Include="Contracts\ProductAdmin\SiteSearchKeywordRelevancySettings.cs" />
-    <Compile Include="Contracts\ProductAdmin\SiteSearchPhraseRelevancySettings.cs" />
-    <Compile Include="Contracts\ProductAdmin\SiteSearchRelevancyCustomField.cs" />
-    <Compile Include="Contracts\ProductAdmin\SiteSearchSettings.cs" />
-    <Compile Include="Contracts\ProductAdmin\SoftAllocation.cs" />
-    <Compile Include="Contracts\ProductAdmin\SoftAllocationCollection.cs" />
-    <Compile Include="Contracts\ProductAdmin\SoftAllocationRenew.cs" />
-    <Compile Include="Contracts\ProductAdmin\TargetedCategory.cs" />
-    <Compile Include="Contracts\ProductAdmin\TargetedProduct.cs" />
-    <Compile Include="Contracts\ProductAdmin\TargetedShippingMethod.cs" />
-    <Compile Include="Contracts\ProductAdmin\TargetedShippingZone.cs" />
-    <Compile Include="Contracts\ProductRuntime\AppliedDiscount.cs" />
-    <Compile Include="Contracts\ProductRuntime\AttributeDetail.cs" />
-    <Compile Include="Contracts\ProductRuntime\AttributeValidation.cs" />
-    <Compile Include="Contracts\ProductRuntime\AttributeVocabularyValueDisplayInfo.cs" />
-    <Compile Include="Contracts\ProductRuntime\BundledProduct.cs" />
-    <Compile Include="Contracts\ProductRuntime\BundledProductSummary.cs" />
-    <Compile Include="Contracts\ProductRuntime\Category.cs" />
-    <Compile Include="Contracts\ProductRuntime\CategoryCollection.cs" />
-    <Compile Include="Contracts\ProductRuntime\CategoryContent.cs" />
-    <Compile Include="Contracts\ProductRuntime\CategoryImage.cs" />
-    <Compile Include="Contracts\ProductRuntime\CategoryPagedCollection.cs" />
-    <Compile Include="Contracts\ProductRuntime\ConfiguredProduct.cs" />
-    <Compile Include="Contracts\ProductRuntime\Discount.cs" />
-    <Compile Include="Contracts\ProductRuntime\DiscountSelections.cs" />
-    <Compile Include="Contracts\ProductRuntime\DiscountValidationSummary.cs" />
-    <Compile Include="Contracts\ProductRuntime\Facet.cs" />
-    <Compile Include="Contracts\ProductRuntime\FacetValue.cs" />
-    <Compile Include="Contracts\ProductRuntime\LocationInventory.cs" />
-    <Compile Include="Contracts\ProductRuntime\LocationInventoryCollection.cs" />
-    <Compile Include="Contracts\ProductRuntime\LocationInventoryQuery.cs" />
-    <Compile Include="Contracts\ProductRuntime\PackageMeasurements.cs" />
-    <Compile Include="Contracts\ProductRuntime\PriceList.cs" />
-    <Compile Include="Contracts\ProductRuntime\PriceListNode.cs" />
-    <Compile Include="Contracts\ProductRuntime\Product.cs" />
-    <Compile Include="Contracts\ProductRuntime\ProductCollection.cs" />
-    <Compile Include="Contracts\ProductRuntime\ProductContent.cs" />
-    <Compile Include="Contracts\ProductRuntime\ProductCost.cs" />
-    <Compile Include="Contracts\ProductRuntime\ProductCostCollection.cs" />
-    <Compile Include="Contracts\ProductRuntime\ProductCostQuery.cs" />
-    <Compile Include="Contracts\ProductRuntime\ProductImage.cs" />
-    <Compile Include="Contracts\ProductRuntime\ProductInventoryInfo.cs" />
-    <Compile Include="Contracts\ProductRuntime\ProductOption.cs" />
-    <Compile Include="Contracts\ProductRuntime\ProductOptionSelection.cs" />
-    <Compile Include="Contracts\ProductRuntime\ProductOptionSelections.cs" />
-    <Compile Include="Contracts\ProductRuntime\ProductOptionValue.cs" />
-    <Compile Include="Contracts\ProductRuntime\ProductPrice.cs" />
-    <Compile Include="Contracts\ProductRuntime\ProductPriceRange.cs" />
-    <Compile Include="Contracts\ProductRuntime\ProductPricingBehaviorInfo.cs" />
-    <Compile Include="Contracts\ProductRuntime\ProductProperty.cs" />
-    <Compile Include="Contracts\ProductRuntime\ProductPropertyValue.cs" />
-    <Compile Include="Contracts\ProductRuntime\ProductPurchasableState.cs" />
-    <Compile Include="Contracts\ProductRuntime\ProductSearchRandomAccessCursor.cs" />
-    <Compile Include="Contracts\ProductRuntime\ProductSearchResult.cs" />
-    <Compile Include="Contracts\ProductRuntime\ProductValidationSummary.cs" />
-    <Compile Include="Contracts\ProductRuntime\ProductVolumePrice.cs" />
-    <Compile Include="Contracts\ProductRuntime\ResolvedPriceList.cs" />
-    <Compile Include="Contracts\ProductRuntime\SearchSuggestion.cs" />
-    <Compile Include="Contracts\ProductRuntime\SearchSuggestionGroup.cs" />
-    <Compile Include="Contracts\ProductRuntime\SearchSuggestionResult.cs" />
-    <Compile Include="Contracts\ProductRuntime\SolrDebugInfo.cs" />
-    <Compile Include="Contracts\ProductRuntime\ValidationMessage.cs" />
-    <Compile Include="Contracts\ProductRuntime\VariationOption.cs" />
-    <Compile Include="Contracts\ProductRuntime\VariationSummary.cs" />
-    <Compile Include="Contracts\Reference\AddressSchema.cs" />
-    <Compile Include="Contracts\Reference\AddressSchemaCollection.cs" />
-    <Compile Include="Contracts\Reference\ContentLocale.cs" />
-    <Compile Include="Contracts\Reference\ContentLocaleCollection.cs" />
-    <Compile Include="Contracts\Reference\Country.cs" />
-    <Compile Include="Contracts\Reference\CountryCollection.cs" />
-    <Compile Include="Contracts\Reference\CountryWithStates.cs" />
-    <Compile Include="Contracts\Reference\CountryWithStatesCollection.cs" />
-    <Compile Include="Contracts\Reference\Currency.cs" />
-    <Compile Include="Contracts\Reference\CurrencyCollection.cs" />
-    <Compile Include="Contracts\Reference\Field.cs" />
-    <Compile Include="Contracts\Reference\FieldData.cs" />
-    <Compile Include="Contracts\Reference\State.cs" />
-    <Compile Include="Contracts\Reference\TimeZone.cs" />
-    <Compile Include="Contracts\Reference\TimeZoneCollection.cs" />
-    <Compile Include="Contracts\Reference\TopLevelDomainCollection.cs" />
-    <Compile Include="Contracts\Reference\UnitOfMeasure.cs" />
-    <Compile Include="Contracts\Reference\UnitOfMeasureCollection.cs" />
-    <Compile Include="Contracts\ShippingAdmin\CarrierConfiguration.cs" />
-    <Compile Include="Contracts\ShippingAdmin\CarrierConfigurationCollection.cs" />
-    <Compile Include="Contracts\ShippingAdmin\CustomTableRate.cs" />
-    <Compile Include="Contracts\ShippingAdmin\CustomTableRateContent.cs" />
-    <Compile Include="Contracts\ShippingAdmin\LocalizableString.cs" />
-    <Compile Include="Contracts\ShippingAdmin\Profile\HandlingFeeRule.cs" />
-    <Compile Include="Contracts\ShippingAdmin\Profile\HandlingFeeRuleCollection.cs" />
-    <Compile Include="Contracts\ShippingAdmin\Profile\ShippingInclusionRule.cs" />
-    <Compile Include="Contracts\ShippingAdmin\Profile\ShippingInclusionRuleCollection.cs" />
-    <Compile Include="Contracts\ShippingAdmin\Profile\ShippingProfile.cs" />
-    <Compile Include="Contracts\ShippingAdmin\Profile\ShippingProfileCollection.cs" />
-    <Compile Include="Contracts\ShippingAdmin\Profile\ShippingStates.cs" />
-    <Compile Include="Contracts\ShippingAdmin\Profile\State.cs" />
-    <Compile Include="Contracts\ShippingAdmin\ServiceType.cs" />
-    <Compile Include="Contracts\ShippingAdmin\ServiceTypeLocalizedContent.cs" />
-    <Compile Include="Contracts\ShippingAdmin\Setting.cs" />
-    <Compile Include="Contracts\ShippingAdmin\TargetRule.cs" />
-    <Compile Include="Contracts\ShippingAdmin\TargetRuleCollection.cs" />
-    <Compile Include="Contracts\ShippingRuntime\CarrierRatesResponse.cs" />
-    <Compile Include="Contracts\ShippingRuntime\Category.cs" />
-    <Compile Include="Contracts\ShippingRuntime\CustomAttribute.cs" />
-    <Compile Include="Contracts\ShippingRuntime\ItemMeasurements.cs" />
-    <Compile Include="Contracts\ShippingRuntime\ProductOption.cs" />
-    <Compile Include="Contracts\ShippingRuntime\ProductProperty.cs" />
-    <Compile Include="Contracts\ShippingRuntime\ProductSummary.cs" />
-    <Compile Include="Contracts\ShippingRuntime\RateRequest.cs" />
-    <Compile Include="Contracts\ShippingRuntime\RateRequestAttribute.cs" />
-    <Compile Include="Contracts\ShippingRuntime\RateRequestItem.cs" />
-    <Compile Include="Contracts\ShippingRuntime\RatesResponse.cs" />
-    <Compile Include="Contracts\ShippingRuntime\ShippingItemRate.cs" />
-    <Compile Include="Contracts\ShippingRuntime\ShippingRate.cs" />
-    <Compile Include="Contracts\ShippingRuntime\ShippingRateLocalizedContent.cs" />
-    <Compile Include="Contracts\ShippingRuntime\ShippingRateValidationMessage.cs" />
-    <Compile Include="Contracts\SiteSettings\Application\Application.cs" />
-    <Compile Include="Contracts\SiteSettings\Application\Capability.cs" />
-    <Compile Include="Contracts\SiteSettings\General\CacheSettings.cs" />
-    <Compile Include="Contracts\SiteSettings\General\EmailTransactionSettings.cs" />
-    <Compile Include="Contracts\SiteSettings\General\EmailTypeSetting.cs" />
-    <Compile Include="Contracts\SiteSettings\General\General\Routing\CustomRouteSettings.cs" />
-    <Compile Include="Contracts\SiteSettings\General\General\Routing\Mapping.cs" />
-    <Compile Include="Contracts\SiteSettings\General\General\Routing\Route.cs" />
-    <Compile Include="Contracts\SiteSettings\General\General\Routing\Validator.cs" />
-    <Compile Include="Contracts\SiteSettings\General\General\ViewAuthorizations.cs" />
-    <Compile Include="Contracts\SiteSettings\General\GeneralSettings.cs" />
-    <Compile Include="Contracts\SiteSettings\General\TaxableTerritory.cs" />
-    <Compile Include="Contracts\SiteSettings\Order\CartSettings.cs" />
-    <Compile Include="Contracts\SiteSettings\Order\CheckoutSettings.cs" />
-    <Compile Include="Contracts\SiteSettings\Order\CustomerCheckoutSettings.cs" />
-    <Compile Include="Contracts\SiteSettings\Order\ExternalPaymentWorkflowDefinition.cs" />
-    <Compile Include="Contracts\SiteSettings\Order\Gateway.cs" />
-    <Compile Include="Contracts\SiteSettings\Order\LocalizedContent.cs" />
-    <Compile Include="Contracts\SiteSettings\Order\OrderProcessingSettings.cs" />
-    <Compile Include="Contracts\SiteSettings\Order\PaymentSettings.cs" />
-    <Compile Include="Contracts\SiteSettings\Order\PurchaseOrderCustomField.cs" />
-    <Compile Include="Contracts\SiteSettings\Order\PurchaseOrderPaymentDefinition.cs" />
-    <Compile Include="Contracts\SiteSettings\Order\PurchaseOrderPaymentTerm.cs" />
-    <Compile Include="Contracts\SiteSettings\Order\ThirdPartyCredentialField.cs" />
-    <Compile Include="Contracts\SiteSettings\Order\VocabularyValue.cs" />
-    <Compile Include="Contracts\SiteSettings\Shipping\SiteShippingHandlingFee.cs" />
-    <Compile Include="Contracts\SiteSettings\Shipping\SiteShippingSettings.cs" />
-    <Compile Include="Contracts\SiteSettings\Shipping\SiteShippingSignatureRequirement.cs" />
-    <Compile Include="Contracts\Tenant\Catalog.cs" />
-    <Compile Include="Contracts\Tenant\MasterCatalog.cs" />
-    <Compile Include="Contracts\Tenant\Site.cs" />
-    <Compile Include="Contracts\Tenant\Tenant.cs" />
-    <Compile Include="Contracts\Tenant\TenantCollection.cs" />
-    <Compile Include="Events\IApplicationEvents.cs" />
-    <Compile Include="Events\IAttributeEvents.cs" />
-    <Compile Include="Events\ICartEvents.cs" />
-    <Compile Include="Events\ICategoryEvents.cs" />
-    <Compile Include="Events\ICreditEvents.cs" />
-    <Compile Include="Events\ICustomerAccountEvents.cs" />
-    <Compile Include="Events\ICustomerSegmentEvents.cs" />
-    <Compile Include="Events\IDiscountEvents.cs" />
-    <Compile Include="Events\IEmailEvents.cs" />
-    <Compile Include="Events\IFacetEvents.cs" />
-    <Compile Include="Events\ILocationTypeEvents.cs" />
-    <Compile Include="Events\IOrderEvents.cs" />
-    <Compile Include="Events\IPriceListEntryEvents.cs" />
-    <Compile Include="Events\IPriceListEvents.cs" />
-    <Compile Include="Events\IProductDraftEvents.cs" />
-    <Compile Include="Events\IProductEvents.cs" />
-    <Compile Include="Events\IProductInventoryEvents.cs" />
-    <Compile Include="Events\IProductTypeEvents.cs" />
-    <Compile Include="Events\IReturnEvents.cs" />
-    <Compile Include="Events\ISearchSettingsEvents.cs" />
-    <Compile Include="Events\IShipmentEvents.cs" />
-    <Compile Include="Events\ISiteEvents.cs" />
-    <Compile Include="Events\ITenantEvents.cs" />
-    <Compile Include="Events\IWishListEvents.cs" />
-    <Compile Include="Events\Topics.cs" />
-    <Compile Include="Resources\Commerce\Admin\LocationResource.cs" />
-    <Compile Include="Resources\Commerce\Admin\LocationTypeResource.cs" />
-    <Compile Include="Resources\Commerce\CartResource.cs" />
-    <Compile Include="Resources\Commerce\Carts\AppliedDiscountResource.cs" />
-    <Compile Include="Resources\Commerce\Carts\CartItemResource.cs" />
-    <Compile Include="Resources\Commerce\Carts\ChangeMessageResource.cs" />
-    <Compile Include="Resources\Commerce\Carts\ExtendedPropertyResource.cs" />
-    <Compile Include="Resources\Commerce\Catalog\Admin\Attributedefinition\AttributeResource.cs" />
-    <Compile Include="Resources\Commerce\Catalog\Admin\Attributedefinition\Attributes\AttributeLocalizedContentResource.cs" />
-    <Compile Include="Resources\Commerce\Catalog\Admin\Attributedefinition\Attributes\AttributeTypeRuleResource.cs" />
-    <Compile Include="Resources\Commerce\Catalog\Admin\Attributedefinition\Attributes\AttributeVocabularyValueResource.cs" />
-    <Compile Include="Resources\Commerce\Catalog\Admin\Attributedefinition\ProductTypeResource.cs" />
-    <Compile Include="Resources\Commerce\Catalog\Admin\Attributedefinition\Producttypes\ProductTypeExtraResource.cs" />
-    <Compile Include="Resources\Commerce\Catalog\Admin\Attributedefinition\Producttypes\ProductTypeOptionResource.cs" />
-    <Compile Include="Resources\Commerce\Catalog\Admin\Attributedefinition\Producttypes\ProductTypePropertyResource.cs" />
-    <Compile Include="Resources\Commerce\Catalog\Admin\Attributedefinition\Producttypes\ProductTypeVariationResource.cs" />
-    <Compile Include="Resources\Commerce\Catalog\Admin\CategoryResource.cs" />
-    <Compile Include="Resources\Commerce\Catalog\Admin\CouponSetResource.cs" />
-    <Compile Include="Resources\Commerce\Catalog\Admin\Couponsets\AssignedDiscountResource.cs" />
-    <Compile Include="Resources\Commerce\Catalog\Admin\Couponsets\CouponResource.cs" />
-    <Compile Include="Resources\Commerce\Catalog\Admin\DiscountResource.cs" />
-    <Compile Include="Resources\Commerce\Catalog\Admin\Discounts\DiscountTargetResource.cs" />
-    <Compile Include="Resources\Commerce\Catalog\Admin\FacetResource.cs" />
-    <Compile Include="Resources\Commerce\Catalog\Admin\LocationInventoryResource.cs" />
-    <Compile Include="Resources\Commerce\Catalog\Admin\MasterCatalogResource.cs" />
-    <Compile Include="Resources\Commerce\Catalog\Admin\PriceListResource.cs" />
-    <Compile Include="Resources\Commerce\Catalog\Admin\Pricelists\PriceListEntryResource.cs" />
-    <Compile Include="Resources\Commerce\Catalog\Admin\ProductReservationResource.cs" />
-    <Compile Include="Resources\Commerce\Catalog\Admin\ProductResource.cs" />
-    <Compile Include="Resources\Commerce\Catalog\Admin\Products\LocationInventoryResource.cs" />
-    <Compile Include="Resources\Commerce\Catalog\Admin\Products\ProductExtraResource.cs" />
-    <Compile Include="Resources\Commerce\Catalog\Admin\Products\ProductOptionResource.cs" />
-    <Compile Include="Resources\Commerce\Catalog\Admin\Products\ProductPropertyResource.cs" />
-    <Compile Include="Resources\Commerce\Catalog\Admin\Products\ProductVariationResource.cs" />
-    <Compile Include="Resources\Commerce\Catalog\Admin\PublishingScopeResource.cs" />
-    <Compile Include="Resources\Commerce\Catalog\Admin\SearchResource.cs" />
-    <Compile Include="Resources\Commerce\Catalog\Admin\SoftAllocationResource.cs" />
-    <Compile Include="Resources\Commerce\Catalog\Storefront\CategoryResource.cs" />
-    <Compile Include="Resources\Commerce\Catalog\Storefront\OrderTaxContextResource.cs" />
-    <Compile Include="Resources\Commerce\Catalog\Storefront\PriceListResource.cs" />
-    <Compile Include="Resources\Commerce\Catalog\Storefront\ProductResource.cs" />
-    <Compile Include="Resources\Commerce\Catalog\Storefront\ProductSearchResultResource.cs" />
-    <Compile Include="Resources\Commerce\Catalog\Storefront\ShippingResource.cs" />
-    <Compile Include="Resources\Commerce\ChannelGroupResource.cs" />
-    <Compile Include="Resources\Commerce\ChannelResource.cs" />
-    <Compile Include="Resources\Commerce\Customer\Accounts\CardResource.cs" />
-    <Compile Include="Resources\Commerce\Customer\Accounts\CustomerAttributeResource.cs" />
-    <Compile Include="Resources\Commerce\Customer\Accounts\CustomerAuditEntryResource.cs" />
-    <Compile Include="Resources\Commerce\Customer\Accounts\CustomerContactResource.cs" />
-    <Compile Include="Resources\Commerce\Customer\Accounts\CustomerNoteResource.cs" />
-    <Compile Include="Resources\Commerce\Customer\Accounts\CustomerPurchaseOrderAccountResource.cs" />
-    <Compile Include="Resources\Commerce\Customer\Accounts\CustomerSegmentResource.cs" />
-    <Compile Include="Resources\Commerce\Customer\Accounts\TransactionResource.cs" />
-    <Compile Include="Resources\Commerce\Customer\AddressValidationRequestResource.cs" />
-    <Compile Include="Resources\Commerce\Customer\Attributedefinition\AttributeResource.cs" />
-    <Compile Include="Resources\Commerce\Customer\CreditResource.cs" />
-    <Compile Include="Resources\Commerce\Customer\Credits\CreditAuditEntryResource.cs" />
-    <Compile Include="Resources\Commerce\Customer\Credits\CreditTransactionResource.cs" />
-    <Compile Include="Resources\Commerce\Customer\CustomerAccountResource.cs" />
-    <Compile Include="Resources\Commerce\Customer\CustomerAuthTicketResource.cs" />
-    <Compile Include="Resources\Commerce\Customer\CustomerSegmentResource.cs" />
-    <Compile Include="Resources\Commerce\Customer\CustomerSetResource.cs" />
-    <Compile Include="Resources\Commerce\Customer\VisitResource.cs" />
-    <Compile Include="Resources\Commerce\InStockNotificationSubscriptionResource.cs" />
-    <Compile Include="Resources\Commerce\LocationResource.cs" />
-    <Compile Include="Resources\Commerce\OrderResource.cs" />
-    <Compile Include="Resources\Commerce\Orders\AdjustmentResource.cs" />
-    <Compile Include="Resources\Commerce\Orders\AppliedDiscountResource.cs" />
-    <Compile Include="Resources\Commerce\Orders\Attributedefinition\AttributeResource.cs" />
-    <Compile Include="Resources\Commerce\Orders\BillingInfoResource.cs" />
-    <Compile Include="Resources\Commerce\Orders\DigitalPackageResource.cs" />
-    <Compile Include="Resources\Commerce\Orders\ExtendedPropertyResource.cs" />
-    <Compile Include="Resources\Commerce\Orders\FulfillmentActionResource.cs" />
-    <Compile Include="Resources\Commerce\Orders\FulfillmentInfoResource.cs" />
-    <Compile Include="Resources\Commerce\Orders\OrderAttributeResource.cs" />
-    <Compile Include="Resources\Commerce\Orders\OrderItemResource.cs" />
-    <Compile Include="Resources\Commerce\Orders\OrderNoteResource.cs" />
-    <Compile Include="Resources\Commerce\Orders\OrderReturnableItemResource.cs" />
-    <Compile Include="Resources\Commerce\Orders\OrderValidationResultResource.cs" />
-    <Compile Include="Resources\Commerce\Orders\PackageResource.cs" />
-    <Compile Include="Resources\Commerce\Orders\PaymentResource.cs" />
-    <Compile Include="Resources\Commerce\Orders\PickupResource.cs" />
-    <Compile Include="Resources\Commerce\Orders\RefundResource.cs" />
-    <Compile Include="Resources\Commerce\Orders\ShipmentResource.cs" />
-    <Compile Include="Resources\Commerce\Payments\FraudScreenResource.cs" />
-    <Compile Include="Resources\Commerce\Payments\PublicCardResource.cs" />
-    <Compile Include="Resources\Commerce\ReturnResource.cs" />
-    <Compile Include="Resources\Commerce\Returns\OrderNoteResource.cs" />
-    <Compile Include="Resources\Commerce\Returns\PackageResource.cs" />
-    <Compile Include="Resources\Commerce\Returns\ShipmentResource.cs" />
-    <Compile Include="Resources\Commerce\Settings\ApplicationResource.cs" />
-    <Compile Include="Resources\Commerce\Settings\CartSettingsResource.cs" />
-    <Compile Include="Resources\Commerce\Settings\Checkout\CustomerCheckoutSettingsResource.cs" />
-    <Compile Include="Resources\Commerce\Settings\Checkout\PaymentSettingsResource.cs" />
-    <Compile Include="Resources\Commerce\Settings\CheckoutSettingsResource.cs" />
-    <Compile Include="Resources\Commerce\Settings\General\CustomRouteSettingsResource.cs" />
-    <Compile Include="Resources\Commerce\Settings\General\TaxableTerritoryResource.cs" />
-    <Compile Include="Resources\Commerce\Settings\GeneralSettingsResource.cs" />
-    <Compile Include="Resources\Commerce\Settings\LocationUsageResource.cs" />
-    <Compile Include="Resources\Commerce\Settings\Shipping\SiteShippingHandlingFeeResource.cs" />
-    <Compile Include="Resources\Commerce\Settings\SiteShippingSettingsResource.cs" />
-    <Compile Include="Resources\Commerce\Shipping\Admin\CarrierConfigurationResource.cs" />
-    <Compile Include="Resources\Commerce\Shipping\Admin\Profiles\HandlingFeeRuleResource.cs" />
-    <Compile Include="Resources\Commerce\Shipping\Admin\Profiles\ShippingInclusionRuleResource.cs" />
-    <Compile Include="Resources\Commerce\Shipping\Admin\Profiles\ShippingStatesResource.cs" />
-    <Compile Include="Resources\Commerce\Shipping\Admin\ShippingProfileResource.cs" />
-    <Compile Include="Resources\Commerce\TargetRuleResource.cs" />
-    <Compile Include="Resources\Commerce\WishlistResource.cs" />
-    <Compile Include="Resources\Commerce\Wishlists\WishlistItemResource.cs" />
-    <Compile Include="Resources\Content\DocumentDraftSummaryResource.cs" />
-    <Compile Include="Resources\Content\DocumentListResource.cs" />
-    <Compile Include="Resources\Content\Documentlists\DocumentResource.cs" />
-    <Compile Include="Resources\Content\Documentlists\DocumentTreeResource.cs" />
-    <Compile Include="Resources\Content\Documentlists\FacetResource.cs" />
-    <Compile Include="Resources\Content\Documentlists\ViewResource.cs" />
-    <Compile Include="Resources\Content\DocumentListTypeResource.cs" />
-    <Compile Include="Resources\Content\DocumentTypeResource.cs" />
-    <Compile Include="Resources\Content\PropertyTypeResource.cs" />
-    <Compile Include="Resources\Content\PublishSetSummaryResource.cs" />
-    <Compile Include="Resources\Event\EventNotificationResource.cs" />
-    <Compile Include="Resources\Event\Push\SubscriptionResource.cs" />
-    <Compile Include="Resources\Event\Push\Subscriptions\EventDeliverySummaryResource.cs" />
-    <Compile Include="Resources\Platform\Adminuser\AdminUserResource.cs" />
-    <Compile Include="Resources\Platform\Adminuser\TenantAdminUserAuthTicketResource.cs" />
-    <Compile Include="Resources\Platform\Appdev\PackageResource.cs" />
-    <Compile Include="Resources\Platform\ApplicationResource.cs" />
-    <Compile Include="Resources\Platform\Applications\AuthTicketResource.cs" />
-    <Compile Include="Resources\Platform\Developer\DeveloperAdminUserAuthTicketResource.cs" />
-    <Compile Include="Resources\Platform\EntityListResource.cs" />
-    <Compile Include="Resources\Platform\Entitylists\EntityContainerResource.cs" />
-    <Compile Include="Resources\Platform\Entitylists\EntityResource.cs" />
-    <Compile Include="Resources\Platform\Entitylists\ListViewResource.cs" />
-    <Compile Include="Resources\Platform\Extensions\CredentialStoreEntryResource.cs" />
-    <Compile Include="Resources\Platform\ReferenceDataResource.cs" />
-    <Compile Include="Resources\Platform\SecureAppDataResource.cs" />
-    <Compile Include="Resources\Platform\SiteDataResource.cs" />
-    <Compile Include="Resources\Platform\TenantDataResource.cs" />
-    <Compile Include="Resources\Platform\TenantExtensionsResource.cs" />
-    <Compile Include="Resources\Platform\TenantResource.cs" />
-    <Compile Include="Resources\Platform\UserDataResource.cs" />
-    <Compile Include="Urls\Commerce\Admin\LocationTypeUrl.cs" />
-    <Compile Include="Urls\Commerce\Admin\LocationUrl.cs" />
-    <Compile Include="Urls\Commerce\Carts\AppliedDiscountUrl.cs" />
-    <Compile Include="Urls\Commerce\Carts\CartItemUrl.cs" />
-    <Compile Include="Urls\Commerce\Carts\ChangeMessageUrl.cs" />
-    <Compile Include="Urls\Commerce\Carts\ExtendedPropertyUrl.cs" />
-    <Compile Include="Urls\Commerce\CartUrl.cs" />
-    <Compile Include="Urls\Commerce\Catalog\Admin\Attributedefinition\Attributes\AttributeLocalizedContentUrl.cs" />
-    <Compile Include="Urls\Commerce\Catalog\Admin\Attributedefinition\Attributes\AttributeTypeRuleUrl.cs" />
-    <Compile Include="Urls\Commerce\Catalog\Admin\Attributedefinition\Attributes\AttributeVocabularyValueUrl.cs" />
-    <Compile Include="Urls\Commerce\Catalog\Admin\Attributedefinition\AttributeUrl.cs" />
-    <Compile Include="Urls\Commerce\Catalog\Admin\Attributedefinition\Producttypes\ProductTypeExtraUrl.cs" />
-    <Compile Include="Urls\Commerce\Catalog\Admin\Attributedefinition\Producttypes\ProductTypeOptionUrl.cs" />
-    <Compile Include="Urls\Commerce\Catalog\Admin\Attributedefinition\Producttypes\ProductTypePropertyUrl.cs" />
-    <Compile Include="Urls\Commerce\Catalog\Admin\Attributedefinition\Producttypes\ProductTypeVariationUrl.cs" />
-    <Compile Include="Urls\Commerce\Catalog\Admin\Attributedefinition\ProductTypeUrl.cs" />
-    <Compile Include="Urls\Commerce\Catalog\Admin\CategoryUrl.cs" />
-    <Compile Include="Urls\Commerce\Catalog\Admin\Couponsets\AssignedDiscountUrl.cs" />
-    <Compile Include="Urls\Commerce\Catalog\Admin\Couponsets\CouponUrl.cs" />
-    <Compile Include="Urls\Commerce\Catalog\Admin\CouponSetUrl.cs" />
-    <Compile Include="Urls\Commerce\Catalog\Admin\Discounts\DiscountTargetUrl.cs" />
-    <Compile Include="Urls\Commerce\Catalog\Admin\DiscountUrl.cs" />
-    <Compile Include="Urls\Commerce\Catalog\Admin\FacetUrl.cs" />
-    <Compile Include="Urls\Commerce\Catalog\Admin\LocationInventoryUrl.cs" />
-    <Compile Include="Urls\Commerce\Catalog\Admin\MasterCatalogUrl.cs" />
-    <Compile Include="Urls\Commerce\Catalog\Admin\Pricelists\PriceListEntryUrl.cs" />
-    <Compile Include="Urls\Commerce\Catalog\Admin\PriceListUrl.cs" />
-    <Compile Include="Urls\Commerce\Catalog\Admin\ProductReservationUrl.cs" />
-    <Compile Include="Urls\Commerce\Catalog\Admin\Products\LocationInventoryUrl.cs" />
-    <Compile Include="Urls\Commerce\Catalog\Admin\Products\ProductExtraUrl.cs" />
-    <Compile Include="Urls\Commerce\Catalog\Admin\Products\ProductOptionUrl.cs" />
-    <Compile Include="Urls\Commerce\Catalog\Admin\Products\ProductPropertyUrl.cs" />
-    <Compile Include="Urls\Commerce\Catalog\Admin\Products\ProductVariationUrl.cs" />
-    <Compile Include="Urls\Commerce\Catalog\Admin\ProductUrl.cs" />
-    <Compile Include="Urls\Commerce\Catalog\Admin\PublishingScopeUrl.cs" />
-    <Compile Include="Urls\Commerce\Catalog\Admin\SearchUrl.cs" />
-    <Compile Include="Urls\Commerce\Catalog\Admin\SoftAllocationUrl.cs" />
-    <Compile Include="Urls\Commerce\Catalog\Storefront\CategoryUrl.cs" />
-    <Compile Include="Urls\Commerce\Catalog\Storefront\OrderTaxContextUrl.cs" />
-    <Compile Include="Urls\Commerce\Catalog\Storefront\PriceListUrl.cs" />
-    <Compile Include="Urls\Commerce\Catalog\Storefront\ProductSearchResultUrl.cs" />
-    <Compile Include="Urls\Commerce\Catalog\Storefront\ProductUrl.cs" />
-    <Compile Include="Urls\Commerce\Catalog\Storefront\ShippingUrl.cs" />
-    <Compile Include="Urls\Commerce\ChannelGroupUrl.cs" />
-    <Compile Include="Urls\Commerce\ChannelUrl.cs" />
-    <Compile Include="Urls\Commerce\Customer\Accounts\CardUrl.cs" />
-    <Compile Include="Urls\Commerce\Customer\Accounts\CustomerAttributeUrl.cs" />
-    <Compile Include="Urls\Commerce\Customer\Accounts\CustomerAuditEntryUrl.cs" />
-    <Compile Include="Urls\Commerce\Customer\Accounts\CustomerContactUrl.cs" />
-    <Compile Include="Urls\Commerce\Customer\Accounts\CustomerNoteUrl.cs" />
-    <Compile Include="Urls\Commerce\Customer\Accounts\CustomerPurchaseOrderAccountUrl.cs" />
-    <Compile Include="Urls\Commerce\Customer\Accounts\CustomerSegmentUrl.cs" />
-    <Compile Include="Urls\Commerce\Customer\Accounts\TransactionUrl.cs" />
-    <Compile Include="Urls\Commerce\Customer\AddressValidationRequestUrl.cs" />
-    <Compile Include="Urls\Commerce\Customer\Attributedefinition\AttributeUrl.cs" />
-    <Compile Include="Urls\Commerce\Customer\Credits\CreditAuditEntryUrl.cs" />
-    <Compile Include="Urls\Commerce\Customer\Credits\CreditTransactionUrl.cs" />
-    <Compile Include="Urls\Commerce\Customer\CreditUrl.cs" />
-    <Compile Include="Urls\Commerce\Customer\CustomerAccountUrl.cs" />
-    <Compile Include="Urls\Commerce\Customer\CustomerAuthTicketUrl.cs" />
-    <Compile Include="Urls\Commerce\Customer\CustomerSegmentUrl.cs" />
-    <Compile Include="Urls\Commerce\Customer\CustomerSetUrl.cs" />
-    <Compile Include="Urls\Commerce\Customer\VisitUrl.cs" />
-    <Compile Include="Urls\Commerce\InStockNotificationSubscriptionUrl.cs" />
-    <Compile Include="Urls\Commerce\LocationUrl.cs" />
-    <Compile Include="Urls\Commerce\Orders\AdjustmentUrl.cs" />
-    <Compile Include="Urls\Commerce\Orders\AppliedDiscountUrl.cs" />
-    <Compile Include="Urls\Commerce\Orders\Attributedefinition\AttributeUrl.cs" />
-    <Compile Include="Urls\Commerce\Orders\BillingInfoUrl.cs" />
-    <Compile Include="Urls\Commerce\Orders\DigitalPackageUrl.cs" />
-    <Compile Include="Urls\Commerce\Orders\ExtendedPropertyUrl.cs" />
-    <Compile Include="Urls\Commerce\Orders\FulfillmentActionUrl.cs" />
-    <Compile Include="Urls\Commerce\Orders\FulfillmentInfoUrl.cs" />
-    <Compile Include="Urls\Commerce\Orders\OrderAttributeUrl.cs" />
-    <Compile Include="Urls\Commerce\Orders\OrderItemUrl.cs" />
-    <Compile Include="Urls\Commerce\Orders\OrderNoteUrl.cs" />
-    <Compile Include="Urls\Commerce\Orders\OrderReturnableItemUrl.cs" />
-    <Compile Include="Urls\Commerce\Orders\OrderValidationResultUrl.cs" />
-    <Compile Include="Urls\Commerce\Orders\PackageUrl.cs" />
-    <Compile Include="Urls\Commerce\Orders\PaymentUrl.cs" />
-    <Compile Include="Urls\Commerce\Orders\PickupUrl.cs" />
-    <Compile Include="Urls\Commerce\Orders\RefundUrl.cs" />
-    <Compile Include="Urls\Commerce\Orders\ShipmentUrl.cs" />
-    <Compile Include="Urls\Commerce\OrderUrl.cs" />
-    <Compile Include="Urls\Commerce\Payments\FraudScreenUrl.cs" />
-    <Compile Include="Urls\Commerce\Payments\PublicCardUrl.cs" />
-    <Compile Include="Urls\Commerce\Returns\OrderNoteUrl.cs" />
-    <Compile Include="Urls\Commerce\Returns\PackageUrl.cs" />
-    <Compile Include="Urls\Commerce\Returns\ShipmentUrl.cs" />
-    <Compile Include="Urls\Commerce\ReturnUrl.cs" />
-    <Compile Include="Urls\Commerce\Settings\ApplicationUrl.cs" />
-    <Compile Include="Urls\Commerce\Settings\CartSettingsUrl.cs" />
-    <Compile Include="Urls\Commerce\Settings\Checkout\CustomerCheckoutSettingsUrl.cs" />
-    <Compile Include="Urls\Commerce\Settings\Checkout\PaymentSettingsUrl.cs" />
-    <Compile Include="Urls\Commerce\Settings\CheckoutSettingsUrl.cs" />
-    <Compile Include="Urls\Commerce\Settings\General\CustomRouteSettingsUrl.cs" />
-    <Compile Include="Urls\Commerce\Settings\General\TaxableTerritoryUrl.cs" />
-    <Compile Include="Urls\Commerce\Settings\GeneralSettingsUrl.cs" />
-    <Compile Include="Urls\Commerce\Settings\LocationUsageUrl.cs" />
-    <Compile Include="Urls\Commerce\Settings\Shipping\SiteShippingHandlingFeeUrl.cs" />
-    <Compile Include="Urls\Commerce\Settings\SiteShippingSettingsUrl.cs" />
-    <Compile Include="Urls\Commerce\Shipping\Admin\CarrierConfigurationUrl.cs" />
-    <Compile Include="Urls\Commerce\Shipping\Admin\Profiles\HandlingFeeRuleUrl.cs" />
-    <Compile Include="Urls\Commerce\Shipping\Admin\Profiles\ShippingInclusionRuleUrl.cs" />
-    <Compile Include="Urls\Commerce\Shipping\Admin\Profiles\ShippingStatesUrl.cs" />
-    <Compile Include="Urls\Commerce\Shipping\Admin\ShippingProfileUrl.cs" />
-    <Compile Include="Urls\Commerce\TargetRuleUrl.cs" />
-    <Compile Include="Urls\Commerce\Wishlists\WishlistItemUrl.cs" />
-    <Compile Include="Urls\Commerce\WishlistUrl.cs" />
-    <Compile Include="Urls\Content\DocumentDraftSummaryUrl.cs" />
-    <Compile Include="Urls\Content\Documentlists\DocumentTreeUrl.cs" />
-    <Compile Include="Urls\Content\Documentlists\DocumentUrl.cs" />
-    <Compile Include="Urls\Content\Documentlists\FacetUrl.cs" />
-    <Compile Include="Urls\Content\Documentlists\ViewUrl.cs" />
-    <Compile Include="Urls\Content\DocumentListTypeUrl.cs" />
-    <Compile Include="Urls\Content\DocumentListUrl.cs" />
-    <Compile Include="Urls\Content\DocumentTypeUrl.cs" />
-    <Compile Include="Urls\Content\PropertyTypeUrl.cs" />
-    <Compile Include="Urls\Content\PublishSetSummaryUrl.cs" />
-    <Compile Include="Urls\Event\EventNotificationUrl.cs" />
-    <Compile Include="Urls\Event\Push\Subscriptions\EventDeliverySummaryUrl.cs" />
-    <Compile Include="Urls\Event\Push\SubscriptionUrl.cs" />
-    <Compile Include="Urls\Platform\Adminuser\AdminUserUrl.cs" />
-    <Compile Include="Urls\Platform\Adminuser\TenantAdminUserAuthTicketUrl.cs" />
-    <Compile Include="Urls\Platform\Appdev\PackageUrl.cs" />
-    <Compile Include="Urls\Platform\Applications\AuthTicketUrl.cs" />
-    <Compile Include="Urls\Platform\ApplicationUrl.cs" />
-    <Compile Include="Urls\Platform\Developer\DeveloperAdminUserAuthTicketUrl.cs" />
-    <Compile Include="Urls\Platform\Entitylists\EntityContainerUrl.cs" />
-    <Compile Include="Urls\Platform\Entitylists\EntityUrl.cs" />
-    <Compile Include="Urls\Platform\Entitylists\ListViewUrl.cs" />
-    <Compile Include="Urls\Platform\EntityListUrl.cs" />
-    <Compile Include="Urls\Platform\Extensions\CredentialStoreEntryUrl.cs" />
-    <Compile Include="Urls\Platform\ReferenceDataUrl.cs" />
-    <Compile Include="Urls\Platform\SecureAppDataUrl.cs" />
-    <Compile Include="Urls\Platform\SiteDataUrl.cs" />
-    <Compile Include="Urls\Platform\TenantDataUrl.cs" />
-    <Compile Include="Urls\Platform\TenantExtensionsUrl.cs" />
-    <Compile Include="Urls\Platform\TenantUrl.cs" />
-    <Compile Include="Urls\Platform\UserDataUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Admin\LocationClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Admin\Locations\Attributedefinition\AttributeClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Admin\LocationTypeClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\CartClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Carts\AppliedDiscountClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Carts\CartItemClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Carts\ChangeMessageClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Carts\ExtendedPropertyClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Catalog\Admin\Attributedefinition\AttributeClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Catalog\Admin\Attributedefinition\Attributes\AttributeLocalizedContentClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Catalog\Admin\Attributedefinition\Attributes\AttributeTypeRuleClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Catalog\Admin\Attributedefinition\Attributes\AttributeVocabularyValueClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Catalog\Admin\Attributedefinition\ProductTypeClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Catalog\Admin\Attributedefinition\Producttypes\ProductTypeExtraClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Catalog\Admin\Attributedefinition\Producttypes\ProductTypeOptionClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Catalog\Admin\Attributedefinition\Producttypes\ProductTypePropertyClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Catalog\Admin\Attributedefinition\Producttypes\ProductTypeVariationClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Catalog\Admin\CategoryClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Catalog\Admin\CouponSetClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Catalog\Admin\Couponsets\AssignedDiscountClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Catalog\Admin\Couponsets\CouponClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Catalog\Admin\DiscountClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Catalog\Admin\Discounts\DiscountTargetClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Catalog\Admin\DiscountSettingsClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Catalog\Admin\FacetClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Catalog\Admin\LocationInventoryClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Catalog\Admin\MasterCatalogClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Catalog\Admin\PriceListClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Catalog\Admin\Pricelists\PriceListEntryClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Catalog\Admin\ProductClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Catalog\Admin\ProductReservationClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Catalog\Admin\Products\LocationInventoryClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Catalog\Admin\Products\ProductExtraClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Catalog\Admin\Products\ProductOptionClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Catalog\Admin\Products\ProductPropertyClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Catalog\Admin\Products\ProductVariationClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Catalog\Admin\PublishingScopeClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Catalog\Admin\SearchClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Catalog\Admin\SoftAllocationClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Catalog\Storefront\CategoryClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Catalog\Storefront\OrderTaxContextClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Catalog\Storefront\PriceListClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Catalog\Storefront\ProductClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Catalog\Storefront\ProductSearchResultClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Catalog\Storefront\ShippingClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\ChannelClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\ChannelGroupClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\CheckoutClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Checkouts\AppliedDiscountClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Checkouts\DestinationClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Checkouts\OrderAttributeClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Checkouts\OrderItemClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Checkouts\PaymentClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Customer\Accounts\CardClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Customer\Accounts\CustomerAttributeClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Customer\Accounts\CustomerAuditEntryClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Customer\Accounts\CustomerContactClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Customer\Accounts\CustomerNoteClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Customer\Accounts\CustomerPurchaseOrderAccountClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Customer\Accounts\CustomerSegmentClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Customer\Accounts\TransactionClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Customer\AddressValidationRequestClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Customer\Attributedefinition\AttributeClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Customer\CreditClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Customer\Credits\CreditAuditEntryClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Customer\Credits\CreditTransactionClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Customer\CustomerAccountClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Customer\CustomerAuthTicketClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Customer\CustomerSegmentClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Customer\CustomerSetClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Customer\VisitClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\InStockNotificationSubscriptionClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\LocationClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\OrderClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Orders\AdjustmentClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Orders\AppliedDiscountClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Orders\Attributedefinition\AttributeClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Orders\BillingInfoClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Orders\DigitalPackageClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Orders\ExtendedPropertyClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Orders\FulfillmentActionClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Orders\FulfillmentInfoClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Orders\OrderAttributeClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Orders\OrderItemClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Orders\OrderNoteClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Orders\OrderReturnableItemClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Orders\OrderValidationResultClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Orders\PackageClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Orders\PaymentClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Orders\PickupClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Orders\RefundClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Orders\ShipmentClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Payments\FraudScreenClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Payments\PublicCardClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\ReturnClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Returns\OrderNoteClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Returns\PackageClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Returns\ShipmentClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Settings\ApplicationClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Settings\CartSettingsClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Settings\Checkout\CustomerCheckoutSettingsClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Settings\Checkout\PaymentSettingsClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Settings\CheckoutSettingsClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Settings\General\CustomRouteSettingsClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Settings\General\TaxableTerritoryClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Settings\GeneralSettingsClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Settings\LocationUsageClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Settings\Shipping\SiteShippingHandlingFeeClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Settings\SiteShippingSettingsClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Shipping\Admin\CarrierConfigurationClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Shipping\Admin\Profiles\OrderHandlingFeeRulesClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Shipping\Admin\Profiles\ProductHandlingFeeRulesClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Shipping\Admin\Profiles\ShippingInclusionRuleClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Shipping\Admin\Profiles\ShippingStatesClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Shipping\Admin\ShippingProfileClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\TargetRuleClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\WishlistClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Commerce\Wishlists\WishlistItemClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Content\DocumentDraftSummaryClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Content\DocumentListClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Content\Documentlists\DocumentClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Content\Documentlists\DocumentTreeClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Content\Documentlists\FacetClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Content\Documentlists\ViewClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Content\DocumentListTypeClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Content\DocumentTypeClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Content\PropertyTypeClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Content\PublishSetSummaryClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Event\EventNotificationClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Event\Push\SubscriptionClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Event\Push\Subscriptions\EventDeliverySummaryClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Platform\Adminuser\AdminUserClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Platform\Adminuser\TenantAdminUserAuthTicketClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Platform\Appdev\AppPackageClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Platform\Appdev\PackageClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Platform\ApplicationClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Platform\Applications\AuthTicketClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Platform\Developer\DeveloperAdminUserAuthTicketClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Platform\EntityListClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Platform\Entitylists\EntityClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Platform\Entitylists\EntityContainerClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Platform\Entitylists\ListViewClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Platform\Extensions\CredentialStoreEntryClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Platform\InstalledApplicationsClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Platform\ReferenceDataClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Platform\SecureAppDataClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Platform\SiteDataClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Platform\TenantClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Platform\TenantDataClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Platform\TenantExtensionsClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Clients\Platform\UserDataClient.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\AdminUser\DeveloperAccount.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\AdminUser\DeveloperAdminUserAuthTicket.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\AdminUser\TenantAdminUserAuthTicket.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\AppDev\AppAuthInfo.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\AppDev\ApplicationAttribute.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\AppDev\ApplicationBehavior.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\AppDev\ApplicationCapability.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\AppDev\ApplicationCapabilityDomain.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\AppDev\ApplicationCapabilityDomainValue.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\AppDev\ApplicationCapabilityType.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\AppDev\ApplicationEntitlement.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\AppDev\ApplicationSubscription.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\AppDev\ApplicationSummary.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\AppDev\ApplicationSummaryCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\AppDev\ApplicationTransaction.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\AppDev\ApplicationVersionsCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\AppDev\AppVersion.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\AppDev\Attribute.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\AppDev\AuthTicket.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\AppDev\AuthTicketRequest.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\AppDev\Event.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\AppDev\FileMetadata.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\AppDev\FolderMetadata.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\AppDev\Package.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\AppDev\PackageCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\AppDev\PackageNamesCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\AppDev\PackageRequest.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\AppDev\PackageSummary.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\AppDev\PackageSummaryCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\AppDev\RenameInfo.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Carts\Cart.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Carts\CartChangeMessageCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Carts\CartItem.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Carts\CartItemCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Carts\CartMessage.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Carts\CartSummary.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Channels\Channel.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Channels\ChannelCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Channels\ChannelGroup.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Channels\ChannelGroupCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Checkouts\Checkout.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Checkouts\CheckoutAction.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Checkouts\CheckoutCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Checkouts\CheckoutGrouping.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Checkouts\CheckoutGroupRates.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Checkouts\CheckoutGroupShippingMethod.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Checkouts\ItemsForDestination.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Commerce\Adjustment.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Commerce\ChangeMessage.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Commerce\CommerceUnitPrice.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Commerce\ExtendedProperty.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Commerce\PackageMeasurements.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Discounts\AppliedDiscount.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Discounts\AppliedLineItemProductDiscount.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Discounts\AppliedLineItemShippingDiscount.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Discounts\Discount.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Discounts\InvalidCoupon.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Discounts\ShippingDiscount.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Discounts\SuggestedDiscount.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Fulfillment\Destination.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Fulfillment\DigitalPackage.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Fulfillment\DigitalPackageItem.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Fulfillment\FulfillmentAction.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Fulfillment\FulfillmentInfo.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Fulfillment\Package.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Fulfillment\PackageItem.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Fulfillment\Pickup.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Fulfillment\PickupItem.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Fulfillment\Shipment.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Fulfillment\ShippingRate.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Orders\DigitalWallet.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Orders\Order.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Orders\OrderAction.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Orders\OrderAttribute.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Orders\OrderCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Orders\OrderItem.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Orders\OrderItemCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Orders\OrderNote.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Orders\OrderReturnableItem.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Orders\OrderReturnableItemCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Orders\OrderValidationMessage.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Orders\OrderValidationResult.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Orders\ShopperNotes.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Payments\BillingInfo.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Payments\CheckPayment.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Payments\Payment.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Payments\PaymentAction.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Payments\PaymentCard.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Payments\PaymentCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Payments\PaymentGatewayInteraction.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Payments\PaymentGatewayResponseData.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Payments\PaymentInteraction.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Payments\PurchaseOrderCustomField.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Payments\PurchaseOrderPayment.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Payments\PurchaseOrderPaymentTerm.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Products\BundledProduct.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Products\Category.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Products\Product.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Products\ProductOption.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Products\ProductPrice.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Products\ProductProperty.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Products\ProductPropertyValue.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Refunds\Refund.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Returns\ReasonCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Returns\Return.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Returns\ReturnAction.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Returns\ReturnBundle.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Returns\ReturnCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Returns\ReturnItem.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Returns\ReturnItemCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Returns\ReturnItemSpecifier.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Returns\ReturnReason.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Wishlists\Wishlist.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Wishlists\WishlistCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Wishlists\WishlistItem.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\CommerceRuntime\Wishlists\WishlistItemCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Content\ActiveDateRange.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Content\AddOrDeletePublishItem.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Content\Document.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Content\DocumentCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Content\DocumentDraftSummary.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Content\DocumentDraftSummaryPagedCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Content\DocumentInstallation.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Content\DocumentList.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Content\DocumentListCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Content\DocumentListType.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Content\DocumentListTypeCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Content\DocumentType.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Content\DocumentTypeCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Content\Facet.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Content\Property.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Content\PropertyType.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Content\PropertyTypeCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Content\PublishSetSummary.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Content\PublishSetSummaryPagedCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Content\View.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Content\ViewField.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Core\Address.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Core\AuditInfo.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Core\Behavior.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Core\BehaviorCategory.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Core\BehaviorCategoryCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Core\BehaviorCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Core\Contact.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Core\Extensible\Attribute.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Core\Extensible\AttributeCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Core\Extensible\AttributeLocalizedContent.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Core\Extensible\AttributeMetadataItem.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Core\Extensible\AttributeValidation.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Core\Extensible\AttributeValueLocalizedContent.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Core\Extensible\AttributeVocabularyValue.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Core\Measurement.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Core\Phone.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Core\ThirdParty\ActiveShippingCountry.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Core\ThirdParty\InitializablePropertyValue.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Core\ThirdParty\InitializableShippingCountryPropertyValue.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Core\ThirdParty\OperationUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Core\User.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Core\UserAuthInfo.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Core\UserProfile.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Core\UserRole.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Core\UserScope.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Core\UserSystemData.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Customer\AccountPasswordInfo.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Customer\AccountPasswordInfoCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Customer\AddressValidationRequest.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Customer\AddressValidationResponse.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Customer\Card.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Customer\CardCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Customer\ChangePasswordResult.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Customer\ChangePasswordResultCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Customer\CommerceSummary.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Customer\ContactType.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Customer\Credit\Credit.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Customer\Credit\CreditAuditEntry.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Customer\Credit\CreditAuditEntryCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Customer\Credit\CreditCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Customer\Credit\CreditTransaction.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Customer\Credit\CreditTransactionCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Customer\CurrencyAmount.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Customer\CustomerAccount.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Customer\CustomerAccountAndAuthInfo.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Customer\CustomerAccountCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Customer\CustomerAttribute.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Customer\CustomerAttributeCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Customer\CustomerAuditEntry.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Customer\CustomerAuditEntryCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Customer\CustomerAuthTicket.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Customer\CustomerContact.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Customer\CustomerContactCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Customer\CustomerLoginInfo.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Customer\CustomerNote.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Customer\CustomerNoteCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Customer\CustomerPurchaseOrderAccount.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Customer\CustomerPurchaseOrderAccountCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Customer\CustomerPurchaseOrderPaymentTerm.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Customer\CustomerSegment.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Customer\CustomerSegmentCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Customer\CustomerSet.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Customer\CustomerSetAggregateInfo.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Customer\CustomerSetCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Customer\CustomerSetSite.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Customer\CustomerUserAuthInfo.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Customer\InStockNotificationSubscription.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Customer\InStockNotificationSubscriptionCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Customer\LoginState.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Customer\PasswordInfo.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Customer\PurchaseOrderTransaction.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Customer\PurchaseOrderTransactionCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Customer\ResetPasswordInfo.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Customer\Transaction.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Customer\Visit.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Customer\VisitCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Event\Event.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Event\EventCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Event\EventDeliveryAttempt.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Event\EventDeliverySummary.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Event\EventDeliverySummaryCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Event\EventExtendedProperty.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Event\EventSummary.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Event\HttpStatus.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Event\SubscribingSite.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Event\SubscribingTenant.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Event\Subscription.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Event\SubscriptionCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\InstalledApplications\Application.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\InstalledApplications\Capability.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\InstalledApplications\CredentialStoreEntry.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\InstalledApplications\CustomFunction.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\InstalledApplications\CustomFunctionsForAction.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\InstalledApplications\CustomFunctionsForContext.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\InstalledApplications\ExtensionConfiguration.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\InstalledApplications\TenantExtensions.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Location\Coordinates.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Location\FulfillmentType.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Location\Hours.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Location\Location.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Location\LocationAttribute.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Location\LocationCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Location\LocationType.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Location\LocationUsage.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Location\LocationUsageCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Location\RegularHours.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Location\ShippingOriginContact.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\MZDB\EntityCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\MZDB\EntityContainer.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\MZDB\EntityContainerCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\MZDB\EntityList.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\MZDB\EntityListCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\MZDB\IndexedProperty.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\MZDB\ListView.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\MZDB\ListViewCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\MZDB\ListViewField.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\PaymentService\Address.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\PaymentService\Contact.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\PaymentService\CustomData.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\PaymentService\Extensibility\V1\AdapterContext.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\PaymentService\Extensibility\V1\Address.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\PaymentService\Extensibility\V1\CaptureRequest.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\PaymentService\Extensibility\V1\CardInformation.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\PaymentService\Extensibility\V1\Contact.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\PaymentService\Extensibility\V1\CustomerInformation.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\PaymentService\Extensibility\V1\GatewayAuthorizationRequest.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\PaymentService\Extensibility\V1\GatewayAuthorizeResponse.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\PaymentService\Extensibility\V1\GatewayCaptureResponse.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\PaymentService\Extensibility\V1\GatewayCreditResponse.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\PaymentService\Extensibility\V1\GatewayInteraction.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\PaymentService\Extensibility\V1\GatewayVoidResponse.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\PaymentService\Extensibility\V1\KeyValueTuple.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\PaymentService\Extensibility\V1\Transaction.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\PaymentService\FraudScreenResponseData.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\PaymentService\GatewayAccount.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\PaymentService\GatewayCredentialFieldDefinition.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\PaymentService\GatewayCredentialFieldValue.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\PaymentService\GatewayDefinition.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\PaymentService\OrderItem.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\PaymentService\PreAuthorizeDefinition.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\PaymentService\PreAuthorizeTransactionTypeDataContract.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\PaymentService\Product.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\PaymentService\PublicCard.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\PaymentService\Request\FraudScreenRequest.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\PaymentService\Response\FraudScreen.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\PaymentService\Response\SyncResponse.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\PaymentService\SupportedCard.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\PricingRuntime\AppliedDiscount.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\PricingRuntime\AppliedLineItemProductDiscount.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\PricingRuntime\AppliedLineItemShippingDiscount.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\PricingRuntime\AppliedOrderShippingDiscount.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\PricingRuntime\Discount.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\PricingRuntime\DiscountCondition.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\PricingRuntime\DiscountTarget.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\PricingRuntime\ItemTaxContext.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\PricingRuntime\OrderTaxContext.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\PricingRuntime\ProductAttribute.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\PricingRuntime\ProductProperty.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\PricingRuntime\ProductPropertyValue.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\PricingRuntime\TaxableLineItem.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\PricingRuntime\TaxableOrder.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\PricingRuntime\TaxAttribute.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\PricingRuntime\TaxContext.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\PricingRuntime\ThirdParty\ItemTaxContext.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\PricingRuntime\ThirdParty\OrderTaxContext.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\PricingRuntime\ThirdParty\TaxableOrder.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\PricingRuntime\ThirdParty\TaxContext.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\ActiveDateRange.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\AssignedDiscount.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\Attribute.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\AttributeCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\AttributeInProductType.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\AttributeInProductTypeDisplayInfo.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\AttributeLocalizedContent.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\AttributeMetadataItem.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\AttributeSearchSettings.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\AttributeTypeRule.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\AttributeTypeRuleCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\AttributeValidation.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\AttributeVocabularyValue.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\AttributeVocabularyValueDisplayInfo.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\AttributeVocabularyValueInProductType.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\AttributeVocabularyValueLocalizedContent.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\BundledProduct.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\Category.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\CategoryCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\CategoryDiscountCondition.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\CategoryLocalizedContent.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\CategoryLocalizedImage.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\CategoryPagedCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\Coupon.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\CouponCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\CouponSet.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\CouponSetCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\CustomerSegment.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\Discount.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\DiscountCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\DiscountCondition.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\DiscountLocalizedContent.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\DiscountSettings.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\DiscountTarget.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\DynamicExpression.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\Expression.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\Facet.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\FacetRangeQuery.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\FacetSet.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\FacetSource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\FacetValidity.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\LocationInventory.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\LocationInventoryAdjustment.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\LocationInventoryCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\MasterCatalog.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\MasterCatalogCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\PriceList.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\PriceListCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\PriceListEntry.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\PriceListEntryCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\PriceListEntryExtra.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\PriceListEntryPrice.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\Product.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\ProductCategory.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\ProductCodeRename.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\ProductCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\ProductCost.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\ProductDiscountCondition.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\ProductExtra.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\ProductExtraValue.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\ProductExtraValueDeltaPrice.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\ProductInCatalogInfo.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\ProductInventoryInfo.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\ProductLocalizedContent.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\ProductLocalizedImage.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\ProductLocalizedSEOContent.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\ProductOption.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\ProductOptionValue.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\ProductPrice.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\ProductPricingBehaviorInfo.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\ProductProperty.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\ProductPropertyValue.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\ProductPropertyValueLocalizedContent.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\ProductPublishingInfo.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\ProductReservation.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\ProductReservationCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\ProductSupplierInfo.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\ProductType.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\ProductTypeCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\ProductVariation.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\ProductVariationCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\ProductVariationDeltaPrice.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\ProductVariationFixedPrice.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\ProductVariationOption.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\ProductVariationPagedCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\PublishingScope.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\PublishSet.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\PublishSetCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\Search\SearchSynonymSettings.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\Search\SearchTuningRule.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\Search\SearchTuningRuleCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\Search\SearchTuningRuleFilter.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\Search\SearchTuningRuleSortFields.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\Search\SynonymDefinition.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\Search\SynonymDefinitionCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\Search\SynonymDefinitionPagedCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\SearchSettings.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\SiteSearchKeywordRelevancySettings.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\SiteSearchPhraseRelevancySettings.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\SiteSearchRelevancyCustomField.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\SiteSearchSettings.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\SoftAllocation.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\SoftAllocationCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\SoftAllocationRenew.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\StackingConfiguration.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\TargetedCategory.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\TargetedProduct.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\TargetedShippingMethod.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductAdmin\TargetedShippingZone.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductRuntime\AppliedDiscount.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductRuntime\AttributeDetail.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductRuntime\AttributeValidation.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductRuntime\AttributeVocabularyValueDisplayInfo.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductRuntime\BundledProduct.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductRuntime\BundledProductSummary.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductRuntime\Category.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductRuntime\CategoryCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductRuntime\CategoryContent.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductRuntime\CategoryImage.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductRuntime\CategoryPagedCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductRuntime\ConfiguredProduct.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductRuntime\Discount.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductRuntime\DiscountSelections.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductRuntime\DiscountValidationSummary.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductRuntime\Facet.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductRuntime\FacetValue.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductRuntime\LocationInventory.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductRuntime\LocationInventoryCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductRuntime\LocationInventoryQuery.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductRuntime\PackageMeasurements.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductRuntime\PriceList.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductRuntime\PriceListNode.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductRuntime\Product.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductRuntime\ProductCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductRuntime\ProductContent.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductRuntime\ProductCost.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductRuntime\ProductCostCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductRuntime\ProductCostQuery.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductRuntime\ProductImage.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductRuntime\ProductInventoryInfo.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductRuntime\ProductOption.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductRuntime\ProductOptionSelection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductRuntime\ProductOptionSelections.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductRuntime\ProductOptionValue.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductRuntime\ProductPrice.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductRuntime\ProductPriceRange.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductRuntime\ProductPricingBehaviorInfo.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductRuntime\ProductProperty.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductRuntime\ProductPropertyValue.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductRuntime\ProductPurchasableState.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductRuntime\ProductSearchRandomAccessCursor.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductRuntime\ProductSearchResult.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductRuntime\ProductValidationSummary.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductRuntime\ProductVolumePrice.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductRuntime\ResolvedPriceList.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductRuntime\SearchSuggestion.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductRuntime\SearchSuggestionGroup.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductRuntime\SearchSuggestionResult.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductRuntime\SolrDebugInfo.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductRuntime\ValidationMessage.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductRuntime\VariationOption.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ProductRuntime\VariationSummary.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Reference\AddressSchema.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Reference\AddressSchemaCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Reference\ContentLocale.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Reference\ContentLocaleCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Reference\Country.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Reference\CountryCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Reference\CountryWithStates.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Reference\CountryWithStatesCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Reference\Currency.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Reference\CurrencyCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Reference\Field.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Reference\FieldData.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Reference\State.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Reference\TimeZone.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Reference\TimeZoneCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Reference\TopLevelDomainCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Reference\UnitOfMeasure.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Reference\UnitOfMeasureCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ShippingAdmin\CarrierConfiguration.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ShippingAdmin\CarrierConfigurationCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ShippingAdmin\CustomTableRate.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ShippingAdmin\CustomTableRateContent.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ShippingAdmin\LocalizableString.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ShippingAdmin\Profile\HandlingFeeRule.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ShippingAdmin\Profile\HandlingFeeRuleCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ShippingAdmin\Profile\ShippingInclusionRule.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ShippingAdmin\Profile\ShippingInclusionRuleCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ShippingAdmin\Profile\ShippingProfile.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ShippingAdmin\Profile\ShippingProfileCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ShippingAdmin\Profile\ShippingStates.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ShippingAdmin\Profile\State.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ShippingAdmin\ServiceType.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ShippingAdmin\ServiceTypeLocalizedContent.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ShippingAdmin\Setting.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ShippingAdmin\TargetRule.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ShippingAdmin\TargetRuleCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ShippingRuntime\CarrierRatesResponse.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ShippingRuntime\Category.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ShippingRuntime\CustomAttribute.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ShippingRuntime\ItemMeasurements.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ShippingRuntime\ProductOption.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ShippingRuntime\ProductProperty.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ShippingRuntime\ProductSummary.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ShippingRuntime\RateRequest.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ShippingRuntime\RateRequestAttribute.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ShippingRuntime\RateRequestGroup.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ShippingRuntime\RateRequestItem.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ShippingRuntime\RatesResponse.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ShippingRuntime\RatesResponseGroup.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ShippingRuntime\ShippingItemRate.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ShippingRuntime\ShippingRate.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ShippingRuntime\ShippingRateLocalizedContent.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\ShippingRuntime\ShippingRateValidationMessage.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\SiteSettings\Application\Application.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\SiteSettings\Application\Capability.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\SiteSettings\General\CacheSettings.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\SiteSettings\General\EmailTransactionSettings.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\SiteSettings\General\EmailTypeSetting.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\SiteSettings\General\General\Routing\CustomRouteSettings.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\SiteSettings\General\General\Routing\Mapping.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\SiteSettings\General\General\Routing\Route.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\SiteSettings\General\General\Routing\Validator.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\SiteSettings\General\General\ViewAuthorizations.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\SiteSettings\General\GeneralSettings.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\SiteSettings\General\TaxableTerritory.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\SiteSettings\Order\CartSettings.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\SiteSettings\Order\CheckoutSettings.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\SiteSettings\Order\CustomerCheckoutSettings.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\SiteSettings\Order\ExternalPaymentWorkflowDefinition.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\SiteSettings\Order\Gateway.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\SiteSettings\Order\LocalizedContent.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\SiteSettings\Order\OrderProcessingSettings.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\SiteSettings\Order\PaymentSettings.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\SiteSettings\Order\PurchaseOrderCustomField.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\SiteSettings\Order\PurchaseOrderPaymentDefinition.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\SiteSettings\Order\PurchaseOrderPaymentTerm.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\SiteSettings\Order\ThirdPartyCredentialField.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\SiteSettings\Order\VocabularyValue.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\SiteSettings\Shipping\SiteShippingHandlingFee.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\SiteSettings\Shipping\SiteShippingSettings.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\SiteSettings\Shipping\SiteShippingSignatureRequirement.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Tenant\Catalog.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Tenant\MasterCatalog.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Tenant\Site.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Tenant\Tenant.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Tenant\TenantAttribute.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Contracts\Tenant\TenantCollection.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Events\IApplicationEvents.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Events\IAttributeEvents.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Events\ICartEvents.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Events\ICategoryEvents.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Events\ICreditEvents.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Events\ICustomerAccountEvents.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Events\ICustomerSegmentEvents.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Events\IDiscountEvents.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Events\IEmailEvents.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Events\IFacetEvents.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Events\ILocationTypeEvents.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Events\IOrderEvents.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Events\IPriceListEntryEvents.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Events\IPriceListEvents.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Events\IProductDraftEvents.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Events\IProductEvents.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Events\IProductInventoryEvents.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Events\IProductTypeEvents.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Events\IReturnEvents.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Events\ISearchSettingsEvents.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Events\IShipmentEvents.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Events\ISiteEvents.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Events\ITenantEvents.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Events\IWishListEvents.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Events\Topics.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Admin\LocationResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Admin\Locations\Attributedefinition\AttributeResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Admin\LocationTypeResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\CartResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Carts\AppliedDiscountResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Carts\CartItemResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Carts\ChangeMessageResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Carts\ExtendedPropertyResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Catalog\Admin\Attributedefinition\AttributeResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Catalog\Admin\Attributedefinition\Attributes\AttributeLocalizedContentResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Catalog\Admin\Attributedefinition\Attributes\AttributeTypeRuleResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Catalog\Admin\Attributedefinition\Attributes\AttributeVocabularyValueResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Catalog\Admin\Attributedefinition\ProductTypeResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Catalog\Admin\Attributedefinition\Producttypes\ProductTypeExtraResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Catalog\Admin\Attributedefinition\Producttypes\ProductTypeOptionResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Catalog\Admin\Attributedefinition\Producttypes\ProductTypePropertyResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Catalog\Admin\Attributedefinition\Producttypes\ProductTypeVariationResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Catalog\Admin\CategoryResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Catalog\Admin\CouponSetResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Catalog\Admin\Couponsets\AssignedDiscountResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Catalog\Admin\Couponsets\CouponResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Catalog\Admin\DiscountResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Catalog\Admin\Discounts\DiscountTargetResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Catalog\Admin\DiscountSettingsResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Catalog\Admin\FacetResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Catalog\Admin\LocationInventoryResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Catalog\Admin\MasterCatalogResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Catalog\Admin\PriceListResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Catalog\Admin\Pricelists\PriceListEntryResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Catalog\Admin\ProductReservationResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Catalog\Admin\ProductResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Catalog\Admin\Products\LocationInventoryResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Catalog\Admin\Products\ProductExtraResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Catalog\Admin\Products\ProductOptionResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Catalog\Admin\Products\ProductPropertyResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Catalog\Admin\Products\ProductVariationResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Catalog\Admin\PublishingScopeResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Catalog\Admin\SearchResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Catalog\Admin\SoftAllocationResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Catalog\Storefront\CategoryResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Catalog\Storefront\OrderTaxContextResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Catalog\Storefront\PriceListResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Catalog\Storefront\ProductResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Catalog\Storefront\ProductSearchResultResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Catalog\Storefront\ShippingResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\ChannelGroupResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\ChannelResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\CheckoutResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Checkouts\AppliedDiscountResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Checkouts\DestinationResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Checkouts\OrderAttributeResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Checkouts\OrderItemResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Checkouts\PaymentResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Customer\Accounts\CardResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Customer\Accounts\CustomerAttributeResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Customer\Accounts\CustomerAuditEntryResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Customer\Accounts\CustomerContactResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Customer\Accounts\CustomerNoteResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Customer\Accounts\CustomerPurchaseOrderAccountResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Customer\Accounts\CustomerSegmentResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Customer\Accounts\TransactionResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Customer\AddressValidationRequestResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Customer\Attributedefinition\AttributeResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Customer\CreditResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Customer\Credits\CreditAuditEntryResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Customer\Credits\CreditTransactionResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Customer\CustomerAccountResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Customer\CustomerAuthTicketResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Customer\CustomerSegmentResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Customer\CustomerSetResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Customer\VisitResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\InStockNotificationSubscriptionResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\LocationResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\OrderResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Orders\AdjustmentResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Orders\AppliedDiscountResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Orders\Attributedefinition\AttributeResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Orders\BillingInfoResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Orders\DigitalPackageResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Orders\ExtendedPropertyResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Orders\FulfillmentActionResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Orders\FulfillmentInfoResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Orders\OrderAttributeResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Orders\OrderItemResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Orders\OrderNoteResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Orders\OrderReturnableItemResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Orders\OrderValidationResultResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Orders\PackageResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Orders\PaymentResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Orders\PickupResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Orders\RefundResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Orders\ShipmentResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Payments\FraudScreenResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Payments\PublicCardResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\ReturnResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Returns\OrderNoteResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Returns\PackageResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Returns\ShipmentResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Settings\ApplicationResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Settings\CartSettingsResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Settings\Checkout\CustomerCheckoutSettingsResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Settings\Checkout\PaymentSettingsResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Settings\CheckoutSettingsResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Settings\General\CustomRouteSettingsResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Settings\General\TaxableTerritoryResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Settings\GeneralSettingsResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Settings\LocationUsageResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Settings\Shipping\SiteShippingHandlingFeeResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Settings\SiteShippingSettingsResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Shipping\Admin\CarrierConfigurationResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Shipping\Admin\Profiles\OrderHandlingFeeRulesResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Shipping\Admin\Profiles\ProductHandlingFeeRulesResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Shipping\Admin\Profiles\ShippingInclusionRuleResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Shipping\Admin\Profiles\ShippingStatesResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Shipping\Admin\ShippingProfileResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\TargetRuleResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\WishlistResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Commerce\Wishlists\WishlistItemResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Content\DocumentDraftSummaryResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Content\DocumentListResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Content\Documentlists\DocumentResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Content\Documentlists\DocumentTreeResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Content\Documentlists\FacetResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Content\Documentlists\ViewResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Content\DocumentListTypeResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Content\DocumentTypeResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Content\PropertyTypeResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Content\PublishSetSummaryResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Event\EventNotificationResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Event\Push\SubscriptionResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Event\Push\Subscriptions\EventDeliverySummaryResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Platform\Adminuser\AdminUserResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Platform\Adminuser\TenantAdminUserAuthTicketResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Platform\Appdev\AppPackageResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Platform\Appdev\PackageResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Platform\ApplicationResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Platform\Applications\AuthTicketResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Platform\Developer\DeveloperAdminUserAuthTicketResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Platform\EntityListResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Platform\Entitylists\EntityContainerResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Platform\Entitylists\EntityResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Platform\Entitylists\ListViewResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Platform\Extensions\CredentialStoreEntryResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Platform\InstalledApplicationsResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Platform\ReferenceDataResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Platform\SecureAppDataResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Platform\SiteDataResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Platform\TenantDataResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Platform\TenantExtensionsResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Platform\TenantResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Resources\Platform\UserDataResource.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Admin\Locations\Attributedefinition\AttributeUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Admin\LocationTypeUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Admin\LocationUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Carts\AppliedDiscountUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Carts\CartItemUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Carts\ChangeMessageUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Carts\ExtendedPropertyUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\CartUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Catalog\Admin\Attributedefinition\Attributes\AttributeLocalizedContentUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Catalog\Admin\Attributedefinition\Attributes\AttributeTypeRuleUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Catalog\Admin\Attributedefinition\Attributes\AttributeVocabularyValueUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Catalog\Admin\Attributedefinition\AttributeUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Catalog\Admin\Attributedefinition\Producttypes\ProductTypeExtraUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Catalog\Admin\Attributedefinition\Producttypes\ProductTypeOptionUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Catalog\Admin\Attributedefinition\Producttypes\ProductTypePropertyUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Catalog\Admin\Attributedefinition\Producttypes\ProductTypeVariationUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Catalog\Admin\Attributedefinition\ProductTypeUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Catalog\Admin\CategoryUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Catalog\Admin\Couponsets\AssignedDiscountUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Catalog\Admin\Couponsets\CouponUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Catalog\Admin\CouponSetUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Catalog\Admin\Discounts\DiscountTargetUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Catalog\Admin\DiscountSettingsUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Catalog\Admin\DiscountUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Catalog\Admin\FacetUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Catalog\Admin\LocationInventoryUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Catalog\Admin\MasterCatalogUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Catalog\Admin\Pricelists\PriceListEntryUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Catalog\Admin\PriceListUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Catalog\Admin\ProductReservationUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Catalog\Admin\Products\LocationInventoryUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Catalog\Admin\Products\ProductExtraUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Catalog\Admin\Products\ProductOptionUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Catalog\Admin\Products\ProductPropertyUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Catalog\Admin\Products\ProductVariationUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Catalog\Admin\ProductUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Catalog\Admin\PublishingScopeUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Catalog\Admin\SearchUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Catalog\Admin\SoftAllocationUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Catalog\Storefront\CategoryUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Catalog\Storefront\OrderTaxContextUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Catalog\Storefront\PriceListUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Catalog\Storefront\ProductSearchResultUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Catalog\Storefront\ProductUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Catalog\Storefront\ShippingUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\ChannelGroupUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\ChannelUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Checkouts\AppliedDiscountUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Checkouts\DestinationUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Checkouts\OrderAttributeUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Checkouts\OrderItemUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Checkouts\PaymentUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\CheckoutUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Customer\Accounts\CardUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Customer\Accounts\CustomerAttributeUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Customer\Accounts\CustomerAuditEntryUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Customer\Accounts\CustomerContactUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Customer\Accounts\CustomerNoteUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Customer\Accounts\CustomerPurchaseOrderAccountUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Customer\Accounts\CustomerSegmentUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Customer\Accounts\TransactionUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Customer\AddressValidationRequestUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Customer\Attributedefinition\AttributeUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Customer\Credits\CreditAuditEntryUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Customer\Credits\CreditTransactionUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Customer\CreditUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Customer\CustomerAccountUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Customer\CustomerAuthTicketUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Customer\CustomerSegmentUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Customer\CustomerSetUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Customer\VisitUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\InStockNotificationSubscriptionUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\LocationUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Orders\AdjustmentUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Orders\AppliedDiscountUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Orders\Attributedefinition\AttributeUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Orders\BillingInfoUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Orders\DigitalPackageUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Orders\ExtendedPropertyUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Orders\FulfillmentActionUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Orders\FulfillmentInfoUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Orders\OrderAttributeUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Orders\OrderItemUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Orders\OrderNoteUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Orders\OrderReturnableItemUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Orders\OrderValidationResultUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Orders\PackageUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Orders\PaymentUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Orders\PickupUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Orders\RefundUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Orders\ShipmentUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\OrderUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Payments\FraudScreenUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Payments\PublicCardUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Returns\OrderNoteUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Returns\PackageUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Returns\ShipmentUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\ReturnUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Settings\ApplicationUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Settings\CartSettingsUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Settings\Checkout\CustomerCheckoutSettingsUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Settings\Checkout\PaymentSettingsUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Settings\CheckoutSettingsUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Settings\General\CustomRouteSettingsUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Settings\General\TaxableTerritoryUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Settings\GeneralSettingsUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Settings\LocationUsageUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Settings\Shipping\SiteShippingHandlingFeeUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Settings\SiteShippingSettingsUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Shipping\Admin\CarrierConfigurationUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Shipping\Admin\Profiles\OrderHandlingFeeRulesUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Shipping\Admin\Profiles\ProductHandlingFeeRulesUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Shipping\Admin\Profiles\ShippingInclusionRuleUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Shipping\Admin\Profiles\ShippingStatesUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Shipping\Admin\ShippingProfileUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\TargetRuleUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\Wishlists\WishlistItemUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Commerce\WishlistUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Content\DocumentDraftSummaryUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Content\Documentlists\DocumentTreeUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Content\Documentlists\DocumentUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Content\Documentlists\FacetUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Content\Documentlists\ViewUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Content\DocumentListTypeUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Content\DocumentListUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Content\DocumentTypeUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Content\PropertyTypeUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Content\PublishSetSummaryUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Event\EventNotificationUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Event\Push\Subscriptions\EventDeliverySummaryUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Event\Push\SubscriptionUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Platform\Adminuser\AdminUserUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Platform\Adminuser\TenantAdminUserAuthTicketUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Platform\Appdev\AppPackageUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Platform\Appdev\PackageUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Platform\Applications\AuthTicketUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Platform\ApplicationUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Platform\Developer\DeveloperAdminUserAuthTicketUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Platform\Entitylists\EntityContainerUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Platform\Entitylists\EntityUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Platform\Entitylists\ListViewUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Platform\EntityListUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Platform\Extensions\CredentialStoreEntryUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Platform\InstalledApplicationsUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Platform\ReferenceDataUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Platform\SecureAppDataUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Platform\SiteDataUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Platform\TenantDataUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Platform\TenantExtensionsUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Platform\TenantUrl.cs" />
+    <Compile Include="c:\Users\perry.munger\source\git\mozu-dotnet\Mozu.Api\Urls\Platform\UserDataUrl.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
diff --git a/Mozu.Api/MozuClient.cs b/Mozu.Api/MozuClient.cs
index 4561d04c..c980a7d8 100644
--- a/Mozu.Api/MozuClient.cs
+++ b/Mozu.Api/MozuClient.cs
@@ -23,6 +23,7 @@
 
 namespace Mozu.Api
 {
+    using System.Threading;
 
     /// <summary>
     /// 
@@ -86,14 +87,10 @@ public virtual MozuClient<TResult> WithBody(Stream body)
         }
 
 
-		public virtual MozuClient<TResult> Execute()
-		{
-			base.ExecuteRequest();
-			return this;
-		}
-		public virtual async Task<MozuClient<TResult>> ExecuteAsync()
+		
+		public virtual async Task<MozuClient<TResult>> ExecuteAsync(CancellationToken ct)
 		{
-			await base.ExecuteRequestAsync().ConfigureAwait(false);
+			await base.ExecuteRequestAsync(ct).ConfigureAwait(false);
 			return this;
 		}
        
@@ -160,15 +157,11 @@ public virtual MozuClient WithBody(Stream body)
             return this;
         }
 
-		public virtual MozuClient Execute()
-		{
-			base.ExecuteRequest();
-			return this;
-		}
 
-		public virtual async Task<MozuClient> ExecuteAsync()
+
+		public virtual async Task<MozuClient> ExecuteAsync(CancellationToken ct)
 		{
-			await base.ExecuteRequestAsync().ConfigureAwait(false);
+			await base.ExecuteRequestAsync(ct).ConfigureAwait(false);
 			return this;
 		}
 
@@ -323,6 +316,7 @@ protected void SetBaseAddress(string baseAddress)
             _baseAddress =  HttpHelper.GetUrl(baseAddress);
         }
 
+
         protected void SetVerb(string verb)
         {
             _verb = verb.ToLower();
@@ -357,7 +351,7 @@ protected void SetBody(string body)
             _httpContent = new StringContent(body, Encoding.UTF8, "application/json");
         }
 
-        protected async Task ValidateContext()
+        protected async Task ValidateContext(CancellationToken ct)
 		{
 
             if (AppAuthenticator.Instance == null)
@@ -383,16 +377,7 @@ protected async Task ValidateContext()
 
 				if (string.IsNullOrEmpty(_apiContext.TenantUrl))
 				{
-				    var tenant = await GetTenant(_apiContext.TenantId).ConfigureAwait(false);
-					/*var tenantResource = new TenantResource();
-					var tenant = tenantResource.GetTenant(_apiContext.TenantId);
-
-					if (tenant == null)
-					{
-					    var apiException = new ApiException("Tenant " + _apiContext.TenantId + " Not found") {ApiContext = _apiContext};
-                        _log.Error(apiException.Message, apiException);
-                        throw apiException;
-					}*/
+				    var tenant = await GetTenantAsync(_apiContext.TenantId,ct).ConfigureAwait(false);
 						
                     _baseAddress = HttpHelper.GetUrl(tenant.Domain);
 				}
@@ -420,17 +405,17 @@ protected async Task ValidateContext()
 					_log.Info("TenantId is missing", new ApiException("TenantId is missing") { ApiContext = _apiContext });
 					throw new ApiException("TenantId is missing");
 				}
-                var tenant = await GetTenant(_apiContext.TenantId).ConfigureAwait(false);
+                var tenant = await GetTenantAsync(_apiContext.TenantId, ct).ConfigureAwait(false);
                 _baseAddress = tenant.IsDevTenant? MozuConfig.BaseDevPciUrl : MozuConfig.BasePciUrl;
 			}
 
 
 		}
 
-        private async Task<Tenant> GetTenant(int tenantId)
+        private async Task<Tenant> GetTenantAsync(int tenantId, CancellationToken ct)
         {
             var tenantResource = new TenantResource();
-            var tenant = await tenantResource.GetTenantAsync(_apiContext.TenantId).ConfigureAwait(false);
+            var tenant = await tenantResource.GetTenantAsync(_apiContext.TenantId, ct: ct).ConfigureAwait(false);
 
             if (tenant == null)
             {
@@ -441,23 +426,13 @@ private async Task<Tenant> GetTenant(int tenantId)
 
             return tenant;
         }
-
-		protected void ExecuteRequest()
-		{
-			ValidateContext().Wait();
-			var client = GetHttpClient();
-		    var request = GetRequestMessage();
-		    _httpResponseMessage = client.SendAsync(request, HttpCompletionOption.ResponseContentRead).Result;
-            ResponseHelper.EnsureSuccess(_httpResponseMessage, request, _apiContext);
-            SetCache(request);
-
-		}
-		protected async Task ExecuteRequestAsync()
+		
+		protected async Task ExecuteRequestAsync(CancellationToken ct)
 		{
-			await ValidateContext().ConfigureAwait(false);
-			var client = GetHttpClient();
+			await ValidateContext(ct).ConfigureAwait(false);
+			var client = GetHttpClient();            
             var request = GetRequestMessage();
-			_httpResponseMessage = await client.SendAsync(request, HttpCompletionOption.ResponseContentRead).ConfigureAwait(false);
+			_httpResponseMessage = await client.SendAsync(request, HttpCompletionOption.ResponseContentRead);
             ResponseHelper.EnsureSuccess(_httpResponseMessage,request, _apiContext);
             SetCache(request);
 		}
@@ -536,12 +511,12 @@ private HttpRequestMessage GetRequestMessage()
             return requestMessage;
         }
 
-        private void SetUserClaims()
+        private async Task SetUserClaims()
         {
             if (_apiContext == null || _apiContext.UserAuthTicket == null) return;
             AuthTicket newAuthTicket = null;
             if (_apiContext.UserAuthTicket.AuthenticationScope == AuthenticationScope.Customer)
-                newAuthTicket = CustomerAuthenticator.EnsureAuthTicket(_apiContext.UserAuthTicket);
+                newAuthTicket = await CustomerAuthenticator.EnsureAuthTicket(_apiContext.UserAuthTicket).ConfigureAwait(false);
             else
                 newAuthTicket = UserAuthenticator.EnsureAuthTicket(_apiContext.UserAuthTicket);
             if (newAuthTicket != null)
@@ -594,11 +569,12 @@ private HttpClient GetActualClient(Uri u)
                     AllowAutoRedirect = false,
                     UseCookies = false,
                     AutomaticDecompression = DecompressionMethods.GZip
-                        | DecompressionMethods.Deflate
+                        | DecompressionMethods.Deflate,
+                    
                 });
 
 
-
+                client.Timeout = TimeSpan.FromSeconds(MozuConfig.ClientTimeoutInSeconds);
                 client.MaxResponseContentBufferSize = int.MaxValue;
                 _clientsByHostName[key] = client;
             }
diff --git a/Mozu.Api/MozuConfig.cs b/Mozu.Api/MozuConfig.cs
index 785daa9c..70cdaee9 100644
--- a/Mozu.Api/MozuConfig.cs
+++ b/Mozu.Api/MozuConfig.cs
@@ -11,7 +11,9 @@ public class MozuConfig
         private static bool _enableCache = true;
         private static int _capabilityTimeoutInSeconds = 180;
         private static int _eventTimeoutInSeconds = 180;
-		private static string _baseAppAuthUrl = "https://home.mozu.com";
+        private static int _clientTimeoutInSeconds = 20;
+
+        private static string _baseAppAuthUrl = "https://home.mozu.com";
 
         /// <summary>
         /// Payment service url
@@ -44,7 +46,13 @@ public static int EventTimeoutInSeconds
             set { _eventTimeoutInSeconds = value; } 
         }
 
-		public static string BaseAppAuthUrl
+        public static int ClientTimeoutInSeconds
+        {
+            get { return _clientTimeoutInSeconds; }
+            set { _clientTimeoutInSeconds = value; }
+        }
+
+        public static string BaseAppAuthUrl
 		{
 			get { return _baseAppAuthUrl; }
 			set { _baseAppAuthUrl = value; }
diff --git a/Mozu.Api/MozuUrl.cs b/Mozu.Api/MozuUrl.cs
index 5453de82..d1b1c6a8 100644
--- a/Mozu.Api/MozuUrl.cs
+++ b/Mozu.Api/MozuUrl.cs
@@ -58,9 +58,9 @@ public void FormatUrl(string paramName, object value)
             if (Url.EndsWith("?")) Url = Url.Replace("?", "");
 		}
 
-	    public static string GetProductUrl(int tenantId, int siteId, string productCode)
+	    public static async Task<string> GetProductUrl(int tenantId, int siteId, string productCode)
 	    {
-	        var site = GetSite(tenantId, siteId);
+	        var site = await GetSite(tenantId, siteId).ConfigureAwait(false);
 	        return GetProductUrl(site, productCode);
 	    }
 
@@ -79,9 +79,9 @@ public static string GetCategoryUrl(Site site, Category category)
                 string.Format("https://{0}/{1}/c/{2}", domain,category.Content.Slug, category.Id);
 	    }
 
-        public static string GetCategoryUrl(int tenantId, int siteId, Category category)
+        public static async Task<string> GetCategoryUrl(int tenantId, int siteId, Category category)
         {
-            var site = GetSite(tenantId, siteId);
+            var site = await GetSite(tenantId, siteId).ConfigureAwait(false);
             return GetCategoryUrl(site, category);
         }
 
@@ -90,10 +90,10 @@ public static string GetSiteDomain(Site site)
             return !String.IsNullOrEmpty(site.PrimaryCustomDomain) ? site.PrimaryCustomDomain : site.Domain;
 	    }
 
-	    private static Site GetSite(int tenantId, int siteId)
+	    private static async Task<Site> GetSite(int tenantId, int siteId)
 	    {
             var tenantResource = new TenantResource();
-            var tenant = tenantResource.GetTenant(tenantId);
+            var tenant = await tenantResource.GetTenantAsync(tenantId).ConfigureAwait(false);
             var site = tenant.Sites.SingleOrDefault(x => x.Id.Equals(siteId));
 
             if (site == null) throw new Exception(string.Format("{0} not found for tenant {1}", siteId, tenantId));
diff --git a/Mozu.Api/Resources/Commerce/Admin/LocationResource.cs b/Mozu.Api/Resources/Commerce/Admin/LocationResource.cs
old mode 100644
new mode 100755
index 178c1650..b2176001
--- a/Mozu.Api/Resources/Commerce/Admin/LocationResource.cs
+++ b/Mozu.Api/Resources/Commerce/Admin/LocationResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Admin
 {
@@ -37,42 +38,15 @@ public LocationResource CloneWithApiContext(Action<IApiContext> contextModificat
 		}
 
 				
-		/// <summary>
-		/// Retrieves a list of all locations associated with a tenant, according to any filter and sort criteria specified in the request.
-		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Location.LocationCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var location = new Location();
-		///   var locationCollection = location.GetLocations( startIndex,  pageSize,  sortBy,  filter,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Location.LocationCollection GetLocations(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Location.LocationCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Admin.LocationClient.GetLocationsClient( startIndex,  pageSize,  sortBy,  filter,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of all locations associated with a tenant, according to any filter and sort criteria specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Location.LocationCollection"/>
 		/// </returns>
@@ -82,46 +56,22 @@ public virtual Mozu.Api.Contracts.Location.LocationCollection GetLocations(int?
 		///   var locationCollection = await location.GetLocationsAsync( startIndex,  pageSize,  sortBy,  filter,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Location.LocationCollection> GetLocationsAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Location.LocationCollection> GetLocationsAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Location.LocationCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Admin.LocationClient.GetLocationsClient( startIndex,  pageSize,  sortBy,  filter,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the details of the location specified in the request by location code.
-		/// </summary>
-		/// <param name="locationCode">The unique, user-defined code that identifies a location. </param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Location.Location"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var location = new Location();
-		///   var location = location.GetLocation( locationCode,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Location.Location GetLocation(string locationCode, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Location.Location> response;
-			var client = Mozu.Api.Clients.Commerce.Admin.LocationClient.GetLocationClient( locationCode,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of the location specified in the request by location code.
+		/// 
 		/// </summary>
-		/// <param name="locationCode">The unique, user-defined code that identifies a location. </param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="locationCode">The merchant-defined code of the location to retrieve.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Location.Location"/>
 		/// </returns>
@@ -131,46 +81,22 @@ public virtual Mozu.Api.Contracts.Location.Location GetLocation(string locationC
 		///   var location = await location.GetLocationAsync( locationCode,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Location.Location> GetLocationAsync(string locationCode, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Location.Location> GetLocationAsync(string locationCode, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Location.Location> response;
 			var client = Mozu.Api.Clients.Commerce.Admin.LocationClient.GetLocationClient( locationCode,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Creates a new physical location for the tenant specified in the request header.
-		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="location">Properties of a physical location a tenant uses to manage inventory and fulfills orders, provide store finder functionality, or both.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Location.Location"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var location = new Location();
-		///   var location = location.AddLocation( location,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Location.Location AddLocation(Mozu.Api.Contracts.Location.Location location, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Location.Location> response;
-			var client = Mozu.Api.Clients.Commerce.Admin.LocationClient.AddLocationClient( location,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Creates a new physical location for the tenant specified in the request header.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="location">Properties of a physical location a tenant uses to manage inventory and fulfills orders, provide store finder functionality, or both.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="location">Properties of the location to create.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Location.Location"/>
 		/// </returns>
@@ -180,48 +106,23 @@ public virtual Mozu.Api.Contracts.Location.Location AddLocation(Mozu.Api.Contrac
 		///   var location = await location.AddLocationAsync( location,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Location.Location> AddLocationAsync(Mozu.Api.Contracts.Location.Location location, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Location.Location> AddLocationAsync(Mozu.Api.Contracts.Location.Location location, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Location.Location> response;
 			var client = Mozu.Api.Clients.Commerce.Admin.LocationClient.AddLocationClient( location,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates one or more details of a the location specified in the request by location code.
-		/// </summary>
-		/// <param name="locationCode">The unique, user-defined code that identifies a location. </param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="location">Properties of a physical location a tenant uses to manage inventory and fulfills orders, provide store finder functionality, or both.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Location.Location"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var location = new Location();
-		///   var location = location.UpdateLocation( location,  locationCode,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Location.Location UpdateLocation(Mozu.Api.Contracts.Location.Location location, string locationCode, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Location.Location> response;
-			var client = Mozu.Api.Clients.Commerce.Admin.LocationClient.UpdateLocationClient( location,  locationCode,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates one or more details of a the location specified in the request by location code.
+		/// 
 		/// </summary>
-		/// <param name="locationCode">The unique, user-defined code that identifies a location. </param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="location">Properties of a physical location a tenant uses to manage inventory and fulfills orders, provide store finder functionality, or both.</param>
+		/// <param name="locationCode">The merchant-defined code associated with the location to update.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="location">Properties of the location to update.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Location.Location"/>
 		/// </returns>
@@ -231,43 +132,21 @@ public virtual Mozu.Api.Contracts.Location.Location UpdateLocation(Mozu.Api.Cont
 		///   var location = await location.UpdateLocationAsync( location,  locationCode,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Location.Location> UpdateLocationAsync(Mozu.Api.Contracts.Location.Location location, string locationCode, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Location.Location> UpdateLocationAsync(Mozu.Api.Contracts.Location.Location location, string locationCode, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Location.Location> response;
 			var client = Mozu.Api.Clients.Commerce.Admin.LocationClient.UpdateLocationClient( location,  locationCode,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Deletes the location specified in the request.
-		/// </summary>
-		/// <param name="locationCode">The unique, user-defined code that identifies a location. </param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var location = new Location();
-		///   location.DeleteLocation( locationCode);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteLocation(string locationCode)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Admin.LocationClient.DeleteLocationClient( locationCode);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes the location specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="locationCode">The unique, user-defined code that identifies a location. </param>
+		/// <param name="locationCode">The merchant-defined code of the location to delete.</param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -277,12 +156,12 @@ public virtual void DeleteLocation(string locationCode)
 		///   await location.DeleteLocationAsync( locationCode);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteLocationAsync(string locationCode)
+		public virtual async Task DeleteLocationAsync(string locationCode, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Admin.LocationClient.DeleteLocationClient( locationCode);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/Admin/LocationTypeResource.cs b/Mozu.Api/Resources/Commerce/Admin/LocationTypeResource.cs
old mode 100644
new mode 100755
index 00b2cf3f..405550b3
--- a/Mozu.Api/Resources/Commerce/Admin/LocationTypeResource.cs
+++ b/Mozu.Api/Resources/Commerce/Admin/LocationTypeResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Admin
 {
@@ -37,31 +38,9 @@ public LocationTypeResource CloneWithApiContext(Action<IApiContext> contextModif
 		}
 
 				
-		/// <summary>
-		/// Retrieve a list of all location types defined for the tenant.
-		/// </summary>
-		/// <returns>
-		/// List{<see cref="Mozu.Api.Contracts.Location.LocationType"/>}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var locationtype = new LocationType();
-		///   var locationType = locationtype.GetLocationTypes();
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<Mozu.Api.Contracts.Location.LocationType> GetLocationTypes()
-		{
-			MozuClient<List<Mozu.Api.Contracts.Location.LocationType>> response;
-			var client = Mozu.Api.Clients.Commerce.Admin.LocationTypeClient.GetLocationTypesClient();
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieve a list of all location types defined for the tenant.
+		/// 
 		/// </summary>
 		/// <returns>
 		/// List{<see cref="Mozu.Api.Contracts.Location.LocationType"/>}
@@ -72,46 +51,22 @@ public LocationTypeResource CloneWithApiContext(Action<IApiContext> contextModif
 		///   var locationType = await locationtype.GetLocationTypesAsync();
 		/// </code>
 		/// </example>
-		public virtual async Task<List<Mozu.Api.Contracts.Location.LocationType>> GetLocationTypesAsync()
+		public virtual async Task<List<Mozu.Api.Contracts.Location.LocationType>> GetLocationTypesAsync(CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<Mozu.Api.Contracts.Location.LocationType>> response;
 			var client = Mozu.Api.Clients.Commerce.Admin.LocationTypeClient.GetLocationTypesClient();
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the details of the location type specified in the request.
-		/// </summary>
-		/// <param name="locationTypeCode">The user-defined code that identifies the location type.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Location.LocationType"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var locationtype = new LocationType();
-		///   var locationType = locationtype.GetLocationType( locationTypeCode,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Location.LocationType GetLocationType(string locationTypeCode, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Location.LocationType> response;
-			var client = Mozu.Api.Clients.Commerce.Admin.LocationTypeClient.GetLocationTypeClient( locationTypeCode,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of the location type specified in the request.
+		/// 
 		/// </summary>
 		/// <param name="locationTypeCode">The user-defined code that identifies the location type.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Location.LocationType"/>
 		/// </returns>
@@ -121,46 +76,22 @@ public virtual Mozu.Api.Contracts.Location.LocationType GetLocationType(string l
 		///   var locationType = await locationtype.GetLocationTypeAsync( locationTypeCode,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Location.LocationType> GetLocationTypeAsync(string locationTypeCode, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Location.LocationType> GetLocationTypeAsync(string locationTypeCode, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Location.LocationType> response;
 			var client = Mozu.Api.Clients.Commerce.Admin.LocationTypeClient.GetLocationTypeClient( locationTypeCode,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Creates a new location type based on the information specified in the request.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="locationType">Properties of a type of physical location, such as warehouse or kiosk. Location types enable tenants to group similar locations for filtering and location usage type definition.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Location.LocationType"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var locationtype = new LocationType();
-		///   var locationType = locationtype.AddLocationType( locationType,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Location.LocationType AddLocationType(Mozu.Api.Contracts.Location.LocationType locationType, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Location.LocationType> response;
-			var client = Mozu.Api.Clients.Commerce.Admin.LocationTypeClient.AddLocationTypeClient( locationType,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Creates a new location type based on the information specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="locationType">Properties of a type of physical location, such as warehouse or kiosk. Location types enable tenants to group similar locations for filtering and location usage type definition.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="locationType">Properties of the location type to create.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Location.LocationType"/>
 		/// </returns>
@@ -170,48 +101,23 @@ public virtual Mozu.Api.Contracts.Location.LocationType AddLocationType(Mozu.Api
 		///   var locationType = await locationtype.AddLocationTypeAsync( locationType,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Location.LocationType> AddLocationTypeAsync(Mozu.Api.Contracts.Location.LocationType locationType, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Location.LocationType> AddLocationTypeAsync(Mozu.Api.Contracts.Location.LocationType locationType, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Location.LocationType> response;
 			var client = Mozu.Api.Clients.Commerce.Admin.LocationTypeClient.AddLocationTypeClient( locationType,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates the name of a defined location type.
-		/// </summary>
-		/// <param name="locationTypeCode">The user-defined code that identifies the location type.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="locationType">Properties of a type of physical location, such as warehouse or kiosk. Location types enable tenants to group similar locations for filtering and location usage type definition.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Location.LocationType"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var locationtype = new LocationType();
-		///   var locationType = locationtype.UpdateLocationType( locationType,  locationTypeCode,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Location.LocationType UpdateLocationType(Mozu.Api.Contracts.Location.LocationType locationType, string locationTypeCode, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Location.LocationType> response;
-			var client = Mozu.Api.Clients.Commerce.Admin.LocationTypeClient.UpdateLocationTypeClient( locationType,  locationTypeCode,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates the name of a defined location type.
+		/// 
 		/// </summary>
 		/// <param name="locationTypeCode">The user-defined code that identifies the location type.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="locationType">Properties of a type of physical location, such as warehouse or kiosk. Location types enable tenants to group similar locations for filtering and location usage type definition.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="locationType">Properties of the location type to update.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Location.LocationType"/>
 		/// </returns>
@@ -221,43 +127,21 @@ public virtual Mozu.Api.Contracts.Location.LocationType UpdateLocationType(Mozu.
 		///   var locationType = await locationtype.UpdateLocationTypeAsync( locationType,  locationTypeCode,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Location.LocationType> UpdateLocationTypeAsync(Mozu.Api.Contracts.Location.LocationType locationType, string locationTypeCode, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Location.LocationType> UpdateLocationTypeAsync(Mozu.Api.Contracts.Location.LocationType locationType, string locationTypeCode, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Location.LocationType> response;
 			var client = Mozu.Api.Clients.Commerce.Admin.LocationTypeClient.UpdateLocationTypeClient( locationType,  locationTypeCode,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Deletes the location type specified in the request.
-		/// </summary>
-		/// <param name="locationTypeCode">The user-defined code that identifies the location type.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var locationtype = new LocationType();
-		///   locationtype.DeleteLocationType( locationTypeCode);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteLocationType(string locationTypeCode)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Admin.LocationTypeClient.DeleteLocationTypeClient( locationTypeCode);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes the location type specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="locationTypeCode">The user-defined code that identifies the location type.</param>
+		/// <param name="locationTypeCode">User-defined code used to identify the location type.</param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -267,12 +151,12 @@ public virtual void DeleteLocationType(string locationTypeCode)
 		///   await locationtype.DeleteLocationTypeAsync( locationTypeCode);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteLocationTypeAsync(string locationTypeCode)
+		public virtual async Task DeleteLocationTypeAsync(string locationTypeCode, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Admin.LocationTypeClient.DeleteLocationTypeClient( locationTypeCode);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/Admin/Locations/Attributedefinition/AttributeResource.cs b/Mozu.Api/Resources/Commerce/Admin/Locations/Attributedefinition/AttributeResource.cs
new file mode 100755
index 00000000..ba4e4448
--- /dev/null
+++ b/Mozu.Api/Resources/Commerce/Admin/Locations/Attributedefinition/AttributeResource.cs
@@ -0,0 +1,174 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using Mozu.Api.Security;
+using System.Threading.Tasks;
+using Newtonsoft.Json.Linq;
+using System.Threading;
+
+namespace Mozu.Api.Resources.Commerce.Admin.Locations.Attributedefinition
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	public partial class AttributeResource  	{
+		///
+		/// <see cref="Mozu.Api.ApiContext"/>
+		///
+		private readonly IApiContext _apiContext;
+
+		
+		public AttributeResource(IApiContext apiContext) 
+		{
+			_apiContext = apiContext;
+		}
+
+		public AttributeResource CloneWithApiContext(Action<IApiContext> contextModification) 
+		{
+			return new AttributeResource(_apiContext.CloneWith(contextModification));
+		}
+
+				
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
+		/// <returns>
+		/// <see cref="Mozu.Api.Contracts.Core.Extensible.AttributeCollection"/>
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var attribute = new Attribute();
+		///   var attributeCollection = await attribute.GetAttributesAsync( startIndex,  pageSize,  sortBy,  filter,  responseFields);
+		/// </code>
+		/// </example>
+		public virtual async Task<Mozu.Api.Contracts.Core.Extensible.AttributeCollection> GetAttributesAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
+		{
+			MozuClient<Mozu.Api.Contracts.Core.Extensible.AttributeCollection> response;
+			var client = Mozu.Api.Clients.Commerce.Admin.Locations.Attributedefinition.AttributeClient.GetAttributesClient( startIndex,  pageSize,  sortBy,  filter,  responseFields);
+			client.WithContext(_apiContext);
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+			return await response.ResultAsync();
+
+		}
+
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="attributeFQN"></param>
+		/// <returns>
+		/// List{<see cref="Mozu.Api.Contracts.Core.Extensible.AttributeVocabularyValue"/>}
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var attribute = new Attribute();
+		///   var attributeVocabularyValue = await attribute.GetAttributeVocabularyValuesAsync( attributeFQN);
+		/// </code>
+		/// </example>
+		public virtual async Task<List<Mozu.Api.Contracts.Core.Extensible.AttributeVocabularyValue>> GetAttributeVocabularyValuesAsync(string attributeFQN, CancellationToken ct = default(CancellationToken))
+		{
+			MozuClient<List<Mozu.Api.Contracts.Core.Extensible.AttributeVocabularyValue>> response;
+			var client = Mozu.Api.Clients.Commerce.Admin.Locations.Attributedefinition.AttributeClient.GetAttributeVocabularyValuesClient( attributeFQN);
+			client.WithContext(_apiContext);
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+			return await response.ResultAsync();
+
+		}
+
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="attributeFQN"></param>
+		/// <param name="responseFields"></param>
+		/// <returns>
+		/// <see cref="Mozu.Api.Contracts.Core.Extensible.Attribute"/>
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var attribute = new Attribute();
+		///   var attribute = await attribute.GetAttributeAsync( attributeFQN,  responseFields);
+		/// </code>
+		/// </example>
+		public virtual async Task<Mozu.Api.Contracts.Core.Extensible.Attribute> GetAttributeAsync(string attributeFQN, string responseFields =  null, CancellationToken ct = default(CancellationToken))
+		{
+			MozuClient<Mozu.Api.Contracts.Core.Extensible.Attribute> response;
+			var client = Mozu.Api.Clients.Commerce.Admin.Locations.Attributedefinition.AttributeClient.GetAttributeClient( attributeFQN,  responseFields);
+			client.WithContext(_apiContext);
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+			return await response.ResultAsync();
+
+		}
+
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="responseFields"></param>
+		/// <param name="attribute"></param>
+		/// <returns>
+		/// <see cref="Mozu.Api.Contracts.Core.Extensible.Attribute"/>
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var attribute = new Attribute();
+		///   var attribute = await attribute.CreateAttributeAsync( attribute,  responseFields);
+		/// </code>
+		/// </example>
+		public virtual async Task<Mozu.Api.Contracts.Core.Extensible.Attribute> CreateAttributeAsync(Mozu.Api.Contracts.Core.Extensible.Attribute attribute, string responseFields =  null, CancellationToken ct = default(CancellationToken))
+		{
+			MozuClient<Mozu.Api.Contracts.Core.Extensible.Attribute> response;
+			var client = Mozu.Api.Clients.Commerce.Admin.Locations.Attributedefinition.AttributeClient.CreateAttributeClient( attribute,  responseFields);
+			client.WithContext(_apiContext);
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+			return await response.ResultAsync();
+
+		}
+
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="attributeFQN"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="attribute"></param>
+		/// <returns>
+		/// <see cref="Mozu.Api.Contracts.Core.Extensible.Attribute"/>
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var attribute = new Attribute();
+		///   var attribute = await attribute.UpdateAttributeAsync( attribute,  attributeFQN,  responseFields);
+		/// </code>
+		/// </example>
+		public virtual async Task<Mozu.Api.Contracts.Core.Extensible.Attribute> UpdateAttributeAsync(Mozu.Api.Contracts.Core.Extensible.Attribute attribute, string attributeFQN, string responseFields =  null, CancellationToken ct = default(CancellationToken))
+		{
+			MozuClient<Mozu.Api.Contracts.Core.Extensible.Attribute> response;
+			var client = Mozu.Api.Clients.Commerce.Admin.Locations.Attributedefinition.AttributeClient.UpdateAttributeClient( attribute,  attributeFQN,  responseFields);
+			client.WithContext(_apiContext);
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+			return await response.ResultAsync();
+
+		}
+
+
+	}
+
+}
+
+
diff --git a/Mozu.Api/Resources/Commerce/CartResource.cs b/Mozu.Api/Resources/Commerce/CartResource.cs
old mode 100644
new mode 100755
index 27e09685..9d7e6461
--- a/Mozu.Api/Resources/Commerce/CartResource.cs
+++ b/Mozu.Api/Resources/Commerce/CartResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce
 {
 	/// <summary>
-	/// Use this resource to manage storefront shopping carts as shoppers add and remove items for purchase. Each time a shopper's cart is modified, the Carts resource updates the estimated total with any applicable discounts.
+	/// Use the Carts resource to manage storefront shopping carts as items are added and removed. Each time a shopper's cart is modified, the Carts resource updates the estimated total with any applicable discounts.
 	/// </summary>
 	public partial class CartResource  	{
 		///
@@ -37,36 +38,12 @@ public CartResource CloneWithApiContext(Action<IApiContext> contextModification)
 		}
 
 				
-		/// <summary>
-		/// Retrieves the cart specified in the request.
-		/// </summary>
-		/// <param name="cartId">Identifier of the cart to delete.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Carts.Cart"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var cart = new Cart();
-		///   var cart = cart.GetCart( cartId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Carts.Cart GetCart(string cartId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Carts.Cart> response;
-			var client = Mozu.Api.Clients.Commerce.CartClient.GetCartClient( cartId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the cart specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="cartId">Identifier of the cart to delete.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="cartId">Identifier of the cart to retrieve.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Carts.Cart"/>
 		/// </returns>
@@ -76,44 +53,21 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Carts.Cart GetCart(string cart
 		///   var cart = await cart.GetCartAsync( cartId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Carts.Cart> GetCartAsync(string cartId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Carts.Cart> GetCartAsync(string cartId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Carts.Cart> response;
 			var client = Mozu.Api.Clients.Commerce.CartClient.GetCartClient( cartId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves a cart's contents for the current shopper. If the shopper does not have an active cart on the site, the service creates one.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Carts.Cart"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var cart = new Cart();
-		///   var cart = cart.GetOrCreateCart( responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Carts.Cart GetOrCreateCart(string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Carts.Cart> response;
-			var client = Mozu.Api.Clients.Commerce.CartClient.GetOrCreateCartClient( responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a cart's contents for the current shopper. If the shopper does not have an active cart on the site, the service creates one.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Carts.Cart"/>
 		/// </returns>
@@ -123,44 +77,21 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Carts.Cart GetOrCreateCart(str
 		///   var cart = await cart.GetOrCreateCartAsync( responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Carts.Cart> GetOrCreateCartAsync(string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Carts.Cart> GetOrCreateCartAsync(string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Carts.Cart> response;
 			var client = Mozu.Api.Clients.Commerce.CartClient.GetOrCreateCartClient( responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves summary information associated with the cart of the current shopper, including the number of items, the current total, and whether the cart has expired. All anonymous idle carts that do not proceed to checkout expire after 14 days.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Carts.CartSummary"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var cart = new Cart();
-		///   var cartSummary = cart.GetCartSummary( responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Carts.CartSummary GetCartSummary(string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Carts.CartSummary> response;
-			var client = Mozu.Api.Clients.Commerce.CartClient.GetCartSummaryClient( responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves summary information associated with the cart of the current shopper, including the number of items, the current total, and whether the cart has expired. All anonymous idle carts that do not proceed to checkout expire after 14 days.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Carts.CartSummary"/>
 		/// </returns>
@@ -170,46 +101,22 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Carts.CartSummary GetCartSumma
 		///   var cartSummary = await cart.GetCartSummaryAsync( responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Carts.CartSummary> GetCartSummaryAsync(string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Carts.CartSummary> GetCartSummaryAsync(string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Carts.CartSummary> response;
 			var client = Mozu.Api.Clients.Commerce.CartClient.GetCartSummaryClient( responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves summary information associated with the cart of user specified in the request, including the number of items in the cart, the current total, and whether the cart has expired. All anonymous idle carts that do not proceed to checkout expire after 14 days.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="userId">Unique identifier of the user whose tenant scopes you want to retrieve.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Carts.CartSummary"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var cart = new Cart();
-		///   var cartSummary = cart.GetUserCartSummary( userId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Carts.CartSummary GetUserCartSummary(string userId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Carts.CartSummary> response;
-			var client = Mozu.Api.Clients.Commerce.CartClient.GetUserCartSummaryClient( userId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves summary information associated with the cart of user specified in the request, including the number of items in the cart, the current total, and whether the cart has expired. All anonymous idle carts that do not proceed to checkout expire after 14 days.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="userId">Unique identifier of the user whose tenant scopes you want to retrieve.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="userId">Unique identifier of the user whose cart details you want to retrieve.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Carts.CartSummary"/>
 		/// </returns>
@@ -219,46 +126,22 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Carts.CartSummary GetUserCartS
 		///   var cartSummary = await cart.GetUserCartSummaryAsync( userId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Carts.CartSummary> GetUserCartSummaryAsync(string userId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Carts.CartSummary> GetUserCartSummaryAsync(string userId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Carts.CartSummary> response;
 			var client = Mozu.Api.Clients.Commerce.CartClient.GetUserCartSummaryClient( userId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the cart of the user specified in the request.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="userId">Unique identifier of the user whose tenant scopes you want to retrieve.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Carts.Cart"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var cart = new Cart();
-		///   var cart = cart.GetUserCart( userId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Carts.Cart GetUserCart(string userId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Carts.Cart> response;
-			var client = Mozu.Api.Clients.Commerce.CartClient.GetUserCartClient( userId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the cart of the user specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="userId">Unique identifier of the user whose tenant scopes you want to retrieve.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="userId">Unique identifier of the user whose cart you want to retrieve.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Carts.Cart"/>
 		/// </returns>
@@ -268,46 +151,22 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Carts.Cart GetUserCart(string
 		///   var cart = await cart.GetUserCartAsync( userId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Carts.Cart> GetUserCartAsync(string userId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Carts.Cart> GetUserCartAsync(string userId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Carts.Cart> response;
 			var client = Mozu.Api.Clients.Commerce.CartClient.GetUserCartClient( userId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Update the current shopper's cart.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="cart">Properties of a shopping cart.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Carts.Cart"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var cart = new Cart();
-		///   var cart = cart.UpdateCart( cart,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Carts.Cart UpdateCart(Mozu.Api.Contracts.CommerceRuntime.Carts.Cart cart, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Carts.Cart> response;
-			var client = Mozu.Api.Clients.Commerce.CartClient.UpdateCartClient( cart,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Update the current shopper's cart.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="cart">Properties of a shopping cart.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="cart">All of the properties of the cart to update. The product code is required.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Carts.Cart"/>
 		/// </returns>
@@ -317,41 +176,19 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Carts.Cart UpdateCart(Mozu.Api
 		///   var cart = await cart.UpdateCartAsync( cart,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Carts.Cart> UpdateCartAsync(Mozu.Api.Contracts.CommerceRuntime.Carts.Cart cart, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Carts.Cart> UpdateCartAsync(Mozu.Api.Contracts.CommerceRuntime.Carts.Cart cart, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Carts.Cart> response;
 			var client = Mozu.Api.Clients.Commerce.CartClient.UpdateCartClient( cart,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Deletes the cart specified in the request.
-		/// </summary>
-		/// <param name="cartId">Identifier of the cart to delete.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var cart = new Cart();
-		///   cart.DeleteCart( cartId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteCart(string cartId)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.CartClient.DeleteCartClient( cartId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes the cart specified in the request.
+		/// 
 		/// </summary>
 		/// <param name="cartId">Identifier of the cart to delete.</param>
 		/// <returns>
@@ -363,39 +200,18 @@ public virtual void DeleteCart(string cartId)
 		///   await cart.DeleteCartAsync( cartId);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteCartAsync(string cartId)
+		public virtual async Task DeleteCartAsync(string cartId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.CartClient.DeleteCartClient( cartId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
-		/// <summary>
-		/// Deletes the cart of the currently active shopper.
-		/// </summary>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var cart = new Cart();
-		///   cart.DeleteCurrentCart();
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteCurrentCart()
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.CartClient.DeleteCurrentCartClient();
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes the cart of the currently active shopper.
+		/// 
 		/// </summary>
 		/// <returns>
 		/// 
@@ -406,12 +222,12 @@ public virtual void DeleteCurrentCart()
 		///   await cart.DeleteCurrentCartAsync();
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteCurrentCartAsync()
+		public virtual async Task DeleteCurrentCartAsync(CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.CartClient.DeleteCurrentCartClient();
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/Carts/AppliedDiscountResource.cs b/Mozu.Api/Resources/Commerce/Carts/AppliedDiscountResource.cs
old mode 100644
new mode 100755
index ed23ea76..4c19a01c
--- a/Mozu.Api/Resources/Commerce/Carts/AppliedDiscountResource.cs
+++ b/Mozu.Api/Resources/Commerce/Carts/AppliedDiscountResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Carts
 {
 	/// <summary>
-	/// Use the Cart Coupons subresource to apply a coupon to a defined cart or remove a coupon from a cart. When the shopper proceeds to checkout, the coupons applied to the cart apply to the order.
+	/// Use the Cart Coupons resource to apply a coupon to a defined cart or remove a coupon from a cart. When the shopper proceeds to checkout, the coupons applied to the cart apply to the order.
 	/// </summary>
 	public partial class AppliedDiscountResource  	{
 		///
@@ -37,38 +38,13 @@ public AppliedDiscountResource CloneWithApiContext(Action<IApiContext> contextMo
 		}
 
 				
-		/// <summary>
-		/// Applies a defined coupon to the cart specified in the request.
-		/// </summary>
-		/// <param name="cartId">Identifier of the cart to delete.</param>
-		/// <param name="couponCode">Code associated with the coupon to remove from the cart.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Carts.Cart"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var applieddiscount = new AppliedDiscount();
-		///   var cart = applieddiscount.ApplyCoupon( cartId,  couponCode,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Carts.Cart ApplyCoupon(string cartId, string couponCode, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Carts.Cart> response;
-			var client = Mozu.Api.Clients.Commerce.Carts.AppliedDiscountClient.ApplyCouponClient( cartId,  couponCode,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Applies a defined coupon to the cart specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="cartId">Identifier of the cart to delete.</param>
-		/// <param name="couponCode">Code associated with the coupon to remove from the cart.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="cartId">Unique identifier of the cart to which to apply the coupon.</param>
+		/// <param name="couponCode">Code associated with the coupon to apply to the cart.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Carts.Cart"/>
 		/// </returns>
@@ -78,44 +54,21 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Carts.Cart ApplyCoupon(string
 		///   var cart = await applieddiscount.ApplyCouponAsync( cartId,  couponCode,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Carts.Cart> ApplyCouponAsync(string cartId, string couponCode, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Carts.Cart> ApplyCouponAsync(string cartId, string couponCode, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Carts.Cart> response;
 			var client = Mozu.Api.Clients.Commerce.Carts.AppliedDiscountClient.ApplyCouponClient( cartId,  couponCode,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Removes all coupons from the cart specified in the request.
-		/// </summary>
-		/// <param name="cartId">Identifier of the cart to delete.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Carts.Cart"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var applieddiscount = new AppliedDiscount();
-		///   var cart = applieddiscount.RemoveCoupons( cartId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Carts.Cart RemoveCoupons(string cartId)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Carts.Cart> response;
-			var client = Mozu.Api.Clients.Commerce.Carts.AppliedDiscountClient.RemoveCouponsClient( cartId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Removes all coupons from the cart specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="cartId">Identifier of the cart to delete.</param>
+		/// <param name="cartId">Unique identifier of the cart.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Carts.Cart"/>
 		/// </returns>
@@ -125,45 +78,21 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Carts.Cart RemoveCoupons(strin
 		///   var cart = await applieddiscount.RemoveCouponsAsync( cartId);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Carts.Cart> RemoveCouponsAsync(string cartId)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Carts.Cart> RemoveCouponsAsync(string cartId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Carts.Cart> response;
 			var client = Mozu.Api.Clients.Commerce.Carts.AppliedDiscountClient.RemoveCouponsClient( cartId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Removes an applied coupon from the cart specified in the request.
-		/// </summary>
-		/// <param name="cartId">Identifier of the cart to delete.</param>
-		/// <param name="couponCode">Code associated with the coupon to remove from the cart.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Carts.Cart"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var applieddiscount = new AppliedDiscount();
-		///   var cart = applieddiscount.RemoveCoupon( cartId,  couponCode);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Carts.Cart RemoveCoupon(string cartId, string couponCode)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Carts.Cart> response;
-			var client = Mozu.Api.Clients.Commerce.Carts.AppliedDiscountClient.RemoveCouponClient( cartId,  couponCode);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Removes an applied coupon from the cart specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="cartId">Identifier of the cart to delete.</param>
+		/// <param name="cartId">Unique identifier of the cart.</param>
 		/// <param name="couponCode">Code associated with the coupon to remove from the cart.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Carts.Cart"/>
@@ -174,12 +103,12 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Carts.Cart RemoveCoupon(string
 		///   var cart = await applieddiscount.RemoveCouponAsync( cartId,  couponCode);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Carts.Cart> RemoveCouponAsync(string cartId, string couponCode)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Carts.Cart> RemoveCouponAsync(string cartId, string couponCode, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Carts.Cart> response;
 			var client = Mozu.Api.Clients.Commerce.Carts.AppliedDiscountClient.RemoveCouponClient( cartId,  couponCode);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
diff --git a/Mozu.Api/Resources/Commerce/Carts/CartItemResource.cs b/Mozu.Api/Resources/Commerce/Carts/CartItemResource.cs
old mode 100644
new mode 100755
index 639b2dd0..50b1207f
--- a/Mozu.Api/Resources/Commerce/Carts/CartItemResource.cs
+++ b/Mozu.Api/Resources/Commerce/Carts/CartItemResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Carts
 {
@@ -37,36 +38,12 @@ public CartItemResource CloneWithApiContext(Action<IApiContext> contextModificat
 		}
 
 				
-		/// <summary>
-		/// Retrieves a particular cart item by providing the cart item ID.
-		/// </summary>
-		/// <param name="cartItemId">Identifier of the cart item to delete.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Carts.CartItem"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var cartitem = new CartItem();
-		///   var cartItem = cartitem.GetCartItem( cartItemId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Carts.CartItem GetCartItem(string cartItemId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Carts.CartItem> response;
-			var client = Mozu.Api.Clients.Commerce.Carts.CartItemClient.GetCartItemClient( cartItemId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a particular cart item by providing the cart item ID.
+		/// 
 		/// </summary>
-		/// <param name="cartItemId">Identifier of the cart item to delete.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="cartItemId">Identifier of the cart item to retrieve.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Carts.CartItem"/>
 		/// </returns>
@@ -76,44 +53,21 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Carts.CartItem GetCartItem(str
 		///   var cartItem = await cartitem.GetCartItemAsync( cartItemId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Carts.CartItem> GetCartItemAsync(string cartItemId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Carts.CartItem> GetCartItemAsync(string cartItemId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Carts.CartItem> response;
 			var client = Mozu.Api.Clients.Commerce.Carts.CartItemClient.GetCartItemClient( cartItemId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves a list of cart items including the total number of items in the cart.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Carts.CartItemCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var cartitem = new CartItem();
-		///   var cartItemCollection = cartitem.GetCartItems( responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Carts.CartItemCollection GetCartItems(string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Carts.CartItemCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Carts.CartItemClient.GetCartItemsClient( responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of cart items including the total number of items in the cart.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Carts.CartItemCollection"/>
 		/// </returns>
@@ -123,46 +77,22 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Carts.CartItemCollection GetCa
 		///   var cartItemCollection = await cartitem.GetCartItemsAsync( responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Carts.CartItemCollection> GetCartItemsAsync(string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Carts.CartItemCollection> GetCartItemsAsync(string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Carts.CartItemCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Carts.CartItemClient.GetCartItemsClient( responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Adds a product to the current shopper's cart.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="cartItem">Properties of an item added to an active shopping cart.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Carts.CartItem"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var cartitem = new CartItem();
-		///   var cartItem = cartitem.AddItemToCart( cartItem,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Carts.CartItem AddItemToCart(Mozu.Api.Contracts.CommerceRuntime.Carts.CartItem cartItem, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Carts.CartItem> response;
-			var client = Mozu.Api.Clients.Commerce.Carts.CartItemClient.AddItemToCartClient( cartItem,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Adds a product to the current shopper's cart.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="cartItem">Properties of an item added to an active shopping cart.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="cartItem">All properties of the new cart item. The product code is required.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Carts.CartItem"/>
 		/// </returns>
@@ -172,48 +102,23 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Carts.CartItem AddItemToCart(M
 		///   var cartItem = await cartitem.AddItemToCartAsync( cartItem,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Carts.CartItem> AddItemToCartAsync(Mozu.Api.Contracts.CommerceRuntime.Carts.CartItem cartItem, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Carts.CartItem> AddItemToCartAsync(Mozu.Api.Contracts.CommerceRuntime.Carts.CartItem cartItem, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Carts.CartItem> response;
 			var client = Mozu.Api.Clients.Commerce.Carts.CartItemClient.AddItemToCartClient( cartItem,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Update the quantity of an individual cart item in the cart of the current shopper.
-		/// </summary>
-		/// <param name="cartItemId">Identifier of the cart item to delete.</param>
-		/// <param name="quantity">The number of cart items in the shopper's active cart.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Carts.CartItem"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var cartitem = new CartItem();
-		///   var cartItem = cartitem.UpdateCartItemQuantity( cartItemId,  quantity,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Carts.CartItem UpdateCartItemQuantity(string cartItemId, int quantity, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Carts.CartItem> response;
-			var client = Mozu.Api.Clients.Commerce.Carts.CartItemClient.UpdateCartItemQuantityClient( cartItemId,  quantity,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Update the quantity of an individual cart item in the cart of the current shopper.
+		/// 
 		/// </summary>
-		/// <param name="cartItemId">Identifier of the cart item to delete.</param>
+		/// <param name="cartItemId">Identifier of the cart item to update quantity.</param>
 		/// <param name="quantity">The number of cart items in the shopper's active cart.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Carts.CartItem"/>
 		/// </returns>
@@ -223,48 +128,23 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Carts.CartItem UpdateCartItemQ
 		///   var cartItem = await cartitem.UpdateCartItemQuantityAsync( cartItemId,  quantity,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Carts.CartItem> UpdateCartItemQuantityAsync(string cartItemId, int quantity, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Carts.CartItem> UpdateCartItemQuantityAsync(string cartItemId, int quantity, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Carts.CartItem> response;
 			var client = Mozu.Api.Clients.Commerce.Carts.CartItemClient.UpdateCartItemQuantityClient( cartItemId,  quantity,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Update the product or product quantity of an item in the current shopper's cart.
-		/// </summary>
-		/// <param name="cartItemId">Identifier of the cart item to delete.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="cartItem">Properties of an item added to an active shopping cart.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Carts.CartItem"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var cartitem = new CartItem();
-		///   var cartItem = cartitem.UpdateCartItem( cartItem,  cartItemId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Carts.CartItem UpdateCartItem(Mozu.Api.Contracts.CommerceRuntime.Carts.CartItem cartItem, string cartItemId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Carts.CartItem> response;
-			var client = Mozu.Api.Clients.Commerce.Carts.CartItemClient.UpdateCartItemClient( cartItem,  cartItemId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Update the product or product quantity of an item in the current shopper's cart.
+		/// 
 		/// </summary>
-		/// <param name="cartItemId">Identifier of the cart item to delete.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="cartItem">Properties of an item added to an active shopping cart.</param>
+		/// <param name="cartItemId">Identifier of the cart item to update.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="cartItem">The properties of the cart item to update.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Carts.CartItem"/>
 		/// </returns>
@@ -274,41 +154,19 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Carts.CartItem UpdateCartItem(
 		///   var cartItem = await cartitem.UpdateCartItemAsync( cartItem,  cartItemId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Carts.CartItem> UpdateCartItemAsync(Mozu.Api.Contracts.CommerceRuntime.Carts.CartItem cartItem, string cartItemId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Carts.CartItem> UpdateCartItemAsync(Mozu.Api.Contracts.CommerceRuntime.Carts.CartItem cartItem, string cartItemId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Carts.CartItem> response;
 			var client = Mozu.Api.Clients.Commerce.Carts.CartItemClient.UpdateCartItemClient( cartItem,  cartItemId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Removes all items in the current shopper's active cart.
-		/// </summary>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Carts.Cart"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var cartitem = new CartItem();
-		///   var cart = cartitem.RemoveAllCartItems();
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Carts.Cart RemoveAllCartItems()
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Carts.Cart> response;
-			var client = Mozu.Api.Clients.Commerce.Carts.CartItemClient.RemoveAllCartItemsClient();
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Removes all items in the current shopper's active cart.
+		/// 
 		/// </summary>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Carts.Cart"/>
@@ -319,41 +177,19 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Carts.Cart RemoveAllCartItems(
 		///   var cart = await cartitem.RemoveAllCartItemsAsync();
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Carts.Cart> RemoveAllCartItemsAsync()
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Carts.Cart> RemoveAllCartItemsAsync(CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Carts.Cart> response;
 			var client = Mozu.Api.Clients.Commerce.Carts.CartItemClient.RemoveAllCartItemsClient();
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Deletes a specific cart item by providing the cart item ID.
-		/// </summary>
-		/// <param name="cartItemId">Identifier of the cart item to delete.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var cartitem = new CartItem();
-		///   cartitem.DeleteCartItem( cartItemId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteCartItem(string cartItemId)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Carts.CartItemClient.DeleteCartItemClient( cartItemId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes a specific cart item by providing the cart item ID.
+		/// 
 		/// </summary>
 		/// <param name="cartItemId">Identifier of the cart item to delete.</param>
 		/// <returns>
@@ -365,12 +201,12 @@ public virtual void DeleteCartItem(string cartItemId)
 		///   await cartitem.DeleteCartItemAsync( cartItemId);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteCartItemAsync(string cartItemId)
+		public virtual async Task DeleteCartItemAsync(string cartItemId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Carts.CartItemClient.DeleteCartItemClient( cartItemId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/Carts/ChangeMessageResource.cs b/Mozu.Api/Resources/Commerce/Carts/ChangeMessageResource.cs
old mode 100644
new mode 100755
index d6c25d02..798f1fba
--- a/Mozu.Api/Resources/Commerce/Carts/ChangeMessageResource.cs
+++ b/Mozu.Api/Resources/Commerce/Carts/ChangeMessageResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Carts
 {
@@ -37,34 +38,11 @@ public ChangeMessageResource CloneWithApiContext(Action<IApiContext> contextModi
 		}
 
 				
-		/// <summary>
-		/// Retrieves the messages associated with the current shopper's cart.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Carts.CartChangeMessageCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var changemessage = new ChangeMessage();
-		///   var cartChangeMessageCollection = changemessage.GetMessages( responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Carts.CartChangeMessageCollection GetMessages(string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Carts.CartChangeMessageCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Carts.ChangeMessageClient.GetMessagesClient( responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the messages associated with the current shopper's cart.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Carts.CartChangeMessageCollection"/>
 		/// </returns>
@@ -74,40 +52,19 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Carts.CartChangeMessageCollect
 		///   var cartChangeMessageCollection = await changemessage.GetMessagesAsync( responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Carts.CartChangeMessageCollection> GetMessagesAsync(string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Carts.CartChangeMessageCollection> GetMessagesAsync(string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Carts.CartChangeMessageCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Carts.ChangeMessageClient.GetMessagesClient( responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Deletes all messages associated with the cart of the current shopper.
-		/// </summary>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var changemessage = new ChangeMessage();
-		///   changemessage.RemoveAllMessages();
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void RemoveAllMessages()
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Carts.ChangeMessageClient.RemoveAllMessagesClient();
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes all messages associated with the cart of the current shopper.
+		/// 
 		/// </summary>
 		/// <returns>
 		/// 
@@ -118,40 +75,18 @@ public virtual void RemoveAllMessages()
 		///   await changemessage.RemoveAllMessagesAsync();
 		/// </code>
 		/// </example>
-		public virtual async Task RemoveAllMessagesAsync()
+		public virtual async Task RemoveAllMessagesAsync(CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Carts.ChangeMessageClient.RemoveAllMessagesClient();
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
-		/// <summary>
-		/// Removes a single message associated with the cart of the current shopper.
-		/// </summary>
-		/// <param name="messageId">Identifier of the message to remove from the cart.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var changemessage = new ChangeMessage();
-		///   changemessage.RemoveMessage( messageId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void RemoveMessage(string messageId)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Carts.ChangeMessageClient.RemoveMessageClient( messageId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Removes a single message associated with the cart of the current shopper.
+		/// 
 		/// </summary>
 		/// <param name="messageId">Identifier of the message to remove from the cart.</param>
 		/// <returns>
@@ -163,12 +98,12 @@ public virtual void RemoveMessage(string messageId)
 		///   await changemessage.RemoveMessageAsync( messageId);
 		/// </code>
 		/// </example>
-		public virtual async Task RemoveMessageAsync(string messageId)
+		public virtual async Task RemoveMessageAsync(string messageId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Carts.ChangeMessageClient.RemoveMessageClient( messageId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/Carts/ExtendedPropertyResource.cs b/Mozu.Api/Resources/Commerce/Carts/ExtendedPropertyResource.cs
old mode 100644
new mode 100755
index b83513af..a2d0ec0e
--- a/Mozu.Api/Resources/Commerce/Carts/ExtendedPropertyResource.cs
+++ b/Mozu.Api/Resources/Commerce/Carts/ExtendedPropertyResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Carts
 {
 	/// <summary>
-	/// Use the Cart Extended Properties subresource to store an arbitrary number of cart extended properties such as tracking strings, marketing sources, affiliates, sales personnel/data, and so on, on a per cart basis. Each cart may have none, one, or more than one entry in the extended properties collection, and all values in the extended properties collection are represented as strings. When you create an order from a cart, all extended properties are retained from the cart and copied to the order. Refer to the subresource for more information about order extended properties.
+	/// 
 	/// </summary>
 	public partial class ExtendedPropertyResource  	{
 		///
@@ -37,31 +38,9 @@ public ExtendedPropertyResource CloneWithApiContext(Action<IApiContext> contextM
 		}
 
 				
-		/// <summary>
-		/// Retrieves a list of cart extended properties specified in the request.
-		/// </summary>
-		/// <returns>
-		/// List{<see cref="Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty"/>}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var extendedproperty = new ExtendedProperty();
-		///   var extendedProperty = extendedproperty.GetExtendedProperties();
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty> GetExtendedProperties()
-		{
-			MozuClient<List<Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty>> response;
-			var client = Mozu.Api.Clients.Commerce.Carts.ExtendedPropertyClient.GetExtendedPropertiesClient();
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of cart extended properties specified in the request.
+		/// 
 		/// </summary>
 		/// <returns>
 		/// List{<see cref="Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty"/>}
@@ -72,44 +51,21 @@ public ExtendedPropertyResource CloneWithApiContext(Action<IApiContext> contextM
 		///   var extendedProperty = await extendedproperty.GetExtendedPropertiesAsync();
 		/// </code>
 		/// </example>
-		public virtual async Task<List<Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty>> GetExtendedPropertiesAsync()
+		public virtual async Task<List<Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty>> GetExtendedPropertiesAsync(CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty>> response;
 			var client = Mozu.Api.Clients.Commerce.Carts.ExtendedPropertyClient.GetExtendedPropertiesClient();
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Adds one or more specified extended properties to the carts extended properties collection.
-		/// </summary>
-		/// <param name="extendedProperties">The details of the new extended property.</param>
-		/// <returns>
-		/// List{<see cref="Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty"/>}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var extendedproperty = new ExtendedProperty();
-		///   var extendedProperty = extendedproperty.AddExtendedProperties( extendedProperties);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty> AddExtendedProperties(List<Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty> extendedProperties)
-		{
-			MozuClient<List<Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty>> response;
-			var client = Mozu.Api.Clients.Commerce.Carts.ExtendedPropertyClient.AddExtendedPropertiesClient( extendedProperties);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Adds one or more specified extended properties to the carts extended properties collection.
+		/// 
 		/// </summary>
-		/// <param name="extendedProperties">The details of the new extended property.</param>
+		/// <param name="extendedProperties"></param>
 		/// <returns>
 		/// List{<see cref="Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty"/>}
 		/// </returns>
@@ -119,50 +75,24 @@ public ExtendedPropertyResource CloneWithApiContext(Action<IApiContext> contextM
 		///   var extendedProperty = await extendedproperty.AddExtendedPropertiesAsync( extendedProperties);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty>> AddExtendedPropertiesAsync(List<Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty> extendedProperties)
+		public virtual async Task<List<Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty>> AddExtendedPropertiesAsync(List<Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty> extendedProperties, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty>> response;
 			var client = Mozu.Api.Clients.Commerce.Carts.ExtendedPropertyClient.AddExtendedPropertiesClient( extendedProperties);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates one or more details of the extended property specified in the request.
-		/// </summary>
-		/// <param name="key">Key used for metadata defined for objects, including extensible attributes, custom attributes associated with a shipping provider, and search synonyms definitions. This content may be user-defined depending on the object and usage.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="upsert">Any set of key value pairs to be stored in the extended properties of a cart.</param>
-		/// <param name="extendedProperty">The details of the updated extended property.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var extendedproperty = new ExtendedProperty();
-		///   var extendedProperty = extendedproperty.UpdateExtendedProperty( extendedProperty,  key,  upsert,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty UpdateExtendedProperty(Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty extendedProperty, string key, bool? upsert =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty> response;
-			var client = Mozu.Api.Clients.Commerce.Carts.ExtendedPropertyClient.UpdateExtendedPropertyClient( extendedProperty,  key,  upsert,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates one or more details of the extended property specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="key">Key used for metadata defined for objects, including extensible attributes, custom attributes associated with a shipping provider, and search synonyms definitions. This content may be user-defined depending on the object and usage.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="upsert">Any set of key value pairs to be stored in the extended properties of a cart.</param>
-		/// <param name="extendedProperty">The details of the updated extended property.</param>
+		/// <param name="key"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="upsert"></param>
+		/// <param name="extendedProperty"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty"/>
 		/// </returns>
@@ -172,46 +102,22 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty Upda
 		///   var extendedProperty = await extendedproperty.UpdateExtendedPropertyAsync( extendedProperty,  key,  upsert,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty> UpdateExtendedPropertyAsync(Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty extendedProperty, string key, bool? upsert =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty> UpdateExtendedPropertyAsync(Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty extendedProperty, string key, bool? upsert =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty> response;
 			var client = Mozu.Api.Clients.Commerce.Carts.ExtendedPropertyClient.UpdateExtendedPropertyClient( extendedProperty,  key,  upsert,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates one or more details of the extended properties specified in the request.
-		/// </summary>
-		/// <param name="upsert">Any set of key value pairs to be stored in the extended properties of a cart.</param>
-		/// <param name="extendedProperties">The details of the updated extended properties.</param>
-		/// <returns>
-		/// List{<see cref="Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty"/>}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var extendedproperty = new ExtendedProperty();
-		///   var extendedProperty = extendedproperty.UpdateExtendedProperties( extendedProperties,  upsert);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty> UpdateExtendedProperties(List<Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty> extendedProperties, bool? upsert =  null)
-		{
-			MozuClient<List<Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty>> response;
-			var client = Mozu.Api.Clients.Commerce.Carts.ExtendedPropertyClient.UpdateExtendedPropertiesClient( extendedProperties,  upsert);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates one or more details of the extended properties specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="upsert">Any set of key value pairs to be stored in the extended properties of a cart.</param>
-		/// <param name="extendedProperties">The details of the updated extended properties.</param>
+		/// <param name="upsert"></param>
+		/// <param name="extendedProperties"></param>
 		/// <returns>
 		/// List{<see cref="Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty"/>}
 		/// </returns>
@@ -221,41 +127,19 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty Upda
 		///   var extendedProperty = await extendedproperty.UpdateExtendedPropertiesAsync( extendedProperties,  upsert);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty>> UpdateExtendedPropertiesAsync(List<Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty> extendedProperties, bool? upsert =  null)
+		public virtual async Task<List<Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty>> UpdateExtendedPropertiesAsync(List<Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty> extendedProperties, bool? upsert =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty>> response;
 			var client = Mozu.Api.Clients.Commerce.Carts.ExtendedPropertyClient.UpdateExtendedPropertiesClient( extendedProperties,  upsert);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Deletes the extended properties cart extended properties collection.
-		/// </summary>
-		/// <param name="keys"></param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var extendedproperty = new ExtendedProperty();
-		///   extendedproperty.DeleteExtendedProperties( keys);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteExtendedProperties(List<string> keys)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Carts.ExtendedPropertyClient.DeleteExtendedPropertiesClient( keys);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes the extended properties cart extended properties collection.
+		/// 
 		/// </summary>
 		/// <param name="keys"></param>
 		/// <returns>
@@ -267,40 +151,18 @@ public virtual void DeleteExtendedProperties(List<string> keys)
 		///   await extendedproperty.DeleteExtendedPropertiesAsync( keys);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteExtendedPropertiesAsync(List<string> keys)
+		public virtual async Task DeleteExtendedPropertiesAsync(List<string> keys, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Carts.ExtendedPropertyClient.DeleteExtendedPropertiesClient( keys);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
-		/// <summary>
-		/// Deletes a specific extended property from the cart extended property collection.
-		/// </summary>
-		/// <param name="key"></param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var extendedproperty = new ExtendedProperty();
-		///   extendedproperty.DeleteExtendedProperty( key);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteExtendedProperty(string key)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Carts.ExtendedPropertyClient.DeleteExtendedPropertyClient( key);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes a specific extended property from the cart extended property collection.
+		/// 
 		/// </summary>
 		/// <param name="key"></param>
 		/// <returns>
@@ -312,12 +174,12 @@ public virtual void DeleteExtendedProperty(string key)
 		///   await extendedproperty.DeleteExtendedPropertyAsync( key);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteExtendedPropertyAsync(string key)
+		public virtual async Task DeleteExtendedPropertyAsync(string key, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Carts.ExtendedPropertyClient.DeleteExtendedPropertyClient( key);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/Catalog/Admin/Attributedefinition/AttributeResource.cs b/Mozu.Api/Resources/Commerce/Catalog/Admin/Attributedefinition/AttributeResource.cs
old mode 100644
new mode 100755
index 3bbe5f0a..b99e2d3a
--- a/Mozu.Api/Resources/Commerce/Catalog/Admin/Attributedefinition/AttributeResource.cs
+++ b/Mozu.Api/Resources/Commerce/Catalog/Admin/Attributedefinition/AttributeResource.cs
@@ -13,13 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Catalog.Admin.Attributedefinition
 {
 	/// <summary>
-	/// Attributes are used to add custom definitions and characteristics to the following objects:
-
-
+	/// Use the Attribute Definition resource to manage the properties, options, and extras that uniquely describe products of a specific type. Attributes can be associated with a product type, assigned values by a client or shopper, and added as faceted search filters for a product category. Options are product attributes that describe unique configurations made by the shopper, such as size or color, and generate a new product variation (or unique SKU). Properties are product attributes that describe aspects of the product that do not represent an option configurable by the shopper, such as screen resolution or brand. Extras are product attributes that describe add-on configurations made by the shopper that do not represent a product variation, such as a monogram.
 	/// </summary>
 	public partial class AttributeResource  	{
 		///
@@ -39,41 +38,13 @@ public AttributeResource CloneWithApiContext(Action<IApiContext> contextModifica
 		}
 
 				
-		/// <summary>
-		/// Retrieves a paged list of attributes according to any specified filter criteria and sort options.
-		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy"></param>
-		/// <param name="startIndex"></param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.AttributeCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var attribute = new Attribute();
-		///   var attributeCollection = attribute.GetAttributes( startIndex,  pageSize,  sortBy,  filter,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.AttributeCollection GetAttributes(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.AttributeCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.AttributeClient.GetAttributesClient( startIndex,  pageSize,  sortBy,  filter,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a paged list of attributes according to any specified filter criteria and sort options.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
 		/// <param name="sortBy"></param>
 		/// <param name="startIndex"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
@@ -86,47 +57,22 @@ public virtual Mozu.Api.Contracts.ProductAdmin.AttributeCollection GetAttributes
 		///   var attributeCollection = await attribute.GetAttributesAsync( startIndex,  pageSize,  sortBy,  filter,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.AttributeCollection> GetAttributesAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.AttributeCollection> GetAttributesAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.AttributeCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.AttributeClient.GetAttributesClient( startIndex,  pageSize,  sortBy,  filter,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the details of the specified product attribute.
-		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.Attribute"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var attribute = new Attribute();
-		///   var attribute = attribute.GetAttribute( attributeFQN,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.Attribute GetAttribute(string attributeFQN, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.Attribute> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.AttributeClient.GetAttributeClient( attributeFQN,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of the specified product attribute.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.Attribute"/>
@@ -137,48 +83,23 @@ public virtual Mozu.Api.Contracts.ProductAdmin.Attribute GetAttribute(string att
 		///   var attribute = await attribute.GetAttributeAsync( attributeFQN,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.Attribute> GetAttributeAsync(string attributeFQN, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.Attribute> GetAttributeAsync(string attributeFQN, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.Attribute> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.AttributeClient.GetAttributeClient( attributeFQN,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Creates a new attribute to describe one aspect of a product such as color or size, based on its defined product type. The attribute name, attribute type, input type, and data type are required.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="attribute">Properties of an attribute used to describe customers or orders.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.Attribute"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var attribute = new Attribute();
-		///   var attribute = attribute.AddAttribute( attribute,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.Attribute AddAttribute(Mozu.Api.Contracts.ProductAdmin.Attribute attribute, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.Attribute> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.AttributeClient.AddAttributeClient( attribute,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Creates a new attribute to describe one aspect of a product such as color or size, based on its defined product type. The attribute name, attribute type, input type, and data type are required.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="attribute">Properties of an attribute used to describe customers or orders.</param>
+		/// <param name="attribute">Properties of the new product attribute to create.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.Attribute"/>
 		/// </returns>
@@ -188,50 +109,24 @@ public virtual Mozu.Api.Contracts.ProductAdmin.Attribute AddAttribute(Mozu.Api.C
 		///   var attribute = await attribute.AddAttributeAsync( attribute,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.Attribute> AddAttributeAsync(Mozu.Api.Contracts.ProductAdmin.Attribute attribute, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.Attribute> AddAttributeAsync(Mozu.Api.Contracts.ProductAdmin.Attribute attribute, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.Attribute> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.AttributeClient.AddAttributeClient( attribute,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates an existing attribute with attribute properties to set.
-		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="attribute">Properties of an attribute used to describe customers or orders.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.Attribute"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var attribute = new Attribute();
-		///   var attribute = attribute.UpdateAttribute( attribute,  attributeFQN,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.Attribute UpdateAttribute(Mozu.Api.Contracts.ProductAdmin.Attribute attribute, string attributeFQN, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.Attribute> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.AttributeClient.UpdateAttributeClient( attribute,  attributeFQN,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates an existing attribute with attribute properties to set.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="attribute">Properties of an attribute used to describe customers or orders.</param>
+		/// <param name="attribute">Any properties of the attribute that to update.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.Attribute"/>
 		/// </returns>
@@ -241,44 +136,21 @@ public virtual Mozu.Api.Contracts.ProductAdmin.Attribute UpdateAttribute(Mozu.Ap
 		///   var attribute = await attribute.UpdateAttributeAsync( attribute,  attributeFQN,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.Attribute> UpdateAttributeAsync(Mozu.Api.Contracts.ProductAdmin.Attribute attribute, string attributeFQN, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.Attribute> UpdateAttributeAsync(Mozu.Api.Contracts.ProductAdmin.Attribute attribute, string attributeFQN, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.Attribute> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.AttributeClient.UpdateAttributeClient( attribute,  attributeFQN,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Deletes a defined product attribute. You cannot delete an attribute assigned a value for a product.
-		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var attribute = new Attribute();
-		///   attribute.DeleteAttribute( attributeFQN);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteAttribute(string attributeFQN)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.AttributeClient.DeleteAttributeClient( attributeFQN);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes a defined product attribute. You cannot delete an attribute assigned a value for a product.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
+		/// <param name="attributeFQN"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		/// 
@@ -289,12 +161,12 @@ public virtual void DeleteAttribute(string attributeFQN)
 		///   await attribute.DeleteAttributeAsync( attributeFQN);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteAttributeAsync(string attributeFQN)
+		public virtual async Task DeleteAttributeAsync(string attributeFQN, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.AttributeClient.DeleteAttributeClient( attributeFQN);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/Catalog/Admin/Attributedefinition/Attributes/AttributeLocalizedContentResource.cs b/Mozu.Api/Resources/Commerce/Catalog/Admin/Attributedefinition/Attributes/AttributeLocalizedContentResource.cs
old mode 100644
new mode 100755
index dd19032d..a96e0eb0
--- a/Mozu.Api/Resources/Commerce/Catalog/Admin/Attributedefinition/Attributes/AttributeLocalizedContentResource.cs
+++ b/Mozu.Api/Resources/Commerce/Catalog/Admin/Attributedefinition/Attributes/AttributeLocalizedContentResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Catalog.Admin.Attributedefinition.Attributes
 {
 	/// <summary>
-	/// Properties of localized content for attributes, based on a `localeCode` at a site/tenant level. This content supports translated text for product, product options, and additional objects. 
+	/// 
 	/// </summary>
 	public partial class AttributeLocalizedContentResource  	{
 		///
@@ -37,35 +38,11 @@ public AttributeLocalizedContentResource CloneWithApiContext(Action<IApiContext>
 		}
 
 				
-		/// <summary>
-		/// Retrieves a collection of localized content for attributes based on a `localeCode`.
-		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <returns>
-		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent"/>}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var attributelocalizedcontent = new AttributeLocalizedContent();
-		///   var attributeLocalizedContent = attributelocalizedcontent.GetAttributeLocalizedContents( attributeFQN);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent> GetAttributeLocalizedContents(string attributeFQN)
-		{
-			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent>> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Attributes.AttributeLocalizedContentClient.GetAttributeLocalizedContentsClient( attributeFQN);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a collection of localized content for attributes based on a `localeCode`.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
+		/// <param name="attributeFQN"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent"/>}
@@ -76,49 +53,23 @@ public AttributeLocalizedContentResource CloneWithApiContext(Action<IApiContext>
 		///   var attributeLocalizedContent = await attributelocalizedcontent.GetAttributeLocalizedContentsAsync( attributeFQN);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent>> GetAttributeLocalizedContentsAsync(string attributeFQN)
+		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent>> GetAttributeLocalizedContentsAsync(string attributeFQN, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent>> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Attributes.AttributeLocalizedContentClient.GetAttributeLocalizedContentsClient( attributeFQN);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the localized content for an attribute based on a `localeCode`.
-		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="localeCode">Language used for the entity. Currently, only "en-US" is supported.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var attributelocalizedcontent = new AttributeLocalizedContent();
-		///   var attributeLocalizedContent = attributelocalizedcontent.GetAttributeLocalizedContent( attributeFQN,  localeCode,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent GetAttributeLocalizedContent(string attributeFQN, string localeCode, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Attributes.AttributeLocalizedContentClient.GetAttributeLocalizedContentClient( attributeFQN,  localeCode,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the localized content for an attribute based on a `localeCode`.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="localeCode">Language used for the entity. Currently, only "en-US" is supported.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="localeCode"></param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent"/>
@@ -129,50 +80,24 @@ public virtual Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent GetAttr
 		///   var attributeLocalizedContent = await attributelocalizedcontent.GetAttributeLocalizedContentAsync( attributeFQN,  localeCode,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent> GetAttributeLocalizedContentAsync(string attributeFQN, string localeCode, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent> GetAttributeLocalizedContentAsync(string attributeFQN, string localeCode, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Attributes.AttributeLocalizedContentClient.GetAttributeLocalizedContentClient( attributeFQN,  localeCode,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Adds new localized content for an attribute based on a `localeCode`.
-		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="localizedContent">The localized name and description of the attribute, displayed in the locale defined for the master catalog.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var attributelocalizedcontent = new AttributeLocalizedContent();
-		///   var attributeLocalizedContent = attributelocalizedcontent.AddLocalizedContent( localizedContent,  attributeFQN,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent AddLocalizedContent(Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent localizedContent, string attributeFQN, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Attributes.AttributeLocalizedContentClient.AddLocalizedContentClient( localizedContent,  attributeFQN,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Adds new localized content for an attribute based on a `localeCode`.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="localizedContent">The localized name and description of the attribute, displayed in the locale defined for the master catalog.</param>
+		/// <param name="localizedContent"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent"/>
 		/// </returns>
@@ -182,48 +107,23 @@ public virtual Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent AddLoca
 		///   var attributeLocalizedContent = await attributelocalizedcontent.AddLocalizedContentAsync( localizedContent,  attributeFQN,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent> AddLocalizedContentAsync(Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent localizedContent, string attributeFQN, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent> AddLocalizedContentAsync(Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent localizedContent, string attributeFQN, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Attributes.AttributeLocalizedContentClient.AddLocalizedContentClient( localizedContent,  attributeFQN,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates the localized content for a collection of existing attributes based on a `localeCode`.
-		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="localizedContent">The localized name and description of the attribute, displayed in the locale defined for the master catalog.</param>
-		/// <returns>
-		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent"/>}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var attributelocalizedcontent = new AttributeLocalizedContent();
-		///   var attributeLocalizedContent = attributelocalizedcontent.UpdateLocalizedContents( localizedContent,  attributeFQN);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent> UpdateLocalizedContents(List<Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent> localizedContent, string attributeFQN)
-		{
-			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent>> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Attributes.AttributeLocalizedContentClient.UpdateLocalizedContentsClient( localizedContent,  attributeFQN);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates the localized content for a collection of existing attributes based on a `localeCode`.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
+		/// <param name="attributeFQN"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="localizedContent">The localized name and description of the attribute, displayed in the locale defined for the master catalog.</param>
+		/// <param name="localizedContent"></param>
 		/// <returns>
 		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent"/>}
 		/// </returns>
@@ -233,52 +133,25 @@ public virtual Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent AddLoca
 		///   var attributeLocalizedContent = await attributelocalizedcontent.UpdateLocalizedContentsAsync( localizedContent,  attributeFQN);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent>> UpdateLocalizedContentsAsync(List<Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent> localizedContent, string attributeFQN)
+		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent>> UpdateLocalizedContentsAsync(List<Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent> localizedContent, string attributeFQN, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent>> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Attributes.AttributeLocalizedContentClient.UpdateLocalizedContentsClient( localizedContent,  attributeFQN);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates the localized content for an existing attribute based on a `localeCode`.
-		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="localeCode">Language used for the entity. Currently, only "en-US" is supported.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="localizedContent">The localized name and description of the attribute, displayed in the locale defined for the master catalog.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var attributelocalizedcontent = new AttributeLocalizedContent();
-		///   var attributeLocalizedContent = attributelocalizedcontent.UpdateLocalizedContent( localizedContent,  attributeFQN,  localeCode,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent UpdateLocalizedContent(Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent localizedContent, string attributeFQN, string localeCode, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Attributes.AttributeLocalizedContentClient.UpdateLocalizedContentClient( localizedContent,  attributeFQN,  localeCode,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates the localized content for an existing attribute based on a `localeCode`.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="localeCode">Language used for the entity. Currently, only "en-US" is supported.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="localeCode"></param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="localizedContent">The localized name and description of the attribute, displayed in the locale defined for the master catalog.</param>
+		/// <param name="localizedContent"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent"/>
 		/// </returns>
@@ -288,46 +161,22 @@ public virtual Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent UpdateL
 		///   var attributeLocalizedContent = await attributelocalizedcontent.UpdateLocalizedContentAsync( localizedContent,  attributeFQN,  localeCode,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent> UpdateLocalizedContentAsync(Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent localizedContent, string attributeFQN, string localeCode, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent> UpdateLocalizedContentAsync(Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent localizedContent, string attributeFQN, string localeCode, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.AttributeLocalizedContent> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Attributes.AttributeLocalizedContentClient.UpdateLocalizedContentClient( localizedContent,  attributeFQN,  localeCode,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Removes all localized content. Localized content is translated text information and data based on a `localeCode`. 
-		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="localeCode">Language used for the entity. Currently, only "en-US" is supported.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var attributelocalizedcontent = new AttributeLocalizedContent();
-		///   attributelocalizedcontent.DeleteLocalizedContent( attributeFQN,  localeCode);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteLocalizedContent(string attributeFQN, string localeCode)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Attributes.AttributeLocalizedContentClient.DeleteLocalizedContentClient( attributeFQN,  localeCode);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Removes all localized content. Localized content is translated text information and data based on a `localeCode`. 
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="localeCode">Language used for the entity. Currently, only "en-US" is supported.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="localeCode"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		/// 
@@ -338,12 +187,12 @@ public virtual void DeleteLocalizedContent(string attributeFQN, string localeCod
 		///   await attributelocalizedcontent.DeleteLocalizedContentAsync( attributeFQN,  localeCode);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteLocalizedContentAsync(string attributeFQN, string localeCode)
+		public virtual async Task DeleteLocalizedContentAsync(string attributeFQN, string localeCode, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Attributes.AttributeLocalizedContentClient.DeleteLocalizedContentClient( attributeFQN,  localeCode);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/Catalog/Admin/Attributedefinition/Attributes/AttributeTypeRuleResource.cs b/Mozu.Api/Resources/Commerce/Catalog/Admin/Attributedefinition/Attributes/AttributeTypeRuleResource.cs
old mode 100644
new mode 100755
index 08fa1367..40294844
--- a/Mozu.Api/Resources/Commerce/Catalog/Admin/Attributedefinition/Attributes/AttributeTypeRuleResource.cs
+++ b/Mozu.Api/Resources/Commerce/Catalog/Admin/Attributedefinition/Attributes/AttributeTypeRuleResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Catalog.Admin.Attributedefinition.Attributes
 {
@@ -37,41 +38,13 @@ public AttributeTypeRuleResource CloneWithApiContext(Action<IApiContext> context
 		}
 
 				
-		/// <summary>
-		/// Retrieves a list of attribute type rules according to optional filter criteria and sort options. Attribute type rules help drive the behavior of attributes on a storefront page.
-		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy"></param>
-		/// <param name="startIndex"></param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.AttributeTypeRuleCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var attributetyperule = new AttributeTypeRule();
-		///   var attributeTypeRuleCollection = attributetyperule.GetAttributeTypeRules( startIndex,  pageSize,  sortBy,  filter,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.AttributeTypeRuleCollection GetAttributeTypeRules(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.AttributeTypeRuleCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Attributes.AttributeTypeRuleClient.GetAttributeTypeRulesClient( startIndex,  pageSize,  sortBy,  filter,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of attribute type rules according to optional filter criteria and sort options. Attribute type rules help drive the behavior of attributes on a storefront page.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
 		/// <param name="sortBy"></param>
 		/// <param name="startIndex"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
@@ -84,12 +57,12 @@ public virtual Mozu.Api.Contracts.ProductAdmin.AttributeTypeRuleCollection GetAt
 		///   var attributeTypeRuleCollection = await attributetyperule.GetAttributeTypeRulesAsync( startIndex,  pageSize,  sortBy,  filter,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.AttributeTypeRuleCollection> GetAttributeTypeRulesAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.AttributeTypeRuleCollection> GetAttributeTypeRulesAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.AttributeTypeRuleCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Attributes.AttributeTypeRuleClient.GetAttributeTypeRulesClient( startIndex,  pageSize,  sortBy,  filter,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
diff --git a/Mozu.Api/Resources/Commerce/Catalog/Admin/Attributedefinition/Attributes/AttributeVocabularyValueResource.cs b/Mozu.Api/Resources/Commerce/Catalog/Admin/Attributedefinition/Attributes/AttributeVocabularyValueResource.cs
old mode 100644
new mode 100755
index 7914a3b9..093b68ad
--- a/Mozu.Api/Resources/Commerce/Catalog/Admin/Attributedefinition/Attributes/AttributeVocabularyValueResource.cs
+++ b/Mozu.Api/Resources/Commerce/Catalog/Admin/Attributedefinition/Attributes/AttributeVocabularyValueResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Catalog.Admin.Attributedefinition.Attributes
 {
@@ -37,35 +38,11 @@ public AttributeVocabularyValueResource CloneWithApiContext(Action<IApiContext>
 		}
 
 				
-		/// <summary>
-		/// Retrieves a list of vocabulary values defined for the attribute specified in the request.
-		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <returns>
-		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue"/>}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var attributevocabularyvalue = new AttributeVocabularyValue();
-		///   var attributeVocabularyValue = attributevocabularyvalue.GetAttributeVocabularyValues( attributeFQN);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue> GetAttributeVocabularyValues(string attributeFQN)
-		{
-			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue>> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Attributes.AttributeVocabularyValueClient.GetAttributeVocabularyValuesClient( attributeFQN);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of vocabulary values defined for the attribute specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
+		/// <param name="attributeFQN"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue"/>}
@@ -76,47 +53,22 @@ public AttributeVocabularyValueResource CloneWithApiContext(Action<IApiContext>
 		///   var attributeVocabularyValue = await attributevocabularyvalue.GetAttributeVocabularyValuesAsync( attributeFQN);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue>> GetAttributeVocabularyValuesAsync(string attributeFQN)
+		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue>> GetAttributeVocabularyValuesAsync(string attributeFQN, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue>> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Attributes.AttributeVocabularyValueClient.GetAttributeVocabularyValuesClient( attributeFQN);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves a collection of localized content for vocabulary value attributes based on a `localeCode`. 
-		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="value">The value string to create.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <returns>
-		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValueLocalizedContent"/>}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var attributevocabularyvalue = new AttributeVocabularyValue();
-		///   var attributeVocabularyValueLocalizedContent = attributevocabularyvalue.GetAttributeVocabularyValueLocalizedContents( attributeFQN,  value);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValueLocalizedContent> GetAttributeVocabularyValueLocalizedContents(string attributeFQN, string value)
-		{
-			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValueLocalizedContent>> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Attributes.AttributeVocabularyValueClient.GetAttributeVocabularyValueLocalizedContentsClient( attributeFQN,  value);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a collection of localized content for vocabulary value attributes based on a `localeCode`. 
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="value">The value string to create.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="value"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValueLocalizedContent"/>}
@@ -127,51 +79,24 @@ public AttributeVocabularyValueResource CloneWithApiContext(Action<IApiContext>
 		///   var attributeVocabularyValueLocalizedContent = await attributevocabularyvalue.GetAttributeVocabularyValueLocalizedContentsAsync( attributeFQN,  value);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValueLocalizedContent>> GetAttributeVocabularyValueLocalizedContentsAsync(string attributeFQN, string value)
+		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValueLocalizedContent>> GetAttributeVocabularyValueLocalizedContentsAsync(string attributeFQN, string value, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValueLocalizedContent>> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Attributes.AttributeVocabularyValueClient.GetAttributeVocabularyValueLocalizedContentsClient( attributeFQN,  value);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the localized content for a vocabulary value attribute based on a `localeCode`. 
-		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="localeCode">Language used for the entity. Currently, only "en-US" is supported.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="value">The value string to create.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValueLocalizedContent"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var attributevocabularyvalue = new AttributeVocabularyValue();
-		///   var attributeVocabularyValueLocalizedContent = attributevocabularyvalue.GetAttributeVocabularyValueLocalizedContent( attributeFQN,  value,  localeCode,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValueLocalizedContent GetAttributeVocabularyValueLocalizedContent(string attributeFQN, string value, string localeCode, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValueLocalizedContent> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Attributes.AttributeVocabularyValueClient.GetAttributeVocabularyValueLocalizedContentClient( attributeFQN,  value,  localeCode,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the localized content for a vocabulary value attribute based on a `localeCode`. 
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="localeCode">Language used for the entity. Currently, only "en-US" is supported.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="value">The value string to create.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="localeCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="value"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValueLocalizedContent"/>
@@ -182,49 +107,23 @@ public virtual Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValueLocalized
 		///   var attributeVocabularyValueLocalizedContent = await attributevocabularyvalue.GetAttributeVocabularyValueLocalizedContentAsync( attributeFQN,  value,  localeCode,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValueLocalizedContent> GetAttributeVocabularyValueLocalizedContentAsync(string attributeFQN, string value, string localeCode, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValueLocalizedContent> GetAttributeVocabularyValueLocalizedContentAsync(string attributeFQN, string value, string localeCode, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValueLocalizedContent> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Attributes.AttributeVocabularyValueClient.GetAttributeVocabularyValueLocalizedContentClient( attributeFQN,  value,  localeCode,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the details of a vocabulary value defined for an attribute by providing the attribute's fully qualified name and the value to retrieve.
-		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="value">The value string to create.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var attributevocabularyvalue = new AttributeVocabularyValue();
-		///   var attributeVocabularyValue = attributevocabularyvalue.GetAttributeVocabularyValue( attributeFQN,  value,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue GetAttributeVocabularyValue(string attributeFQN, string value, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Attributes.AttributeVocabularyValueClient.GetAttributeVocabularyValueClient( attributeFQN,  value,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of a vocabulary value defined for an attribute by providing the attribute's fully qualified name and the value to retrieve.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="value">The value string to create.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="value">The actual unique value of the attribute vocabulary to retrieve. A single attribute must have a unique value and match the attribute's data type. If a string value returns null, the system will generate a value. The actual string content displayed shoud be stored as "Content" and actual content is required for string values.</param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue"/>
@@ -235,52 +134,25 @@ public virtual Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue GetAttri
 		///   var attributeVocabularyValue = await attributevocabularyvalue.GetAttributeVocabularyValueAsync( attributeFQN,  value,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue> GetAttributeVocabularyValueAsync(string attributeFQN, string value, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue> GetAttributeVocabularyValueAsync(string attributeFQN, string value, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Attributes.AttributeVocabularyValueClient.GetAttributeVocabularyValueClient( attributeFQN,  value,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Creates and saves localized vocabulary value content for an attribute, based on the `localeCode`.
-		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="value">The value string to create.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="localizedContent">The localized text for the string value of a product attribute.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValueLocalizedContent"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var attributevocabularyvalue = new AttributeVocabularyValue();
-		///   var attributeVocabularyValueLocalizedContent = attributevocabularyvalue.AddAttributeVocabularyValueLocalizedContent( localizedContent,  attributeFQN,  value,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValueLocalizedContent AddAttributeVocabularyValueLocalizedContent(Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValueLocalizedContent localizedContent, string attributeFQN, string value, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValueLocalizedContent> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Attributes.AttributeVocabularyValueClient.AddAttributeVocabularyValueLocalizedContentClient( localizedContent,  attributeFQN,  value,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Creates and saves localized vocabulary value content for an attribute, based on the `localeCode`.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="value">The value string to create.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="value"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="localizedContent">The localized text for the string value of a product attribute.</param>
+		/// <param name="localizedContent"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValueLocalizedContent"/>
 		/// </returns>
@@ -290,50 +162,24 @@ public virtual Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValueLocalized
 		///   var attributeVocabularyValueLocalizedContent = await attributevocabularyvalue.AddAttributeVocabularyValueLocalizedContentAsync( localizedContent,  attributeFQN,  value,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValueLocalizedContent> AddAttributeVocabularyValueLocalizedContentAsync(Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValueLocalizedContent localizedContent, string attributeFQN, string value, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValueLocalizedContent> AddAttributeVocabularyValueLocalizedContentAsync(Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValueLocalizedContent localizedContent, string attributeFQN, string value, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValueLocalizedContent> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Attributes.AttributeVocabularyValueClient.AddAttributeVocabularyValueLocalizedContentClient( localizedContent,  attributeFQN,  value,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Creates a vocabulary value for a defined product attribute.
-		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="attributeVocabularyValue">Properties of a vocabulary value defined for an extensible attribute.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var attributevocabularyvalue = new AttributeVocabularyValue();
-		///   var attributeVocabularyValue = attributevocabularyvalue.AddAttributeVocabularyValue( attributeVocabularyValue,  attributeFQN,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue AddAttributeVocabularyValue(Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue attributeVocabularyValue, string attributeFQN, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Attributes.AttributeVocabularyValueClient.AddAttributeVocabularyValueClient( attributeVocabularyValue,  attributeFQN,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Creates a vocabulary value for a defined product attribute.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="attributeVocabularyValue">Properties of a vocabulary value defined for an extensible attribute.</param>
+		/// <param name="attributeVocabularyValue">The predefined vocabulary value to add to the attribute content.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue"/>
 		/// </returns>
@@ -343,48 +189,23 @@ public virtual Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue AddAttri
 		///   var attributeVocabularyValue = await attributevocabularyvalue.AddAttributeVocabularyValueAsync( attributeVocabularyValue,  attributeFQN,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue> AddAttributeVocabularyValueAsync(Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue attributeVocabularyValue, string attributeFQN, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue> AddAttributeVocabularyValueAsync(Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue attributeVocabularyValue, string attributeFQN, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Attributes.AttributeVocabularyValueClient.AddAttributeVocabularyValueClient( attributeVocabularyValue,  attributeFQN,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Update existing vocabulary values for an attribute.
-		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="vocabularyValues">Properties of a vocabulary value defined for an extensible attribute.</param>
-		/// <returns>
-		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue"/>}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var attributevocabularyvalue = new AttributeVocabularyValue();
-		///   var attributeVocabularyValue = attributevocabularyvalue.UpdateAttributeVocabularyValues( vocabularyValues,  attributeFQN);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue> UpdateAttributeVocabularyValues(List<Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue> vocabularyValues, string attributeFQN)
-		{
-			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue>> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Attributes.AttributeVocabularyValueClient.UpdateAttributeVocabularyValuesClient( vocabularyValues,  attributeFQN);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Update existing vocabulary values for an attribute.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
+		/// <param name="attributeFQN"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="vocabularyValues">Properties of a vocabulary value defined for an extensible attribute.</param>
+		/// <param name="vocabularyValues">The actual vocabulary values for the attribute being updated.</param>
 		/// <returns>
 		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue"/>}
 		/// </returns>
@@ -394,50 +215,24 @@ public virtual Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue AddAttri
 		///   var attributeVocabularyValue = await attributevocabularyvalue.UpdateAttributeVocabularyValuesAsync( vocabularyValues,  attributeFQN);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue>> UpdateAttributeVocabularyValuesAsync(List<Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue> vocabularyValues, string attributeFQN)
+		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue>> UpdateAttributeVocabularyValuesAsync(List<Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue> vocabularyValues, string attributeFQN, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue>> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Attributes.AttributeVocabularyValueClient.UpdateAttributeVocabularyValuesClient( vocabularyValues,  attributeFQN);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates a collection of localized vocabulary value content for existing attributes, based on the `localeCode`.
-		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="value">The value string to create.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="localizedContent">The localized text for the string value of a product attribute.</param>
-		/// <returns>
-		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValueLocalizedContent"/>}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var attributevocabularyvalue = new AttributeVocabularyValue();
-		///   var attributeVocabularyValueLocalizedContent = attributevocabularyvalue.UpdateAttributeVocabularyValueLocalizedContents( localizedContent,  attributeFQN,  value);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValueLocalizedContent> UpdateAttributeVocabularyValueLocalizedContents(List<Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValueLocalizedContent> localizedContent, string attributeFQN, string value)
-		{
-			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValueLocalizedContent>> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Attributes.AttributeVocabularyValueClient.UpdateAttributeVocabularyValueLocalizedContentsClient( localizedContent,  attributeFQN,  value);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates a collection of localized vocabulary value content for existing attributes, based on the `localeCode`.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="value">The value string to create.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="value"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="localizedContent">The localized text for the string value of a product attribute.</param>
+		/// <param name="localizedContent"></param>
 		/// <returns>
 		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValueLocalizedContent"/>}
 		/// </returns>
@@ -447,54 +242,26 @@ public virtual Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue AddAttri
 		///   var attributeVocabularyValueLocalizedContent = await attributevocabularyvalue.UpdateAttributeVocabularyValueLocalizedContentsAsync( localizedContent,  attributeFQN,  value);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValueLocalizedContent>> UpdateAttributeVocabularyValueLocalizedContentsAsync(List<Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValueLocalizedContent> localizedContent, string attributeFQN, string value)
+		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValueLocalizedContent>> UpdateAttributeVocabularyValueLocalizedContentsAsync(List<Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValueLocalizedContent> localizedContent, string attributeFQN, string value, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValueLocalizedContent>> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Attributes.AttributeVocabularyValueClient.UpdateAttributeVocabularyValueLocalizedContentsClient( localizedContent,  attributeFQN,  value);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates localized vocabulary value content for an existing attribute, based on the `localeCode`.
-		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="localeCode">The two character country code that sets the locale, such as US for United States. Sites, tenants, and catalogs use locale codes for localizing content, such as translated product text per supported country.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="value">The value string to create.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="localizedContent">The localized text for the string value of a product attribute.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValueLocalizedContent"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var attributevocabularyvalue = new AttributeVocabularyValue();
-		///   var attributeVocabularyValueLocalizedContent = attributevocabularyvalue.UpdateAttributeVocabularyValueLocalizedContent( localizedContent,  attributeFQN,  value,  localeCode,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValueLocalizedContent UpdateAttributeVocabularyValueLocalizedContent(Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValueLocalizedContent localizedContent, string attributeFQN, string value, string localeCode, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValueLocalizedContent> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Attributes.AttributeVocabularyValueClient.UpdateAttributeVocabularyValueLocalizedContentClient( localizedContent,  attributeFQN,  value,  localeCode,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates localized vocabulary value content for an existing attribute, based on the `localeCode`.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="localeCode">The two character country code that sets the locale, such as US for United States. Sites, tenants, and catalogs use locale codes for localizing content, such as translated product text per supported country.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="value">The value string to create.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="localeCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="value"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="localizedContent">The localized text for the string value of a product attribute.</param>
+		/// <param name="localizedContent"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValueLocalizedContent"/>
 		/// </returns>
@@ -504,52 +271,25 @@ public virtual Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValueLocalized
 		///   var attributeVocabularyValueLocalizedContent = await attributevocabularyvalue.UpdateAttributeVocabularyValueLocalizedContentAsync( localizedContent,  attributeFQN,  value,  localeCode,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValueLocalizedContent> UpdateAttributeVocabularyValueLocalizedContentAsync(Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValueLocalizedContent localizedContent, string attributeFQN, string value, string localeCode, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValueLocalizedContent> UpdateAttributeVocabularyValueLocalizedContentAsync(Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValueLocalizedContent localizedContent, string attributeFQN, string value, string localeCode, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValueLocalizedContent> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Attributes.AttributeVocabularyValueClient.UpdateAttributeVocabularyValueLocalizedContentClient( localizedContent,  attributeFQN,  value,  localeCode,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates existing attribute vocabulary values.
-		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="value">The value string to create.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="attributeVocabularyValue">Properties of a vocabulary value defined for an extensible attribute.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var attributevocabularyvalue = new AttributeVocabularyValue();
-		///   var attributeVocabularyValue = attributevocabularyvalue.UpdateAttributeVocabularyValue( attributeVocabularyValue,  attributeFQN,  value,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue UpdateAttributeVocabularyValue(Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue attributeVocabularyValue, string attributeFQN, string value, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Attributes.AttributeVocabularyValueClient.UpdateAttributeVocabularyValueClient( attributeVocabularyValue,  attributeFQN,  value,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates existing attribute vocabulary values.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="value">The value string to create.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="value">The actual unique value of the attribute vocabulary value to update. A single attribute must have a unique value and match the attribute's data type. If a string value returns null, the system will generate a value. The actual string content displayed shoud be stored as "Content" and actual content is required for string values.</param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="attributeVocabularyValue">Properties of a vocabulary value defined for an extensible attribute.</param>
+		/// <param name="attributeVocabularyValue">The predefined vocabulary value to add to the attribute content to update.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue"/>
 		/// </returns>
@@ -559,46 +299,22 @@ public virtual Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue UpdateAt
 		///   var attributeVocabularyValue = await attributevocabularyvalue.UpdateAttributeVocabularyValueAsync( attributeVocabularyValue,  attributeFQN,  value,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue> UpdateAttributeVocabularyValueAsync(Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue attributeVocabularyValue, string attributeFQN, string value, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue> UpdateAttributeVocabularyValueAsync(Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue attributeVocabularyValue, string attributeFQN, string value, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.AttributeVocabularyValue> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Attributes.AttributeVocabularyValueClient.UpdateAttributeVocabularyValueClient( attributeVocabularyValue,  attributeFQN,  value,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Deletes an attribute's vocabulary value.
-		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="value">The value string to create.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var attributevocabularyvalue = new AttributeVocabularyValue();
-		///   attributevocabularyvalue.DeleteAttributeVocabularyValue( attributeFQN,  value);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteAttributeVocabularyValue(string attributeFQN, string value)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Attributes.AttributeVocabularyValueClient.DeleteAttributeVocabularyValueClient( attributeFQN,  value);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes an attribute's vocabulary value.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="value">The value string to create.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="value">The actual unique value of the attribute vocabulary to delete. A single attribute must have a unique value and match the attribute's data type. If a string value returns null, the system will generate a value. The actual string content displayed shoud be stored as "Content" and actual content is required for string values.</param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		/// 
@@ -609,47 +325,22 @@ public virtual void DeleteAttributeVocabularyValue(string attributeFQN, string v
 		///   await attributevocabularyvalue.DeleteAttributeVocabularyValueAsync( attributeFQN,  value);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteAttributeVocabularyValueAsync(string attributeFQN, string value)
+		public virtual async Task DeleteAttributeVocabularyValueAsync(string attributeFQN, string value, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Attributes.AttributeVocabularyValueClient.DeleteAttributeVocabularyValueClient( attributeFQN,  value);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
-		/// <summary>
-		/// Removes localized content for a vocabulary value attribute. 
-		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="localeCode">Language used for the entity. Currently, only "en-US" is supported.</param>
-		/// <param name="value">The value string to create.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var attributevocabularyvalue = new AttributeVocabularyValue();
-		///   attributevocabularyvalue.DeleteAttributeVocabularyValueLocalizedContent( attributeFQN,  value,  localeCode);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteAttributeVocabularyValueLocalizedContent(string attributeFQN, string value, string localeCode)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Attributes.AttributeVocabularyValueClient.DeleteAttributeVocabularyValueLocalizedContentClient( attributeFQN,  value,  localeCode);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Removes localized content for a vocabulary value attribute. 
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="localeCode">Language used for the entity. Currently, only "en-US" is supported.</param>
-		/// <param name="value">The value string to create.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="localeCode"></param>
+		/// <param name="value"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		/// 
@@ -660,12 +351,12 @@ public virtual void DeleteAttributeVocabularyValueLocalizedContent(string attrib
 		///   await attributevocabularyvalue.DeleteAttributeVocabularyValueLocalizedContentAsync( attributeFQN,  value,  localeCode);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteAttributeVocabularyValueLocalizedContentAsync(string attributeFQN, string value, string localeCode)
+		public virtual async Task DeleteAttributeVocabularyValueLocalizedContentAsync(string attributeFQN, string value, string localeCode, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Attributes.AttributeVocabularyValueClient.DeleteAttributeVocabularyValueLocalizedContentClient( attributeFQN,  value,  localeCode);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/Catalog/Admin/Attributedefinition/ProductTypeResource.cs b/Mozu.Api/Resources/Commerce/Catalog/Admin/Attributedefinition/ProductTypeResource.cs
old mode 100644
new mode 100755
index 7b739647..6f9249bb
--- a/Mozu.Api/Resources/Commerce/Catalog/Admin/Attributedefinition/ProductTypeResource.cs
+++ b/Mozu.Api/Resources/Commerce/Catalog/Admin/Attributedefinition/ProductTypeResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Catalog.Admin.Attributedefinition
 {
@@ -44,41 +45,13 @@ public ProductTypeResource(IApiContext apiContext, DataViewMode dataViewMode)
 			_dataViewMode = dataViewMode;
 		}
 				
-		/// <summary>
-		/// Retrieves a list of product types according to any specified filter criteria and sort options.
-		/// </summary>
-		/// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy"></param>
-		/// <param name="startIndex"></param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductTypeCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var producttype = new ProductType();
-		///   var productTypeCollection = producttype.GetProductTypes(_dataViewMode,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.ProductTypeCollection GetProductTypes(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductTypeCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.ProductTypeClient.GetProductTypesClient(_dataViewMode,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of product types according to any specified filter criteria and sort options.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. You can filter product type search results by any of its properties. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=Name+cont+shoes"</param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
 		/// <param name="sortBy"></param>
 		/// <param name="startIndex"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
@@ -91,47 +64,22 @@ public virtual Mozu.Api.Contracts.ProductAdmin.ProductTypeCollection GetProductT
 		///   var productTypeCollection = await producttype.GetProductTypesAsync(_dataViewMode,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductTypeCollection> GetProductTypesAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductTypeCollection> GetProductTypesAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductTypeCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.ProductTypeClient.GetProductTypesClient(_dataViewMode,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the details of the product type specified in the request.
-		/// </summary>
-		/// <param name="productTypeId">Identifier of the product type.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductType"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var producttype = new ProductType();
-		///   var productType = producttype.GetProductType(_dataViewMode,  productTypeId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.ProductType GetProductType(int productTypeId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductType> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.ProductTypeClient.GetProductTypeClient(_dataViewMode,  productTypeId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of the product type specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="productTypeId">Identifier of the product type.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="productTypeId">Identifier of the product type to retrieve.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductType"/>
@@ -142,48 +90,23 @@ public virtual Mozu.Api.Contracts.ProductAdmin.ProductType GetProductType(int pr
 		///   var productType = await producttype.GetProductTypeAsync(_dataViewMode,  productTypeId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductType> GetProductTypeAsync(int productTypeId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductType> GetProductTypeAsync(int productTypeId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductType> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.ProductTypeClient.GetProductTypeClient(_dataViewMode,  productTypeId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Creates a new product type based on the information supplied in the request.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="productType">A product type is like a product template.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductType"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var producttype = new ProductType();
-		///   var productType = producttype.AddProductType(_dataViewMode,  productType,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.ProductType AddProductType(Mozu.Api.Contracts.ProductAdmin.ProductType productType, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductType> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.ProductTypeClient.AddProductTypeClient(_dataViewMode,  productType,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Creates a new product type based on the information supplied in the request.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="productType">A product type is like a product template.</param>
+		/// <param name="productType">Properties of the product type to create.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductType"/>
 		/// </returns>
@@ -193,50 +116,24 @@ public virtual Mozu.Api.Contracts.ProductAdmin.ProductType AddProductType(Mozu.A
 		///   var productType = await producttype.AddProductTypeAsync(_dataViewMode,  productType,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductType> AddProductTypeAsync(Mozu.Api.Contracts.ProductAdmin.ProductType productType, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductType> AddProductTypeAsync(Mozu.Api.Contracts.ProductAdmin.ProductType productType, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductType> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.ProductTypeClient.AddProductTypeClient(_dataViewMode,  productType,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates one or more properties of a product type.
-		/// </summary>
-		/// <param name="productTypeId">Identifier of the product type.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="productType">A product type is like a product template.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductType"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var producttype = new ProductType();
-		///   var productType = producttype.UpdateProductType(_dataViewMode,  productType,  productTypeId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.ProductType UpdateProductType(Mozu.Api.Contracts.ProductAdmin.ProductType productType, int productTypeId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductType> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.ProductTypeClient.UpdateProductTypeClient(_dataViewMode,  productType,  productTypeId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates one or more properties of a product type.
+		/// 
 		/// </summary>
-		/// <param name="productTypeId">Identifier of the product type.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="productTypeId">Identifier of the product type to update.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="productType">A product type is like a product template.</param>
+		/// <param name="productType">The details of the product type to update.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductType"/>
 		/// </returns>
@@ -246,44 +143,21 @@ public virtual Mozu.Api.Contracts.ProductAdmin.ProductType UpdateProductType(Moz
 		///   var productType = await producttype.UpdateProductTypeAsync(_dataViewMode,  productType,  productTypeId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductType> UpdateProductTypeAsync(Mozu.Api.Contracts.ProductAdmin.ProductType productType, int productTypeId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductType> UpdateProductTypeAsync(Mozu.Api.Contracts.ProductAdmin.ProductType productType, int productTypeId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductType> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.ProductTypeClient.UpdateProductTypeClient(_dataViewMode,  productType,  productTypeId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Deletes the product type by providing the product type ID.
-		/// </summary>
-		/// <param name="productTypeId">Identifier of the product type.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var producttype = new ProductType();
-		///   producttype.DeleteProductType(_dataViewMode,  productTypeId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteProductType(int productTypeId)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.ProductTypeClient.DeleteProductTypeClient(_dataViewMode,  productTypeId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes the product type by providing the product type ID.
+		/// 
 		/// </summary>
-		/// <param name="productTypeId">Identifier of the product type.</param>
+		/// <param name="productTypeId">Identifier of the product type to delete.</param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		/// 
@@ -294,12 +168,12 @@ public virtual void DeleteProductType(int productTypeId)
 		///   await producttype.DeleteProductTypeAsync(_dataViewMode,  productTypeId);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteProductTypeAsync(int productTypeId)
+		public virtual async Task DeleteProductTypeAsync(int productTypeId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.ProductTypeClient.DeleteProductTypeClient(_dataViewMode,  productTypeId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypeExtraResource.cs b/Mozu.Api/Resources/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypeExtraResource.cs
old mode 100644
new mode 100755
index 8c10af51..8f6f25f3
--- a/Mozu.Api/Resources/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypeExtraResource.cs
+++ b/Mozu.Api/Resources/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypeExtraResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Catalog.Admin.Attributedefinition.Producttypes
 {
@@ -44,33 +45,9 @@ public ProductTypeExtraResource(IApiContext apiContext, DataViewMode dataViewMod
 			_dataViewMode = dataViewMode;
 		}
 				
-		/// <summary>
-		/// Retrieves a list of extra attributes defined for the specified product type.
-		/// </summary>
-		/// <param name="productTypeId">Identifier of the product type.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <returns>
-		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.AttributeInProductType"/>}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var producttypeextra = new ProductTypeExtra();
-		///   var attributeInProductType = producttypeextra.GetExtras(_dataViewMode,  productTypeId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<Mozu.Api.Contracts.ProductAdmin.AttributeInProductType> GetExtras(int productTypeId)
-		{
-			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.AttributeInProductType>> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Producttypes.ProductTypeExtraClient.GetExtrasClient(_dataViewMode,  productTypeId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of extra attributes defined for the specified product type.
+		/// 
 		/// </summary>
 		/// <param name="productTypeId">Identifier of the product type.</param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
@@ -83,49 +60,23 @@ public ProductTypeExtraResource(IApiContext apiContext, DataViewMode dataViewMod
 		///   var attributeInProductType = await producttypeextra.GetExtrasAsync(_dataViewMode,  productTypeId);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.AttributeInProductType>> GetExtrasAsync(int productTypeId)
+		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.AttributeInProductType>> GetExtrasAsync(int productTypeId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.AttributeInProductType>> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Producttypes.ProductTypeExtraClient.GetExtrasClient(_dataViewMode,  productTypeId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the details of an extra attribute definition for the specified product type.
-		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="productTypeId">Identifier of the product type.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.AttributeInProductType"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var producttypeextra = new ProductTypeExtra();
-		///   var attributeInProductType = producttypeextra.GetExtra(_dataViewMode,  productTypeId,  attributeFQN,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.AttributeInProductType GetExtra(int productTypeId, string attributeFQN, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.AttributeInProductType> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Producttypes.ProductTypeExtraClient.GetExtraClient(_dataViewMode,  productTypeId,  attributeFQN,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of an extra attribute definition for the specified product type.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="productTypeId">Identifier of the product type.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="productTypeId">Identifier of the product type whose extra is being retrieved.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.AttributeInProductType"/>
@@ -136,50 +87,24 @@ public virtual Mozu.Api.Contracts.ProductAdmin.AttributeInProductType GetExtra(i
 		///   var attributeInProductType = await producttypeextra.GetExtraAsync(_dataViewMode,  productTypeId,  attributeFQN,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.AttributeInProductType> GetExtraAsync(int productTypeId, string attributeFQN, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.AttributeInProductType> GetExtraAsync(int productTypeId, string attributeFQN, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.AttributeInProductType> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Producttypes.ProductTypeExtraClient.GetExtraClient(_dataViewMode,  productTypeId,  attributeFQN,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Assigns a defined extra attribute to the product type based on the information supplied in the request.
-		/// </summary>
-		/// <param name="productTypeId">Identifier of the product type.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="attributeInProductType">Properties of an attribute definition associated with a specific product type. When an attribute is applied to a product type, each product of that type maintains the same set of attributes.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.AttributeInProductType"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var producttypeextra = new ProductTypeExtra();
-		///   var attributeInProductType = producttypeextra.AddExtra(_dataViewMode,  attributeInProductType,  productTypeId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.AttributeInProductType AddExtra(Mozu.Api.Contracts.ProductAdmin.AttributeInProductType attributeInProductType, int productTypeId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.AttributeInProductType> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Producttypes.ProductTypeExtraClient.AddExtraClient(_dataViewMode,  attributeInProductType,  productTypeId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Assigns a defined extra attribute to the product type based on the information supplied in the request.
+		/// 
 		/// </summary>
 		/// <param name="productTypeId">Identifier of the product type.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="attributeInProductType">Properties of an attribute definition associated with a specific product type. When an attribute is applied to a product type, each product of that type maintains the same set of attributes.</param>
+		/// <param name="attributeInProductType">The properties of the extra attribute definition for this product type assignment.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.AttributeInProductType"/>
 		/// </returns>
@@ -189,52 +114,25 @@ public virtual Mozu.Api.Contracts.ProductAdmin.AttributeInProductType AddExtra(M
 		///   var attributeInProductType = await producttypeextra.AddExtraAsync(_dataViewMode,  attributeInProductType,  productTypeId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.AttributeInProductType> AddExtraAsync(Mozu.Api.Contracts.ProductAdmin.AttributeInProductType attributeInProductType, int productTypeId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.AttributeInProductType> AddExtraAsync(Mozu.Api.Contracts.ProductAdmin.AttributeInProductType attributeInProductType, int productTypeId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.AttributeInProductType> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Producttypes.ProductTypeExtraClient.AddExtraClient(_dataViewMode,  attributeInProductType,  productTypeId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Update the definition of an extra attribute for the specified product type.
-		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="productTypeId">Identifier of the product type.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="attributeInProductType">Properties of an attribute definition associated with a specific product type. When an attribute is applied to a product type, each product of that type maintains the same set of attributes.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.AttributeInProductType"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var producttypeextra = new ProductTypeExtra();
-		///   var attributeInProductType = producttypeextra.UpdateExtra(_dataViewMode,  attributeInProductType,  productTypeId,  attributeFQN,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.AttributeInProductType UpdateExtra(Mozu.Api.Contracts.ProductAdmin.AttributeInProductType attributeInProductType, int productTypeId, string attributeFQN, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.AttributeInProductType> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Producttypes.ProductTypeExtraClient.UpdateExtraClient(_dataViewMode,  attributeInProductType,  productTypeId,  attributeFQN,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Update the definition of an extra attribute for the specified product type.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
+		/// <param name="attributeFQN"></param>
 		/// <param name="productTypeId">Identifier of the product type.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="attributeInProductType">Properties of an attribute definition associated with a specific product type. When an attribute is applied to a product type, each product of that type maintains the same set of attributes.</param>
+		/// <param name="attributeInProductType">The properties of the extra attribute definition to update for the product type.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.AttributeInProductType"/>
 		/// </returns>
@@ -244,45 +142,21 @@ public virtual Mozu.Api.Contracts.ProductAdmin.AttributeInProductType UpdateExtr
 		///   var attributeInProductType = await producttypeextra.UpdateExtraAsync(_dataViewMode,  attributeInProductType,  productTypeId,  attributeFQN,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.AttributeInProductType> UpdateExtraAsync(Mozu.Api.Contracts.ProductAdmin.AttributeInProductType attributeInProductType, int productTypeId, string attributeFQN, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.AttributeInProductType> UpdateExtraAsync(Mozu.Api.Contracts.ProductAdmin.AttributeInProductType attributeInProductType, int productTypeId, string attributeFQN, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.AttributeInProductType> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Producttypes.ProductTypeExtraClient.UpdateExtraClient(_dataViewMode,  attributeInProductType,  productTypeId,  attributeFQN,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Removes an extra attribute definition from the specified product type.
-		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="productTypeId">Identifier of the product type.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var producttypeextra = new ProductTypeExtra();
-		///   producttypeextra.DeleteExtra(_dataViewMode,  productTypeId,  attributeFQN);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteExtra(int productTypeId, string attributeFQN)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Producttypes.ProductTypeExtraClient.DeleteExtraClient(_dataViewMode,  productTypeId,  attributeFQN);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Removes an extra attribute definition from the specified product type.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
+		/// <param name="attributeFQN"></param>
 		/// <param name="productTypeId">Identifier of the product type.</param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
@@ -294,12 +168,12 @@ public virtual void DeleteExtra(int productTypeId, string attributeFQN)
 		///   await producttypeextra.DeleteExtraAsync(_dataViewMode,  productTypeId,  attributeFQN);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteExtraAsync(int productTypeId, string attributeFQN)
+		public virtual async Task DeleteExtraAsync(int productTypeId, string attributeFQN, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Producttypes.ProductTypeExtraClient.DeleteExtraClient(_dataViewMode,  productTypeId,  attributeFQN);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypeOptionResource.cs b/Mozu.Api/Resources/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypeOptionResource.cs
old mode 100644
new mode 100755
index 41488d7b..10de18dd
--- a/Mozu.Api/Resources/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypeOptionResource.cs
+++ b/Mozu.Api/Resources/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypeOptionResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Catalog.Admin.Attributedefinition.Producttypes
 {
@@ -44,35 +45,11 @@ public ProductTypeOptionResource(IApiContext apiContext, DataViewMode dataViewMo
 			_dataViewMode = dataViewMode;
 		}
 				
-		/// <summary>
-		/// Retrieves a list of option product attributes defined for the specified product type.
-		/// </summary>
-		/// <param name="productTypeId">Identifier of the product type.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <returns>
-		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.AttributeInProductType"/>}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var producttypeoption = new ProductTypeOption();
-		///   var attributeInProductType = producttypeoption.GetOptions(_dataViewMode,  productTypeId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<Mozu.Api.Contracts.ProductAdmin.AttributeInProductType> GetOptions(int productTypeId)
-		{
-			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.AttributeInProductType>> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Producttypes.ProductTypeOptionClient.GetOptionsClient(_dataViewMode,  productTypeId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of option product attributes defined for the specified product type.
+		/// 
 		/// </summary>
-		/// <param name="productTypeId">Identifier of the product type.</param>
+		/// <param name="productTypeId">Identifier of the product type to retrieve.</param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.AttributeInProductType"/>}
@@ -83,49 +60,23 @@ public ProductTypeOptionResource(IApiContext apiContext, DataViewMode dataViewMo
 		///   var attributeInProductType = await producttypeoption.GetOptionsAsync(_dataViewMode,  productTypeId);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.AttributeInProductType>> GetOptionsAsync(int productTypeId)
+		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.AttributeInProductType>> GetOptionsAsync(int productTypeId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.AttributeInProductType>> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Producttypes.ProductTypeOptionClient.GetOptionsClient(_dataViewMode,  productTypeId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the details of an option attribute defined for the specified product type.
-		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="productTypeId">Identifier of the product type.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.AttributeInProductType"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var producttypeoption = new ProductTypeOption();
-		///   var attributeInProductType = producttypeoption.GetOption(_dataViewMode,  productTypeId,  attributeFQN,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.AttributeInProductType GetOption(int productTypeId, string attributeFQN, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.AttributeInProductType> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Producttypes.ProductTypeOptionClient.GetOptionClient(_dataViewMode,  productTypeId,  attributeFQN,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of an option attribute defined for the specified product type.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="productTypeId">Identifier of the product type.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="productTypeId">The identifier of the product type.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.AttributeInProductType"/>
@@ -136,50 +87,24 @@ public virtual Mozu.Api.Contracts.ProductAdmin.AttributeInProductType GetOption(
 		///   var attributeInProductType = await producttypeoption.GetOptionAsync(_dataViewMode,  productTypeId,  attributeFQN,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.AttributeInProductType> GetOptionAsync(int productTypeId, string attributeFQN, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.AttributeInProductType> GetOptionAsync(int productTypeId, string attributeFQN, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.AttributeInProductType> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Producttypes.ProductTypeOptionClient.GetOptionClient(_dataViewMode,  productTypeId,  attributeFQN,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Assigns an option attribute to the product type based on the information supplied in the request.
-		/// </summary>
-		/// <param name="productTypeId">Identifier of the product type.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="attributeInProductType">Properties of an attribute definition associated with a specific product type. When an attribute is applied to a product type, each product of that type maintains the same set of attributes.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.AttributeInProductType"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var producttypeoption = new ProductTypeOption();
-		///   var attributeInProductType = producttypeoption.AddOption(_dataViewMode,  attributeInProductType,  productTypeId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.AttributeInProductType AddOption(Mozu.Api.Contracts.ProductAdmin.AttributeInProductType attributeInProductType, int productTypeId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.AttributeInProductType> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Producttypes.ProductTypeOptionClient.AddOptionClient(_dataViewMode,  attributeInProductType,  productTypeId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Assigns an option attribute to the product type based on the information supplied in the request.
+		/// 
 		/// </summary>
 		/// <param name="productTypeId">Identifier of the product type.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="attributeInProductType">Properties of an attribute definition associated with a specific product type. When an attribute is applied to a product type, each product of that type maintains the same set of attributes.</param>
+		/// <param name="attributeInProductType">Properties of the option attribute to define for the specified product type.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.AttributeInProductType"/>
 		/// </returns>
@@ -189,52 +114,25 @@ public virtual Mozu.Api.Contracts.ProductAdmin.AttributeInProductType AddOption(
 		///   var attributeInProductType = await producttypeoption.AddOptionAsync(_dataViewMode,  attributeInProductType,  productTypeId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.AttributeInProductType> AddOptionAsync(Mozu.Api.Contracts.ProductAdmin.AttributeInProductType attributeInProductType, int productTypeId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.AttributeInProductType> AddOptionAsync(Mozu.Api.Contracts.ProductAdmin.AttributeInProductType attributeInProductType, int productTypeId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.AttributeInProductType> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Producttypes.ProductTypeOptionClient.AddOptionClient(_dataViewMode,  attributeInProductType,  productTypeId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates an option attribute definition for the specified product type.
-		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="productTypeId">Identifier of the product type.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="attributeInProductType">Properties of an attribute definition associated with a specific product type. When an attribute is applied to a product type, each product of that type maintains the same set of attributes.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.AttributeInProductType"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var producttypeoption = new ProductTypeOption();
-		///   var attributeInProductType = producttypeoption.UpdateOption(_dataViewMode,  attributeInProductType,  productTypeId,  attributeFQN,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.AttributeInProductType UpdateOption(Mozu.Api.Contracts.ProductAdmin.AttributeInProductType attributeInProductType, int productTypeId, string attributeFQN, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.AttributeInProductType> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Producttypes.ProductTypeOptionClient.UpdateOptionClient(_dataViewMode,  attributeInProductType,  productTypeId,  attributeFQN,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates an option attribute definition for the specified product type.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
+		/// <param name="attributeFQN"></param>
 		/// <param name="productTypeId">Identifier of the product type.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="attributeInProductType">Properties of an attribute definition associated with a specific product type. When an attribute is applied to a product type, each product of that type maintains the same set of attributes.</param>
+		/// <param name="attributeInProductType">Properties of the option product attribute to define for the specified product type.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.AttributeInProductType"/>
 		/// </returns>
@@ -244,45 +142,21 @@ public virtual Mozu.Api.Contracts.ProductAdmin.AttributeInProductType UpdateOpti
 		///   var attributeInProductType = await producttypeoption.UpdateOptionAsync(_dataViewMode,  attributeInProductType,  productTypeId,  attributeFQN,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.AttributeInProductType> UpdateOptionAsync(Mozu.Api.Contracts.ProductAdmin.AttributeInProductType attributeInProductType, int productTypeId, string attributeFQN, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.AttributeInProductType> UpdateOptionAsync(Mozu.Api.Contracts.ProductAdmin.AttributeInProductType attributeInProductType, int productTypeId, string attributeFQN, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.AttributeInProductType> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Producttypes.ProductTypeOptionClient.UpdateOptionClient(_dataViewMode,  attributeInProductType,  productTypeId,  attributeFQN,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Removes an option attribute definition for the specified product type.
-		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="productTypeId">Identifier of the product type.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var producttypeoption = new ProductTypeOption();
-		///   producttypeoption.DeleteOption(_dataViewMode,  productTypeId,  attributeFQN);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteOption(int productTypeId, string attributeFQN)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Producttypes.ProductTypeOptionClient.DeleteOptionClient(_dataViewMode,  productTypeId,  attributeFQN);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Removes an option attribute definition for the specified product type.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
+		/// <param name="attributeFQN"></param>
 		/// <param name="productTypeId">Identifier of the product type.</param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
@@ -294,12 +168,12 @@ public virtual void DeleteOption(int productTypeId, string attributeFQN)
 		///   await producttypeoption.DeleteOptionAsync(_dataViewMode,  productTypeId,  attributeFQN);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteOptionAsync(int productTypeId, string attributeFQN)
+		public virtual async Task DeleteOptionAsync(int productTypeId, string attributeFQN, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Producttypes.ProductTypeOptionClient.DeleteOptionClient(_dataViewMode,  productTypeId,  attributeFQN);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypePropertyResource.cs b/Mozu.Api/Resources/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypePropertyResource.cs
old mode 100644
new mode 100755
index 16e9d3b1..659f09ff
--- a/Mozu.Api/Resources/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypePropertyResource.cs
+++ b/Mozu.Api/Resources/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypePropertyResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Catalog.Admin.Attributedefinition.Producttypes
 {
@@ -44,33 +45,9 @@ public ProductTypePropertyResource(IApiContext apiContext, DataViewMode dataView
 			_dataViewMode = dataViewMode;
 		}
 				
-		/// <summary>
-		/// Retrieves a list of product property attributes defined for a product type.
-		/// </summary>
-		/// <param name="productTypeId">Identifier of the product type.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <returns>
-		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.AttributeInProductType"/>}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var producttypeproperty = new ProductTypeProperty();
-		///   var attributeInProductType = producttypeproperty.GetProperties(_dataViewMode,  productTypeId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<Mozu.Api.Contracts.ProductAdmin.AttributeInProductType> GetProperties(int productTypeId)
-		{
-			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.AttributeInProductType>> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Producttypes.ProductTypePropertyClient.GetPropertiesClient(_dataViewMode,  productTypeId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of product property attributes defined for a product type.
+		/// 
 		/// </summary>
 		/// <param name="productTypeId">Identifier of the product type.</param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
@@ -83,49 +60,23 @@ public ProductTypePropertyResource(IApiContext apiContext, DataViewMode dataView
 		///   var attributeInProductType = await producttypeproperty.GetPropertiesAsync(_dataViewMode,  productTypeId);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.AttributeInProductType>> GetPropertiesAsync(int productTypeId)
+		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.AttributeInProductType>> GetPropertiesAsync(int productTypeId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.AttributeInProductType>> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Producttypes.ProductTypePropertyClient.GetPropertiesClient(_dataViewMode,  productTypeId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves a product property attribute definition for the specified product type.
-		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="productTypeId">Identifier of the product type.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.AttributeInProductType"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var producttypeproperty = new ProductTypeProperty();
-		///   var attributeInProductType = producttypeproperty.GetProperty(_dataViewMode,  productTypeId,  attributeFQN,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.AttributeInProductType GetProperty(int productTypeId, string attributeFQN, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.AttributeInProductType> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Producttypes.ProductTypePropertyClient.GetPropertyClient(_dataViewMode,  productTypeId,  attributeFQN,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a product property attribute definition for the specified product type.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
+		/// <param name="attributeFQN"></param>
 		/// <param name="productTypeId">Identifier of the product type.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.AttributeInProductType"/>
@@ -136,50 +87,24 @@ public virtual Mozu.Api.Contracts.ProductAdmin.AttributeInProductType GetPropert
 		///   var attributeInProductType = await producttypeproperty.GetPropertyAsync(_dataViewMode,  productTypeId,  attributeFQN,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.AttributeInProductType> GetPropertyAsync(int productTypeId, string attributeFQN, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.AttributeInProductType> GetPropertyAsync(int productTypeId, string attributeFQN, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.AttributeInProductType> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Producttypes.ProductTypePropertyClient.GetPropertyClient(_dataViewMode,  productTypeId,  attributeFQN,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Assigns a property attribute to the specified product type, according to the information defined in the request.
-		/// </summary>
-		/// <param name="productTypeId">Identifier of the product type.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="attributeInProductType">Properties of an attribute definition associated with a specific product type. When an attribute is applied to a product type, each product of that type maintains the same set of attributes.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.AttributeInProductType"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var producttypeproperty = new ProductTypeProperty();
-		///   var attributeInProductType = producttypeproperty.AddProperty(_dataViewMode,  attributeInProductType,  productTypeId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.AttributeInProductType AddProperty(Mozu.Api.Contracts.ProductAdmin.AttributeInProductType attributeInProductType, int productTypeId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.AttributeInProductType> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Producttypes.ProductTypePropertyClient.AddPropertyClient(_dataViewMode,  attributeInProductType,  productTypeId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Assigns a property attribute to the specified product type, according to the information defined in the request.
+		/// 
 		/// </summary>
 		/// <param name="productTypeId">Identifier of the product type.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="attributeInProductType">Properties of an attribute definition associated with a specific product type. When an attribute is applied to a product type, each product of that type maintains the same set of attributes.</param>
+		/// <param name="attributeInProductType">Properties of the property attribute to define for the specified product type.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.AttributeInProductType"/>
 		/// </returns>
@@ -189,52 +114,25 @@ public virtual Mozu.Api.Contracts.ProductAdmin.AttributeInProductType AddPropert
 		///   var attributeInProductType = await producttypeproperty.AddPropertyAsync(_dataViewMode,  attributeInProductType,  productTypeId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.AttributeInProductType> AddPropertyAsync(Mozu.Api.Contracts.ProductAdmin.AttributeInProductType attributeInProductType, int productTypeId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.AttributeInProductType> AddPropertyAsync(Mozu.Api.Contracts.ProductAdmin.AttributeInProductType attributeInProductType, int productTypeId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.AttributeInProductType> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Producttypes.ProductTypePropertyClient.AddPropertyClient(_dataViewMode,  attributeInProductType,  productTypeId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates the definition of a property attribute for the specified product type.
-		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="productTypeId">Identifier of the product type.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="attributeInProductType">Properties of an attribute definition associated with a specific product type. When an attribute is applied to a product type, each product of that type maintains the same set of attributes.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.AttributeInProductType"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var producttypeproperty = new ProductTypeProperty();
-		///   var attributeInProductType = producttypeproperty.UpdateProperty(_dataViewMode,  attributeInProductType,  productTypeId,  attributeFQN,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.AttributeInProductType UpdateProperty(Mozu.Api.Contracts.ProductAdmin.AttributeInProductType attributeInProductType, int productTypeId, string attributeFQN, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.AttributeInProductType> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Producttypes.ProductTypePropertyClient.UpdatePropertyClient(_dataViewMode,  attributeInProductType,  productTypeId,  attributeFQN,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates the definition of a property attribute for the specified product type.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
+		/// <param name="attributeFQN"></param>
 		/// <param name="productTypeId">Identifier of the product type.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="attributeInProductType">Properties of an attribute definition associated with a specific product type. When an attribute is applied to a product type, each product of that type maintains the same set of attributes.</param>
+		/// <param name="attributeInProductType">Properties of the property attribute to define for the product type.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.AttributeInProductType"/>
 		/// </returns>
@@ -244,45 +142,21 @@ public virtual Mozu.Api.Contracts.ProductAdmin.AttributeInProductType UpdateProp
 		///   var attributeInProductType = await producttypeproperty.UpdatePropertyAsync(_dataViewMode,  attributeInProductType,  productTypeId,  attributeFQN,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.AttributeInProductType> UpdatePropertyAsync(Mozu.Api.Contracts.ProductAdmin.AttributeInProductType attributeInProductType, int productTypeId, string attributeFQN, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.AttributeInProductType> UpdatePropertyAsync(Mozu.Api.Contracts.ProductAdmin.AttributeInProductType attributeInProductType, int productTypeId, string attributeFQN, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.AttributeInProductType> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Producttypes.ProductTypePropertyClient.UpdatePropertyClient(_dataViewMode,  attributeInProductType,  productTypeId,  attributeFQN,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Removes a property attribute previously defined for the specified product type.
-		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="productTypeId">Identifier of the product type.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var producttypeproperty = new ProductTypeProperty();
-		///   producttypeproperty.DeleteProperty(_dataViewMode,  productTypeId,  attributeFQN);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteProperty(int productTypeId, string attributeFQN)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Producttypes.ProductTypePropertyClient.DeletePropertyClient(_dataViewMode,  productTypeId,  attributeFQN);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Removes a property attribute previously defined for the specified product type.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
+		/// <param name="attributeFQN"></param>
 		/// <param name="productTypeId">Identifier of the product type.</param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
@@ -294,12 +168,12 @@ public virtual void DeleteProperty(int productTypeId, string attributeFQN)
 		///   await producttypeproperty.DeletePropertyAsync(_dataViewMode,  productTypeId,  attributeFQN);
 		/// </code>
 		/// </example>
-		public virtual async Task DeletePropertyAsync(int productTypeId, string attributeFQN)
+		public virtual async Task DeletePropertyAsync(int productTypeId, string attributeFQN, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Producttypes.ProductTypePropertyClient.DeletePropertyClient(_dataViewMode,  productTypeId,  attributeFQN);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypeVariationResource.cs b/Mozu.Api/Resources/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypeVariationResource.cs
old mode 100644
new mode 100755
index 68ce05d7..fc0f75f8
--- a/Mozu.Api/Resources/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypeVariationResource.cs
+++ b/Mozu.Api/Resources/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypeVariationResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Catalog.Admin.Attributedefinition.Producttypes
 {
@@ -37,50 +38,19 @@ public ProductTypeVariationResource CloneWithApiContext(Action<IApiContext> cont
 		}
 
 				
-		/// <summary>
-		/// Generates the variations possible for a product associated with the product type based on the option values supplied in the request.
-		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="productCode"></param>
-		/// <param name="productTypeId">Identifier of the product type.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="productOptionsIn">Properties of the product option to create such as attribute detail, fully qualified name, and list of product option values.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductVariationPagedCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var producttypevariation = new ProductTypeVariation();
-		///   var productVariationPagedCollection = producttypevariation.GenerateProductVariations( productOptionsIn,  productTypeId,  productCode,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.ProductVariationPagedCollection GenerateProductVariations(List<Mozu.Api.Contracts.ProductAdmin.ProductOption> productOptionsIn, int productTypeId, string productCode =  null, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductVariationPagedCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Producttypes.ProductTypeVariationClient.GenerateProductVariationsClient( productOptionsIn,  productTypeId,  productCode,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Generates the variations possible for a product associated with the product type based on the option values supplied in the request.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
 		/// <param name="productCode"></param>
-		/// <param name="productTypeId">Identifier of the product type.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+		/// <param name="productTypeId">Unique identifier of the product type.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="productOptionsIn">Properties of the product option to create such as attribute detail, fully qualified name, and list of product option values.</param>
+		/// <param name="productOptionsIn">The product option attributes configured for this product type.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductVariationPagedCollection"/>
 		/// </returns>
@@ -90,12 +60,12 @@ public virtual Mozu.Api.Contracts.ProductAdmin.ProductVariationPagedCollection G
 		///   var productVariationPagedCollection = await producttypevariation.GenerateProductVariationsAsync( productOptionsIn,  productTypeId,  productCode,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductVariationPagedCollection> GenerateProductVariationsAsync(List<Mozu.Api.Contracts.ProductAdmin.ProductOption> productOptionsIn, int productTypeId, string productCode =  null, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductVariationPagedCollection> GenerateProductVariationsAsync(List<Mozu.Api.Contracts.ProductAdmin.ProductOption> productOptionsIn, int productTypeId, string productCode =  null, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductVariationPagedCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Attributedefinition.Producttypes.ProductTypeVariationClient.GenerateProductVariationsClient( productOptionsIn,  productTypeId,  productCode,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
diff --git a/Mozu.Api/Resources/Commerce/Catalog/Admin/CategoryResource.cs b/Mozu.Api/Resources/Commerce/Catalog/Admin/CategoryResource.cs
old mode 100644
new mode 100755
index 53556692..6c8ba099
--- a/Mozu.Api/Resources/Commerce/Catalog/Admin/CategoryResource.cs
+++ b/Mozu.Api/Resources/Commerce/Catalog/Admin/CategoryResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Catalog.Admin
 {
@@ -44,40 +45,13 @@ public CategoryResource(IApiContext apiContext, DataViewMode dataViewMode)
 			_dataViewMode = dataViewMode;
 		}
 				
-		/// <summary>
-		/// Retrieves a list of categories according to any specified filter criteria and sort options.
-		/// </summary>
-		/// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy"></param>
-		/// <param name="startIndex"></param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.CategoryPagedCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var category = new Category();
-		///   var categoryPagedCollection = category.GetCategories(_dataViewMode,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.CategoryPagedCollection GetCategories(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.CategoryPagedCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.CategoryClient.GetCategoriesClient(_dataViewMode,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of categories according to any specified filter criteria and sort options.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. You can filter product category search results by any of its properties, including its position in the category hierarchy. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
 		/// <param name="sortBy"></param>
 		/// <param name="startIndex"></param>
 		/// <returns>
@@ -89,46 +63,22 @@ public virtual Mozu.Api.Contracts.ProductAdmin.CategoryPagedCollection GetCatego
 		///   var categoryPagedCollection = await category.GetCategoriesAsync(_dataViewMode,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.CategoryPagedCollection> GetCategoriesAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.CategoryPagedCollection> GetCategoriesAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.CategoryPagedCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.CategoryClient.GetCategoriesClient(_dataViewMode,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the list of subcategories within a category.
-		/// </summary>
-		/// <param name="categoryId">Unique identifier of the category to modify.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.CategoryCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var category = new Category();
-		///   var categoryCollection = category.GetChildCategories( categoryId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.CategoryCollection GetChildCategories(int categoryId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.CategoryCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.CategoryClient.GetChildCategoriesClient( categoryId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the list of subcategories within a category.
+		/// 
 		/// </summary>
-		/// <param name="categoryId">Unique identifier of the category to modify.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="categoryId">Unique identifier of the category for which to retrieve subcategories.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.CategoryCollection"/>
 		/// </returns>
@@ -138,46 +88,22 @@ public virtual Mozu.Api.Contracts.ProductAdmin.CategoryCollection GetChildCatego
 		///   var categoryCollection = await category.GetChildCategoriesAsync( categoryId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.CategoryCollection> GetChildCategoriesAsync(int categoryId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.CategoryCollection> GetChildCategoriesAsync(int categoryId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.CategoryCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.CategoryClient.GetChildCategoriesClient( categoryId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the details of a single category.
-		/// </summary>
-		/// <param name="categoryId">Unique identifier of the category to modify.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.Category"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var category = new Category();
-		///   var category = category.GetCategory(_dataViewMode,  categoryId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.Category GetCategory(int categoryId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.Category> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.CategoryClient.GetCategoryClient(_dataViewMode,  categoryId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of a single category.
+		/// 
 		/// </summary>
-		/// <param name="categoryId">Unique identifier of the category to modify.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="categoryId">Unique identifier of the category to retrieve.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.Category"/>
 		/// </returns>
@@ -187,50 +113,24 @@ public virtual Mozu.Api.Contracts.ProductAdmin.Category GetCategory(int category
 		///   var category = await category.GetCategoryAsync(_dataViewMode,  categoryId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.Category> GetCategoryAsync(int categoryId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.Category> GetCategoryAsync(int categoryId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.Category> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.CategoryClient.GetCategoryClient(_dataViewMode,  categoryId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Adds a new category to the site's category hierarchy.Specify a  to determine where to place the category in the hierarchy. If no  is specified, the new category is a top-level category.
-		/// </summary>
-		/// <param name="incrementSequence">If true, when adding a new product category, set the sequence number of the new category to an increment of one integer greater than the maximum available sequence number across all product categories. If false, set the sequence number to zero.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="useProvidedId">Optional. If ,  uses the  you specify in the request as the category's id. If ,  generates an  for the category regardless if you specify an id in the request.If you specify an id already in use and set this parameter to ,  returns an error.</param>
-		/// <param name="category">A descriptive container that groups products. A category is merchant defined with associated products and discounts as configured. GThe storefront displays products in a hierarchy of categories. As such, categories can include a nesting of sub-categories to organize products and product options per set guidelines such as color, brand, material, and size.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.Category"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var category = new Category();
-		///   var category = category.AddCategory( category,  incrementSequence,  useProvidedId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.Category AddCategory(Mozu.Api.Contracts.ProductAdmin.Category category, bool? incrementSequence =  null, bool? useProvidedId =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.Category> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.CategoryClient.AddCategoryClient( category,  incrementSequence,  useProvidedId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Adds a new category to the site's category hierarchy.Specify a  to determine where to place the category in the hierarchy. If no  is specified, the new category is a top-level category.
+		/// 
 		/// </summary>
 		/// <param name="incrementSequence">If true, when adding a new product category, set the sequence number of the new category to an increment of one integer greater than the maximum available sequence number across all product categories. If false, set the sequence number to zero.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="useProvidedId">Optional. If ,  uses the  you specify in the request as the category's id. If ,  generates an  for the category regardless if you specify an id in the request.If you specify an id already in use and set this parameter to ,  returns an error.</param>
-		/// <param name="category">A descriptive container that groups products. A category is merchant defined with associated products and discounts as configured. GThe storefront displays products in a hierarchy of categories. As such, categories can include a nesting of sub-categories to organize products and product options per set guidelines such as color, brand, material, and size.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="useProvidedId"></param>
+		/// <param name="category">Properties of the new category to create. You must specify a name and parent category if you want to create it as a subcategory.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.Category"/>
 		/// </returns>
@@ -240,46 +140,22 @@ public virtual Mozu.Api.Contracts.ProductAdmin.Category AddCategory(Mozu.Api.Con
 		///   var category = await category.AddCategoryAsync( category,  incrementSequence,  useProvidedId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.Category> AddCategoryAsync(Mozu.Api.Contracts.ProductAdmin.Category category, bool? incrementSequence =  null, bool? useProvidedId =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.Category> AddCategoryAsync(Mozu.Api.Contracts.ProductAdmin.Category category, bool? incrementSequence =  null, bool? useProvidedId =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.Category> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.CategoryClient.AddCategoryClient( category,  incrementSequence,  useProvidedId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Validate the precomputed dynamic category expression for correctness.
-		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="dynamicExpressionIn">The details of the dynamic expression that you want to validate.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.DynamicExpression"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var category = new Category();
-		///   var dynamicExpression = category.ValidateDynamicExpression( dynamicExpressionIn,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.DynamicExpression ValidateDynamicExpression(Mozu.Api.Contracts.ProductAdmin.DynamicExpression dynamicExpressionIn, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.DynamicExpression> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.CategoryClient.ValidateDynamicExpressionClient( dynamicExpressionIn,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Validate the precomputed dynamic category expression for correctness.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="dynamicExpressionIn">The details of the dynamic expression that you want to validate.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="dynamicExpressionIn"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.DynamicExpression"/>
 		/// </returns>
@@ -289,46 +165,22 @@ public virtual Mozu.Api.Contracts.ProductAdmin.DynamicExpression ValidateDynamic
 		///   var dynamicExpression = await category.ValidateDynamicExpressionAsync( dynamicExpressionIn,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.DynamicExpression> ValidateDynamicExpressionAsync(Mozu.Api.Contracts.ProductAdmin.DynamicExpression dynamicExpressionIn, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.DynamicExpression> ValidateDynamicExpressionAsync(Mozu.Api.Contracts.ProductAdmin.DynamicExpression dynamicExpressionIn, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.DynamicExpression> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.CategoryClient.ValidateDynamicExpressionClient( dynamicExpressionIn,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Validates the readltime dynamic category expression for correctness.
-		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="dynamicExpressionIn">The details of the dynamic expression that you want to validate.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.DynamicExpression"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var category = new Category();
-		///   var dynamicExpression = category.ValidateRealTimeDynamicExpression( dynamicExpressionIn,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.DynamicExpression ValidateRealTimeDynamicExpression(Mozu.Api.Contracts.ProductAdmin.DynamicExpression dynamicExpressionIn, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.DynamicExpression> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.CategoryClient.ValidateRealTimeDynamicExpressionClient( dynamicExpressionIn,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Validates the readltime dynamic category expression for correctness.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="dynamicExpressionIn">The details of the dynamic expression that you want to validate.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="dynamicExpressionIn"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.DynamicExpression"/>
 		/// </returns>
@@ -338,50 +190,24 @@ public virtual Mozu.Api.Contracts.ProductAdmin.DynamicExpression ValidateRealTim
 		///   var dynamicExpression = await category.ValidateRealTimeDynamicExpressionAsync( dynamicExpressionIn,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.DynamicExpression> ValidateRealTimeDynamicExpressionAsync(Mozu.Api.Contracts.ProductAdmin.DynamicExpression dynamicExpressionIn, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.DynamicExpression> ValidateRealTimeDynamicExpressionAsync(Mozu.Api.Contracts.ProductAdmin.DynamicExpression dynamicExpressionIn, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.DynamicExpression> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.CategoryClient.ValidateRealTimeDynamicExpressionClient( dynamicExpressionIn,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Update the properties of a defined category or move it to another location in the category hierarchy. Because this operation replaces the defined resource,include all the information to maintain for the category in the request.
-		/// </summary>
-		/// <param name="cascadeVisibility">If true, when changing the display option for the category, change it for all subcategories also. The default value is false.</param>
-		/// <param name="categoryId">Unique identifier of the category to modify.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="category">A descriptive container that groups products. A category is merchant defined with associated products and discounts as configured. GThe storefront displays products in a hierarchy of categories. As such, categories can include a nesting of sub-categories to organize products and product options per set guidelines such as color, brand, material, and size.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.Category"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var category = new Category();
-		///   var category = category.UpdateCategory( category,  categoryId,  cascadeVisibility,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.Category UpdateCategory(Mozu.Api.Contracts.ProductAdmin.Category category, int categoryId, bool? cascadeVisibility =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.Category> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.CategoryClient.UpdateCategoryClient( category,  categoryId,  cascadeVisibility,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Update the properties of a defined category or move it to another location in the category hierarchy. Because this operation replaces the defined resource,include all the information to maintain for the category in the request.
+		/// 
 		/// </summary>
-		/// <param name="cascadeVisibility">If true, when changing the display option for the category, change it for all subcategories also. The default value is false.</param>
+		/// <param name="cascadeVisibility">If true, when changing the display option for the category, change it for all subcategories also. Default: False.</param>
 		/// <param name="categoryId">Unique identifier of the category to modify.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="category">A descriptive container that groups products. A category is merchant defined with associated products and discounts as configured. GThe storefront displays products in a hierarchy of categories. As such, categories can include a nesting of sub-categories to organize products and product options per set guidelines such as color, brand, material, and size.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="category">Properties of the category to modify.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.Category"/>
 		/// </returns>
@@ -391,49 +217,24 @@ public virtual Mozu.Api.Contracts.ProductAdmin.Category UpdateCategory(Mozu.Api.
 		///   var category = await category.UpdateCategoryAsync( category,  categoryId,  cascadeVisibility,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.Category> UpdateCategoryAsync(Mozu.Api.Contracts.ProductAdmin.Category category, int categoryId, bool? cascadeVisibility =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.Category> UpdateCategoryAsync(Mozu.Api.Contracts.ProductAdmin.Category category, int categoryId, bool? cascadeVisibility =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.Category> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.CategoryClient.UpdateCategoryClient( category,  categoryId,  cascadeVisibility,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Deletes the specified category. Use the categoryId parameter to specify the category.
-		/// </summary>
-		/// <param name="cascadeDelete">Specifies whether to also delete all subcategories associated with the specified category.If you set this value is false, only the specified category is deleted.The default value is false.</param>
-		/// <param name="categoryId">Unique identifier of the category to modify.</param>
-		/// <param name="forceDelete">Specifies whether the category, and any associated subcategories, are deleted even if there are products that reference them. The default value is false.</param>
-		/// <param name="reassignToParent">Specifies whether any subcategories of the specified category are reassigned to the parent of the specified category.This field only applies if the cascadeDelete parameter is false.The default value is false.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var category = new Category();
-		///   category.DeleteCategoryById( categoryId,  cascadeDelete,  forceDelete,  reassignToParent);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteCategoryById(int categoryId, bool? cascadeDelete =  null, bool? forceDelete =  null, bool? reassignToParent =  null)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.CategoryClient.DeleteCategoryByIdClient( categoryId,  cascadeDelete,  forceDelete,  reassignToParent);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes the specified category. Use the categoryId parameter to specify the category.
+		/// 
 		/// </summary>
-		/// <param name="cascadeDelete">Specifies whether to also delete all subcategories associated with the specified category.If you set this value is false, only the specified category is deleted.The default value is false.</param>
-		/// <param name="categoryId">Unique identifier of the category to modify.</param>
-		/// <param name="forceDelete">Specifies whether the category, and any associated subcategories, are deleted even if there are products that reference them. The default value is false.</param>
-		/// <param name="reassignToParent">Specifies whether any subcategories of the specified category are reassigned to the parent of the specified category.This field only applies if the cascadeDelete parameter is false.The default value is false.</param>
+		/// <param name="cascadeDelete">If true, also delete all subcategories associated with the specified category.</param>
+		/// <param name="categoryId">Unique identifier of the category to delete.</param>
+		/// <param name="forceDelete"></param>
+		/// <param name="reassignToParent"></param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -443,12 +244,12 @@ public virtual void DeleteCategoryById(int categoryId, bool? cascadeDelete =  nu
 		///   await category.DeleteCategoryByIdAsync( categoryId,  cascadeDelete,  forceDelete,  reassignToParent);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteCategoryByIdAsync(int categoryId, bool? cascadeDelete =  null, bool? forceDelete =  null, bool? reassignToParent =  null)
+		public virtual async Task DeleteCategoryByIdAsync(int categoryId, bool? cascadeDelete =  null, bool? forceDelete =  null, bool? reassignToParent =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.CategoryClient.DeleteCategoryByIdClient( categoryId,  cascadeDelete,  forceDelete,  reassignToParent);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/Catalog/Admin/CouponSetResource.cs b/Mozu.Api/Resources/Commerce/Catalog/Admin/CouponSetResource.cs
old mode 100644
new mode 100755
index 65e4cb4e..978e9d7b
--- a/Mozu.Api/Resources/Commerce/Catalog/Admin/CouponSetResource.cs
+++ b/Mozu.Api/Resources/Commerce/Catalog/Admin/CouponSetResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Catalog.Admin
 {
 	/// <summary>
-	/// Use the Coupon Sets resource to view and create coupon sets. You can use coupon sets to group multiple coupon codes together and associate them with one or more discounts. Use the  subresource to manage the coupon codes within manual coupon sets. Use the  subresource to mange the discounts assigned to coupon sets.
+	/// 
 	/// </summary>
 	public partial class CouponSetResource  	{
 		///
@@ -37,44 +38,16 @@ public CouponSetResource CloneWithApiContext(Action<IApiContext> contextModifica
 		}
 
 				
-		/// <summary>
-		/// Retrieves a list of coupon sets in the catalog according to any specified filter criteria and sort options.
-		/// </summary>
-		/// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-		/// <param name="includeCounts">Specifies whether to include the number of redeemed coupons, existing coupon codes, and assigned discounts in the response body.</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.CouponSetCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var couponset = new CouponSet();
-		///   var couponSetCollection = couponset.GetCouponSets( startIndex,  pageSize,  sortBy,  filter,  includeCounts,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.CouponSetCollection GetCouponSets(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, bool? includeCounts =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.CouponSetCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.CouponSetClient.GetCouponSetsClient( startIndex,  pageSize,  sortBy,  filter,  includeCounts,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of coupon sets in the catalog according to any specified filter criteria and sort options.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-		/// <param name="includeCounts">Specifies whether to include the number of redeemed coupons, existing coupon codes, and assigned discounts in the response body.</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
+		/// <param name="filter"></param>
+		/// <param name="includeCounts"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.CouponSetCollection"/>
 		/// </returns>
@@ -84,48 +57,23 @@ public virtual Mozu.Api.Contracts.ProductAdmin.CouponSetCollection GetCouponSets
 		///   var couponSetCollection = await couponset.GetCouponSetsAsync( startIndex,  pageSize,  sortBy,  filter,  includeCounts,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.CouponSetCollection> GetCouponSetsAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, bool? includeCounts =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.CouponSetCollection> GetCouponSetsAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, bool? includeCounts =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.CouponSetCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.CouponSetClient.GetCouponSetsClient( startIndex,  pageSize,  sortBy,  filter,  includeCounts,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the details of a single coupon set. Use the couponSetCode parameter to specify the coupon set. Use the includeCounts parameter to specify whether to include the number of redeemed coupons, existing coupon codes, and assigned discounts.
-		/// </summary>
-		/// <param name="couponSetCode">The unique identifier of the coupon set.</param>
-		/// <param name="includeCounts">Specifies whether to include the number of redeemed coupons, existing coupon codes, and assigned discounts in the response body.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.CouponSet"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var couponset = new CouponSet();
-		///   var couponSet = couponset.GetCouponSet( couponSetCode,  includeCounts,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.CouponSet GetCouponSet(string couponSetCode, bool? includeCounts =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.CouponSet> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.CouponSetClient.GetCouponSetClient( couponSetCode,  includeCounts,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of a single coupon set. Use the couponSetCode parameter to specify the coupon set. Use the includeCounts parameter to specify whether to include the number of redeemed coupons, existing coupon codes, and assigned discounts.
+		/// 
 		/// </summary>
-		/// <param name="couponSetCode">The unique identifier of the coupon set.</param>
-		/// <param name="includeCounts">Specifies whether to include the number of redeemed coupons, existing coupon codes, and assigned discounts in the response body.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="couponSetCode"></param>
+		/// <param name="includeCounts"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.CouponSet"/>
 		/// </returns>
@@ -135,44 +83,21 @@ public virtual Mozu.Api.Contracts.ProductAdmin.CouponSet GetCouponSet(string cou
 		///   var couponSet = await couponset.GetCouponSetAsync( couponSetCode,  includeCounts,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.CouponSet> GetCouponSetAsync(string couponSetCode, bool? includeCounts =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.CouponSet> GetCouponSetAsync(string couponSetCode, bool? includeCounts =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.CouponSet> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.CouponSetClient.GetCouponSetClient( couponSetCode,  includeCounts,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Returns a unique, random four character code to use for the couponSetCode.
-		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <returns>
-		/// string
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var couponset = new CouponSet();
-		///   var string = couponset.GetUniqueCouponSetCode( responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual string GetUniqueCouponSetCode(string responseFields =  null)
-		{
-			MozuClient<string> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.CouponSetClient.GetUniqueCouponSetCodeClient( responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Returns a unique, random four character code to use for the couponSetCode.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// string
 		/// </returns>
@@ -182,46 +107,22 @@ public virtual string GetUniqueCouponSetCode(string responseFields =  null)
 		///   var string = await couponset.GetUniqueCouponSetCodeAsync( responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<string> GetUniqueCouponSetCodeAsync(string responseFields =  null)
+		public virtual async Task<string> GetUniqueCouponSetCodeAsync(string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<string> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.CouponSetClient.GetUniqueCouponSetCodeClient( responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Adds a single coupon set to the catalog.
-		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="couponSet">The details of the new coupon set.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.CouponSet"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var couponset = new CouponSet();
-		///   var couponSet = couponset.AddCouponSet( couponSet,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.CouponSet AddCouponSet(Mozu.Api.Contracts.ProductAdmin.CouponSet couponSet, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.CouponSet> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.CouponSetClient.AddCouponSetClient( couponSet,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Adds a single coupon set to the catalog.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="couponSet">The details of the new coupon set.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="couponSet"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.CouponSet"/>
 		/// </returns>
@@ -231,43 +132,21 @@ public virtual Mozu.Api.Contracts.ProductAdmin.CouponSet AddCouponSet(Mozu.Api.C
 		///   var couponSet = await couponset.AddCouponSetAsync( couponSet,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.CouponSet> AddCouponSetAsync(Mozu.Api.Contracts.ProductAdmin.CouponSet couponSet, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.CouponSet> AddCouponSetAsync(Mozu.Api.Contracts.ProductAdmin.CouponSet couponSet, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.CouponSet> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.CouponSetClient.AddCouponSetClient( couponSet,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Validates the couponSetCode and tests it for uniqueness.
-		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var couponset = new CouponSet();
-		///   couponset.ValidateUniqueCouponSetCode( code);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void ValidateUniqueCouponSetCode(string code)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.CouponSetClient.ValidateUniqueCouponSetCodeClient( code);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Validates the couponSetCode and tests it for uniqueness.
+		/// 
 		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
+		/// <param name="code"></param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -277,47 +156,22 @@ public virtual void ValidateUniqueCouponSetCode(string code)
 		///   await couponset.ValidateUniqueCouponSetCodeAsync( code);
 		/// </code>
 		/// </example>
-		public virtual async Task ValidateUniqueCouponSetCodeAsync(string code)
+		public virtual async Task ValidateUniqueCouponSetCodeAsync(string code, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.CouponSetClient.ValidateUniqueCouponSetCodeClient( code);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
-		/// <summary>
-		/// Updates one or more properties of a coupon set in the catalog.
-		/// </summary>
-		/// <param name="couponSetCode">The unique identifier of the coupon set.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="couponSet">The details of the updated coupon set.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.CouponSet"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var couponset = new CouponSet();
-		///   var couponSet = couponset.UpdateCouponSet( couponSet,  couponSetCode,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.CouponSet UpdateCouponSet(Mozu.Api.Contracts.ProductAdmin.CouponSet couponSet, string couponSetCode, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.CouponSet> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.CouponSetClient.UpdateCouponSetClient( couponSet,  couponSetCode,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates one or more properties of a coupon set in the catalog.
+		/// 
 		/// </summary>
-		/// <param name="couponSetCode">The unique identifier of the coupon set.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="couponSet">The details of the updated coupon set.</param>
+		/// <param name="couponSetCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="couponSet"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.CouponSet"/>
 		/// </returns>
@@ -327,43 +181,21 @@ public virtual Mozu.Api.Contracts.ProductAdmin.CouponSet UpdateCouponSet(Mozu.Ap
 		///   var couponSet = await couponset.UpdateCouponSetAsync( couponSet,  couponSetCode,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.CouponSet> UpdateCouponSetAsync(Mozu.Api.Contracts.ProductAdmin.CouponSet couponSet, string couponSetCode, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.CouponSet> UpdateCouponSetAsync(Mozu.Api.Contracts.ProductAdmin.CouponSet couponSet, string couponSetCode, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.CouponSet> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.CouponSetClient.UpdateCouponSetClient( couponSet,  couponSetCode,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Deletes a specified coupon set from the catalog. Use the couponSetCode parameter to specify the coupon set to delete.
-		/// </summary>
-		/// <param name="couponSetCode">The unique identifier of the coupon set.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var couponset = new CouponSet();
-		///   couponset.DeleteCouponSet( couponSetCode);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteCouponSet(string couponSetCode)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.CouponSetClient.DeleteCouponSetClient( couponSetCode);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes a specified coupon set from the catalog. Use the couponSetCode parameter to specify the coupon set to delete.
+		/// 
 		/// </summary>
-		/// <param name="couponSetCode">The unique identifier of the coupon set.</param>
+		/// <param name="couponSetCode"></param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -373,12 +205,12 @@ public virtual void DeleteCouponSet(string couponSetCode)
 		///   await couponset.DeleteCouponSetAsync( couponSetCode);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteCouponSetAsync(string couponSetCode)
+		public virtual async Task DeleteCouponSetAsync(string couponSetCode, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.CouponSetClient.DeleteCouponSetClient( couponSetCode);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/Catalog/Admin/Couponsets/AssignedDiscountResource.cs b/Mozu.Api/Resources/Commerce/Catalog/Admin/Couponsets/AssignedDiscountResource.cs
old mode 100644
new mode 100755
index 8c56678e..ae7c102f
--- a/Mozu.Api/Resources/Commerce/Catalog/Admin/Couponsets/AssignedDiscountResource.cs
+++ b/Mozu.Api/Resources/Commerce/Catalog/Admin/Couponsets/AssignedDiscountResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Catalog.Admin.Couponsets
 {
 	/// <summary>
-	/// Use the AssignedDiscounts resource to manage the discounts assigned to coupon sets.
+	/// 
 	/// </summary>
 	public partial class AssignedDiscountResource  	{
 		///
@@ -37,34 +38,11 @@ public AssignedDiscountResource CloneWithApiContext(Action<IApiContext> contextM
 		}
 
 				
-		/// <summary>
-		/// Retrieves the discountIds of any assigned discounts for the specified coupon set.
-		/// </summary>
-		/// <param name="couponSetCode">The unique identifier of the coupon set.</param>
-		/// <returns>
-		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.AssignedDiscount"/>}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var assigneddiscount = new AssignedDiscount();
-		///   var assignedDiscount = assigneddiscount.GetAssignedDiscounts( couponSetCode);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<Mozu.Api.Contracts.ProductAdmin.AssignedDiscount> GetAssignedDiscounts(string couponSetCode)
-		{
-			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.AssignedDiscount>> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Couponsets.AssignedDiscountClient.GetAssignedDiscountsClient( couponSetCode);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the discountIds of any assigned discounts for the specified coupon set.
+		/// 
 		/// </summary>
-		/// <param name="couponSetCode">The unique identifier of the coupon set.</param>
+		/// <param name="couponSetCode"></param>
 		/// <returns>
 		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.AssignedDiscount"/>}
 		/// </returns>
@@ -74,45 +52,22 @@ public AssignedDiscountResource CloneWithApiContext(Action<IApiContext> contextM
 		///   var assignedDiscount = await assigneddiscount.GetAssignedDiscountsAsync( couponSetCode);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.AssignedDiscount>> GetAssignedDiscountsAsync(string couponSetCode)
+		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.AssignedDiscount>> GetAssignedDiscountsAsync(string couponSetCode, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.AssignedDiscount>> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Couponsets.AssignedDiscountClient.GetAssignedDiscountsClient( couponSetCode);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Assigns or associates an existing discount to a specified coupon set. Use the couponSetCode parameter to specify the coupon set.
-		/// </summary>
-		/// <param name="couponSetCode">The unique identifier of the coupon set.</param>
-		/// <param name="assignedDiscount">The details of the discount assigned to the coupon set.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var assigneddiscount = new AssignedDiscount();
-		///   assigneddiscount.AssignDiscount( assignedDiscount,  couponSetCode);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void AssignDiscount(Mozu.Api.Contracts.ProductAdmin.AssignedDiscount assignedDiscount, string couponSetCode)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Couponsets.AssignedDiscountClient.AssignDiscountClient( assignedDiscount,  couponSetCode);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Assigns or associates an existing discount to a specified coupon set. Use the couponSetCode parameter to specify the coupon set.
+		/// 
 		/// </summary>
-		/// <param name="couponSetCode">The unique identifier of the coupon set.</param>
-		/// <param name="assignedDiscount">The details of the discount assigned to the coupon set.</param>
+		/// <param name="couponSetCode"></param>
+		/// <param name="assignedDiscount"></param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -122,44 +77,21 @@ public virtual void AssignDiscount(Mozu.Api.Contracts.ProductAdmin.AssignedDisco
 		///   await assigneddiscount.AssignDiscountAsync( assignedDiscount,  couponSetCode);
 		/// </code>
 		/// </example>
-		public virtual async Task AssignDiscountAsync(Mozu.Api.Contracts.ProductAdmin.AssignedDiscount assignedDiscount, string couponSetCode)
+		public virtual async Task AssignDiscountAsync(Mozu.Api.Contracts.ProductAdmin.AssignedDiscount assignedDiscount, string couponSetCode, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Couponsets.AssignedDiscountClient.AssignDiscountClient( assignedDiscount,  couponSetCode);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
-		/// <summary>
-		/// Unassigns or disassociates the specified discount with the specified coupon set.
-		/// </summary>
-		/// <param name="couponSetCode">The unique identifier of the coupon set.</param>
-		/// <param name="discountId">discountId parameter description DOCUMENT_HERE </param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var assigneddiscount = new AssignedDiscount();
-		///   assigneddiscount.UnAssignDiscount( couponSetCode,  discountId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void UnAssignDiscount(string couponSetCode, int discountId)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Couponsets.AssignedDiscountClient.UnAssignDiscountClient( couponSetCode,  discountId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Unassigns or disassociates the specified discount with the specified coupon set.
+		/// 
 		/// </summary>
-		/// <param name="couponSetCode">The unique identifier of the coupon set.</param>
-		/// <param name="discountId">discountId parameter description DOCUMENT_HERE </param>
+		/// <param name="couponSetCode"></param>
+		/// <param name="discountId"></param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -169,12 +101,12 @@ public virtual void UnAssignDiscount(string couponSetCode, int discountId)
 		///   await assigneddiscount.UnAssignDiscountAsync( couponSetCode,  discountId);
 		/// </code>
 		/// </example>
-		public virtual async Task UnAssignDiscountAsync(string couponSetCode, int discountId)
+		public virtual async Task UnAssignDiscountAsync(string couponSetCode, int discountId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Couponsets.AssignedDiscountClient.UnAssignDiscountClient( couponSetCode,  discountId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/Catalog/Admin/Couponsets/CouponResource.cs b/Mozu.Api/Resources/Commerce/Catalog/Admin/Couponsets/CouponResource.cs
old mode 100644
new mode 100755
index e7136f56..fb6014cc
--- a/Mozu.Api/Resources/Commerce/Catalog/Admin/Couponsets/CouponResource.cs
+++ b/Mozu.Api/Resources/Commerce/Catalog/Admin/Couponsets/CouponResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Catalog.Admin.Couponsets
 {
 	/// <summary>
-	/// Use the Coupons subresource to manage coupons within manual coupon sets.
+	/// 
 	/// </summary>
 	public partial class CouponResource  	{
 		///
@@ -37,40 +38,14 @@ public CouponResource CloneWithApiContext(Action<IApiContext> contextModificatio
 		}
 
 				
-		/// <summary>
-		/// Retrieves the details of the specified coupon. Use the couponSetCode and the couponCode parameter to specify the coupon within a coupon set. Use the includeCounts paramter to specify whether to return the redemptionCount property in the response body object.
-		/// </summary>
-		/// <param name="couponCode">Code associated with the coupon to remove from the cart.</param>
-		/// <param name="couponSetCode">The unique identifier of the coupon set that the coupon belongs to.</param>
-		/// <param name="includeCounts">Specifies whether to return the redemptionCount property in the response body object.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.Coupon"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var coupon = new Coupon();
-		///   var coupon = coupon.GetCoupon( couponSetCode,  couponCode,  includeCounts,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.Coupon GetCoupon(string couponSetCode, string couponCode, bool? includeCounts =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.Coupon> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Couponsets.CouponClient.GetCouponClient( couponSetCode,  couponCode,  includeCounts,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of the specified coupon. Use the couponSetCode and the couponCode parameter to specify the coupon within a coupon set. Use the includeCounts paramter to specify whether to return the redemptionCount property in the response body object.
+		/// 
 		/// </summary>
-		/// <param name="couponCode">Code associated with the coupon to remove from the cart.</param>
-		/// <param name="couponSetCode">The unique identifier of the coupon set that the coupon belongs to.</param>
-		/// <param name="includeCounts">Specifies whether to return the redemptionCount property in the response body object.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="couponCode"></param>
+		/// <param name="couponSetCode"></param>
+		/// <param name="includeCounts"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.Coupon"/>
 		/// </returns>
@@ -80,56 +55,27 @@ public virtual Mozu.Api.Contracts.ProductAdmin.Coupon GetCoupon(string couponSet
 		///   var coupon = await coupon.GetCouponAsync( couponSetCode,  couponCode,  includeCounts,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.Coupon> GetCouponAsync(string couponSetCode, string couponCode, bool? includeCounts =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.Coupon> GetCouponAsync(string couponSetCode, string couponCode, bool? includeCounts =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.Coupon> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Couponsets.CouponClient.GetCouponClient( couponSetCode,  couponCode,  includeCounts,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves a list of coupons in a specified coupon set according to any specified filter criteria and sort options.
-		/// </summary>
-		/// <param name="couponSetCode">The unique identifier of the coupon set that the coupons belongs to.</param>
-		/// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-		/// <param name="includeCounts">Specifies whether to include the redemptionCount property in the response body object.</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.CouponCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var coupon = new Coupon();
-		///   var couponCollection = coupon.GetCoupons( couponSetCode,  startIndex,  pageSize,  sortBy,  filter,  includeCounts,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.CouponCollection GetCoupons(string couponSetCode, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, bool? includeCounts =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.CouponCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Couponsets.CouponClient.GetCouponsClient( couponSetCode,  startIndex,  pageSize,  sortBy,  filter,  includeCounts,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of coupons in a specified coupon set according to any specified filter criteria and sort options.
+		/// 
 		/// </summary>
-		/// <param name="couponSetCode">The unique identifier of the coupon set that the coupons belongs to.</param>
-		/// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-		/// <param name="includeCounts">Specifies whether to include the redemptionCount property in the response body object.</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
+		/// <param name="couponSetCode"></param>
+		/// <param name="filter"></param>
+		/// <param name="includeCounts"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.CouponCollection"/>
 		/// </returns>
@@ -139,45 +85,22 @@ public virtual Mozu.Api.Contracts.ProductAdmin.CouponCollection GetCoupons(strin
 		///   var couponCollection = await coupon.GetCouponsAsync( couponSetCode,  startIndex,  pageSize,  sortBy,  filter,  includeCounts,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.CouponCollection> GetCouponsAsync(string couponSetCode, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, bool? includeCounts =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.CouponCollection> GetCouponsAsync(string couponSetCode, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, bool? includeCounts =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.CouponCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Couponsets.CouponClient.GetCouponsClient( couponSetCode,  startIndex,  pageSize,  sortBy,  filter,  includeCounts,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Adds coupons  to a specified manual coupon set. Use the couponSetCode parameter to specify the manual coupon set.
-		/// </summary>
-		/// <param name="couponSetCode">The unique identifier of the coupon set.</param>
-		/// <param name="coupons">The details necessary to assign the discount to a coupon set, including .</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var coupon = new Coupon();
-		///   coupon.AddCoupons( coupons,  couponSetCode);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void AddCoupons(List<Mozu.Api.Contracts.ProductAdmin.Coupon> coupons, string couponSetCode)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Couponsets.CouponClient.AddCouponsClient( coupons,  couponSetCode);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Adds coupons  to a specified manual coupon set. Use the couponSetCode parameter to specify the manual coupon set.
+		/// 
 		/// </summary>
-		/// <param name="couponSetCode">The unique identifier of the coupon set.</param>
-		/// <param name="coupons">The details necessary to assign the discount to a coupon set, including .</param>
+		/// <param name="couponSetCode"></param>
+		/// <param name="coupons"></param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -187,44 +110,21 @@ public virtual void AddCoupons(List<Mozu.Api.Contracts.ProductAdmin.Coupon> coup
 		///   await coupon.AddCouponsAsync( coupons,  couponSetCode);
 		/// </code>
 		/// </example>
-		public virtual async Task AddCouponsAsync(List<Mozu.Api.Contracts.ProductAdmin.Coupon> coupons, string couponSetCode)
+		public virtual async Task AddCouponsAsync(List<Mozu.Api.Contracts.ProductAdmin.Coupon> coupons, string couponSetCode, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Couponsets.CouponClient.AddCouponsClient( coupons,  couponSetCode);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
-		/// <summary>
-		/// Deletes the specified coupons and removes them from the coupon set. You can only delete a coupon if it has not been redeemed. Use the canBeDeleted property to determine whether a coupon can be deleted.
-		/// </summary>
-		/// <param name="couponSetCode">The unique identifier of the coupon set that the coupon belongs to.</param>
-		/// <param name="couponCodes">The unique identifiers of the coupons to delete.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var coupon = new Coupon();
-		///   coupon.DeleteCoupons( couponCodes,  couponSetCode);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteCoupons(List<string> couponCodes, string couponSetCode)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Couponsets.CouponClient.DeleteCouponsClient( couponCodes,  couponSetCode);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes the specified coupons and removes them from the coupon set. You can only delete a coupon if it has not been redeemed. Use the canBeDeleted property to determine whether a coupon can be deleted.
+		/// 
 		/// </summary>
-		/// <param name="couponSetCode">The unique identifier of the coupon set that the coupon belongs to.</param>
-		/// <param name="couponCodes">The unique identifiers of the coupons to delete.</param>
+		/// <param name="couponSetCode"></param>
+		/// <param name="couponCodes"></param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -234,44 +134,21 @@ public virtual void DeleteCoupons(List<string> couponCodes, string couponSetCode
 		///   await coupon.DeleteCouponsAsync( couponCodes,  couponSetCode);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteCouponsAsync(List<string> couponCodes, string couponSetCode)
+		public virtual async Task DeleteCouponsAsync(List<string> couponCodes, string couponSetCode, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Couponsets.CouponClient.DeleteCouponsClient( couponCodes,  couponSetCode);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
-		/// <summary>
-		/// Deletes the specified coupon and remove it from the coupon set. You can only delete a coupon if it has not been redeemed. Use the canBeDeleted property to determine whether a coupon can be deleted.
-		/// </summary>
-		/// <param name="couponCode">Code associated with the coupon to remove from the cart.</param>
-		/// <param name="couponSetCode">The unique identifier of the coupon set that the coupon belongs to.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var coupon = new Coupon();
-		///   coupon.DeleteCoupon( couponSetCode,  couponCode);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteCoupon(string couponSetCode, string couponCode)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Couponsets.CouponClient.DeleteCouponClient( couponSetCode,  couponCode);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes the specified coupon and remove it from the coupon set. You can only delete a coupon if it has not been redeemed. Use the canBeDeleted property to determine whether a coupon can be deleted.
+		/// 
 		/// </summary>
-		/// <param name="couponCode">Code associated with the coupon to remove from the cart.</param>
-		/// <param name="couponSetCode">The unique identifier of the coupon set that the coupon belongs to.</param>
+		/// <param name="couponCode"></param>
+		/// <param name="couponSetCode"></param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -281,12 +158,12 @@ public virtual void DeleteCoupon(string couponSetCode, string couponCode)
 		///   await coupon.DeleteCouponAsync( couponSetCode,  couponCode);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteCouponAsync(string couponSetCode, string couponCode)
+		public virtual async Task DeleteCouponAsync(string couponSetCode, string couponCode, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Couponsets.CouponClient.DeleteCouponClient( couponSetCode,  couponCode);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/Catalog/Admin/DiscountResource.cs b/Mozu.Api/Resources/Commerce/Catalog/Admin/DiscountResource.cs
old mode 100644
new mode 100755
index 5ab4f211..d523b005
--- a/Mozu.Api/Resources/Commerce/Catalog/Admin/DiscountResource.cs
+++ b/Mozu.Api/Resources/Commerce/Catalog/Admin/DiscountResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Catalog.Admin
 {
 	/// <summary>
-	/// Use the Discounts resource to define and manage discounts to apply to products, product categories, or orders. The discounts can be a specified amount off the price, percentage off the price, or for free shipping. You can create a coupon code that shoppers can use to redeem the discount.
+	/// Define and manage discounts to apply to products, product categories, or orders. The discounts can be a specified amount off the price, percentage off the price, or for free shipping. Create a coupon code that shoppers can use to redeem the discount.
 	/// </summary>
 	public partial class DiscountResource  	{
 		///
@@ -44,40 +45,13 @@ public DiscountResource(IApiContext apiContext, DataViewMode dataViewMode)
 			_dataViewMode = dataViewMode;
 		}
 				
-		/// <summary>
-		/// Retrieves a list of discounts according to any specified filter criteria and sort options.
-		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy"></param>
-		/// <param name="startIndex"></param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.DiscountCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var discount = new Discount();
-		///   var discountCollection = discount.GetDiscounts(_dataViewMode,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.DiscountCollection GetDiscounts(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.DiscountCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.DiscountClient.GetDiscountsClient(_dataViewMode,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of discounts according to any specified filter criteria and sort options.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
 		/// <param name="sortBy"></param>
 		/// <param name="startIndex"></param>
 		/// <returns>
@@ -89,46 +63,22 @@ public virtual Mozu.Api.Contracts.ProductAdmin.DiscountCollection GetDiscounts(i
 		///   var discountCollection = await discount.GetDiscountsAsync(_dataViewMode,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.DiscountCollection> GetDiscountsAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.DiscountCollection> GetDiscountsAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.DiscountCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.DiscountClient.GetDiscountsClient(_dataViewMode,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the localized content specified for the specified discount.
-		/// </summary>
-		/// <param name="discountId">discountId parameter description DOCUMENT_HERE </param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.DiscountLocalizedContent"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var discount = new Discount();
-		///   var discountLocalizedContent = discount.GetDiscountContent(_dataViewMode,  discountId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.DiscountLocalizedContent GetDiscountContent(int discountId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.DiscountLocalizedContent> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.DiscountClient.GetDiscountContentClient(_dataViewMode,  discountId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the localized content specified for the specified discount.
+		/// 
 		/// </summary>
-		/// <param name="discountId">discountId parameter description DOCUMENT_HERE </param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="discountId">Unique identifier of the discount. System-supplied and read-only.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.DiscountLocalizedContent"/>
 		/// </returns>
@@ -138,46 +88,22 @@ public virtual Mozu.Api.Contracts.ProductAdmin.DiscountLocalizedContent GetDisco
 		///   var discountLocalizedContent = await discount.GetDiscountContentAsync(_dataViewMode,  discountId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.DiscountLocalizedContent> GetDiscountContentAsync(int discountId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.DiscountLocalizedContent> GetDiscountContentAsync(int discountId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.DiscountLocalizedContent> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.DiscountClient.GetDiscountContentClient(_dataViewMode,  discountId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the details of a single discount.
-		/// </summary>
-		/// <param name="discountId">discountId parameter description DOCUMENT_HERE </param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.Discount"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var discount = new Discount();
-		///   var discount = discount.GetDiscount(_dataViewMode,  discountId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.Discount GetDiscount(int discountId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.Discount> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.DiscountClient.GetDiscountClient(_dataViewMode,  discountId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of a single discount.
+		/// 
 		/// </summary>
-		/// <param name="discountId">discountId parameter description DOCUMENT_HERE </param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="discountId">Unique identifier of the discount. System-supplied and read-only.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.Discount"/>
 		/// </returns>
@@ -187,44 +113,21 @@ public virtual Mozu.Api.Contracts.ProductAdmin.Discount GetDiscount(int discount
 		///   var discount = await discount.GetDiscountAsync(_dataViewMode,  discountId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.Discount> GetDiscountAsync(int discountId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.Discount> GetDiscountAsync(int discountId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.Discount> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.DiscountClient.GetDiscountClient(_dataViewMode,  discountId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Generates a random code for a coupon.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// string
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var discount = new Discount();
-		///   var string = discount.GenerateRandomCoupon( responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual string GenerateRandomCoupon(string responseFields =  null)
-		{
-			MozuClient<string> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.DiscountClient.GenerateRandomCouponClient( responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Generates a random code for a coupon.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// string
 		/// </returns>
@@ -234,46 +137,22 @@ public virtual string GenerateRandomCoupon(string responseFields =  null)
 		///   var string = await discount.GenerateRandomCouponAsync( responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<string> GenerateRandomCouponAsync(string responseFields =  null)
+		public virtual async Task<string> GenerateRandomCouponAsync(string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<string> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.DiscountClient.GenerateRandomCouponClient( responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Creates a new discount or coupon to apply to a product, category, order, or shipping.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="discount">Name of the discount added and applied to a shopping cart and order for a shopper's purchase. </param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.Discount"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var discount = new Discount();
-		///   var discount = discount.CreateDiscount( discount,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.Discount CreateDiscount(Mozu.Api.Contracts.ProductAdmin.Discount discount, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.Discount> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.DiscountClient.CreateDiscountClient( discount,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Creates a new discount or coupon to apply to a product, category, order, or shipping.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="discount">Name of the discount added and applied to a shopping cart and order for a shopper's purchase. </param>
+		/// <param name="responseFields"></param>
+		/// <param name="discount">Properties of the discount to create. You must specify the discount name, amount type, start date, and target.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.Discount"/>
 		/// </returns>
@@ -283,48 +162,23 @@ public virtual Mozu.Api.Contracts.ProductAdmin.Discount CreateDiscount(Mozu.Api.
 		///   var discount = await discount.CreateDiscountAsync( discount,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.Discount> CreateDiscountAsync(Mozu.Api.Contracts.ProductAdmin.Discount discount, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.Discount> CreateDiscountAsync(Mozu.Api.Contracts.ProductAdmin.Discount discount, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.Discount> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.DiscountClient.CreateDiscountClient( discount,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates the localizable content for the specified discount or renames the discount without modifying its other properties.
-		/// </summary>
-		/// <param name="discountId">discountId parameter description DOCUMENT_HERE </param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="content">The container for the language-specific name of the discount. A container exists for each supported language (LocaleCode). This parameter enables you to display the discount name in multiple languages yet manage it as a single discount internally.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.DiscountLocalizedContent"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var discount = new Discount();
-		///   var discountLocalizedContent = discount.UpdateDiscountContent( content,  discountId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.DiscountLocalizedContent UpdateDiscountContent(Mozu.Api.Contracts.ProductAdmin.DiscountLocalizedContent content, int discountId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.DiscountLocalizedContent> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.DiscountClient.UpdateDiscountContentClient( content,  discountId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates the localizable content for the specified discount or renames the discount without modifying its other properties.
+		/// 
 		/// </summary>
-		/// <param name="discountId">discountId parameter description DOCUMENT_HERE </param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="content">The container for the language-specific name of the discount. A container exists for each supported language (LocaleCode). This parameter enables you to display the discount name in multiple languages yet manage it as a single discount internally.</param>
+		/// <param name="discountId">Unique identifier of the discount. System-supplied and read-only.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="content">The discount content to update, including the discount name.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.DiscountLocalizedContent"/>
 		/// </returns>
@@ -334,48 +188,23 @@ public virtual Mozu.Api.Contracts.ProductAdmin.DiscountLocalizedContent UpdateDi
 		///   var discountLocalizedContent = await discount.UpdateDiscountContentAsync( content,  discountId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.DiscountLocalizedContent> UpdateDiscountContentAsync(Mozu.Api.Contracts.ProductAdmin.DiscountLocalizedContent content, int discountId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.DiscountLocalizedContent> UpdateDiscountContentAsync(Mozu.Api.Contracts.ProductAdmin.DiscountLocalizedContent content, int discountId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.DiscountLocalizedContent> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.DiscountClient.UpdateDiscountContentClient( content,  discountId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates one or more properties of the specified discount.
-		/// </summary>
-		/// <param name="discountId">discountId parameter description DOCUMENT_HERE </param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="discount">Name of the discount added and applied to a shopping cart and order for a shopper's purchase. </param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.Discount"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var discount = new Discount();
-		///   var discount = discount.UpdateDiscount( discount,  discountId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.Discount UpdateDiscount(Mozu.Api.Contracts.ProductAdmin.Discount discount, int discountId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.Discount> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.DiscountClient.UpdateDiscountClient( discount,  discountId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates one or more properties of the specified discount.
+		/// 
 		/// </summary>
-		/// <param name="discountId">discountId parameter description DOCUMENT_HERE </param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="discount">Name of the discount added and applied to a shopping cart and order for a shopper's purchase. </param>
+		/// <param name="discountId">Unique identifier of the discount to update.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="discount">Properties of the discount to update.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.Discount"/>
 		/// </returns>
@@ -385,43 +214,21 @@ public virtual Mozu.Api.Contracts.ProductAdmin.Discount UpdateDiscount(Mozu.Api.
 		///   var discount = await discount.UpdateDiscountAsync( discount,  discountId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.Discount> UpdateDiscountAsync(Mozu.Api.Contracts.ProductAdmin.Discount discount, int discountId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.Discount> UpdateDiscountAsync(Mozu.Api.Contracts.ProductAdmin.Discount discount, int discountId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.Discount> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.DiscountClient.UpdateDiscountClient( discount,  discountId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Deletes a discount specified by its discount ID.
-		/// </summary>
-		/// <param name="discountId">discountId parameter description DOCUMENT_HERE </param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var discount = new Discount();
-		///   discount.DeleteDiscount( discountId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteDiscount(int discountId)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.DiscountClient.DeleteDiscountClient( discountId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes a discount specified by its discount ID.
+		/// 
 		/// </summary>
-		/// <param name="discountId">discountId parameter description DOCUMENT_HERE </param>
+		/// <param name="discountId">Unique identifier of the discount. System-supplied and read-only.</param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -431,12 +238,12 @@ public virtual void DeleteDiscount(int discountId)
 		///   await discount.DeleteDiscountAsync( discountId);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteDiscountAsync(int discountId)
+		public virtual async Task DeleteDiscountAsync(int discountId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.DiscountClient.DeleteDiscountClient( discountId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/Catalog/Admin/DiscountSettingsResource.cs b/Mozu.Api/Resources/Commerce/Catalog/Admin/DiscountSettingsResource.cs
new file mode 100755
index 00000000..a9028f62
--- /dev/null
+++ b/Mozu.Api/Resources/Commerce/Catalog/Admin/DiscountSettingsResource.cs
@@ -0,0 +1,106 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using Mozu.Api.Security;
+using System.Threading.Tasks;
+using Newtonsoft.Json.Linq;
+using System.Threading;
+
+namespace Mozu.Api.Resources.Commerce.Catalog.Admin
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	public partial class DiscountSettingsResource  	{
+		///
+		/// <see cref="Mozu.Api.ApiContext"/>
+		///
+		private readonly IApiContext _apiContext;
+
+		private readonly DataViewMode _dataViewMode;
+		
+		public DiscountSettingsResource(IApiContext apiContext) 
+		{
+			_apiContext = apiContext;
+			_dataViewMode = DataViewMode.Live;
+		}
+
+		public DiscountSettingsResource CloneWithApiContext(Action<IApiContext> contextModification) 
+		{
+			return new DiscountSettingsResource(_apiContext.CloneWith(contextModification), _dataViewMode);
+		}
+
+		public DiscountSettingsResource(IApiContext apiContext, DataViewMode dataViewMode) 
+		{
+			_apiContext = apiContext;
+			_dataViewMode = dataViewMode;
+		}
+				
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="catalogId"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
+		/// <returns>
+		/// <see cref="Mozu.Api.Contracts.ProductAdmin.DiscountSettings"/>
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var discountsettings = new DiscountSettings();
+		///   var discountSettings = await discountsettings.GetDiscountSettingsAsync(_dataViewMode,  catalogId,  responseFields);
+		/// </code>
+		/// </example>
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.DiscountSettings> GetDiscountSettingsAsync(int catalogId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
+		{
+			MozuClient<Mozu.Api.Contracts.ProductAdmin.DiscountSettings> response;
+			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.DiscountSettingsClient.GetDiscountSettingsClient(_dataViewMode,  catalogId,  responseFields);
+			client.WithContext(_apiContext);
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+			return await response.ResultAsync();
+
+		}
+
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="catalogId"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
+		/// <param name="discountSettings"></param>
+		/// <returns>
+		/// <see cref="Mozu.Api.Contracts.ProductAdmin.DiscountSettings"/>
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var discountsettings = new DiscountSettings();
+		///   var discountSettings = await discountsettings.UpdateDiscountSettingsAsync( discountSettings,  catalogId,  responseFields);
+		/// </code>
+		/// </example>
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.DiscountSettings> UpdateDiscountSettingsAsync(Mozu.Api.Contracts.ProductAdmin.DiscountSettings discountSettings, int catalogId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
+		{
+			MozuClient<Mozu.Api.Contracts.ProductAdmin.DiscountSettings> response;
+			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.DiscountSettingsClient.UpdateDiscountSettingsClient( discountSettings,  catalogId,  responseFields);
+			client.WithContext(_apiContext);
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+			return await response.ResultAsync();
+
+		}
+
+
+	}
+
+}
+
+
diff --git a/Mozu.Api/Resources/Commerce/Catalog/Admin/Discounts/DiscountTargetResource.cs b/Mozu.Api/Resources/Commerce/Catalog/Admin/Discounts/DiscountTargetResource.cs
old mode 100644
new mode 100755
index 11e60e72..36fabea1
--- a/Mozu.Api/Resources/Commerce/Catalog/Admin/Discounts/DiscountTargetResource.cs
+++ b/Mozu.Api/Resources/Commerce/Catalog/Admin/Discounts/DiscountTargetResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Catalog.Admin.Discounts
 {
@@ -44,36 +45,12 @@ public DiscountTargetResource(IApiContext apiContext, DataViewMode dataViewMode)
 			_dataViewMode = dataViewMode;
 		}
 				
-		/// <summary>
-		/// Retrieves the discount target, that is which products, categories, or shipping methods are eligible for the discount.
-		/// </summary>
-		/// <param name="discountId">discountId parameter description DOCUMENT_HERE </param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.DiscountTarget"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var discounttarget = new DiscountTarget();
-		///   var discountTarget = discounttarget.GetDiscountTarget(_dataViewMode,  discountId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.DiscountTarget GetDiscountTarget(int discountId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.DiscountTarget> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Discounts.DiscountTargetClient.GetDiscountTargetClient(_dataViewMode,  discountId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the discount target, that is which products, categories, or shipping methods are eligible for the discount.
+		/// 
 		/// </summary>
-		/// <param name="discountId">discountId parameter description DOCUMENT_HERE </param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="discountId">Unique identifier of the discount. System-supplied and read only.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.DiscountTarget"/>
 		/// </returns>
@@ -83,48 +60,23 @@ public virtual Mozu.Api.Contracts.ProductAdmin.DiscountTarget GetDiscountTarget(
 		///   var discountTarget = await discounttarget.GetDiscountTargetAsync(_dataViewMode,  discountId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.DiscountTarget> GetDiscountTargetAsync(int discountId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.DiscountTarget> GetDiscountTargetAsync(int discountId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.DiscountTarget> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Discounts.DiscountTargetClient.GetDiscountTargetClient(_dataViewMode,  discountId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Modifies properties of the discount target, for example, the dollar amount, or precentage off the price.
-		/// </summary>
-		/// <param name="discountId">discountId parameter description DOCUMENT_HERE </param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="discountTarget">Properties of the target to which the discount applies, such as the type of discount and which products, categories, or shipping methods are eligible for the discount and the properties of this discount target.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.DiscountTarget"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var discounttarget = new DiscountTarget();
-		///   var discountTarget = discounttarget.UpdateDiscountTarget( discountTarget,  discountId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.DiscountTarget UpdateDiscountTarget(Mozu.Api.Contracts.ProductAdmin.DiscountTarget discountTarget, int discountId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.DiscountTarget> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Discounts.DiscountTargetClient.UpdateDiscountTargetClient( discountTarget,  discountId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Modifies properties of the discount target, for example, the dollar amount, or precentage off the price.
+		/// 
 		/// </summary>
-		/// <param name="discountId">discountId parameter description DOCUMENT_HERE </param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="discountTarget">Properties of the target to which the discount applies, such as the type of discount and which products, categories, or shipping methods are eligible for the discount and the properties of this discount target.</param>
+		/// <param name="discountId">Unique identifier of the discount. System-supplied and read-only.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="discountTarget">Properties of the discount target to modify. Required properties: Target.Type. Any unspecified properties are set to null and boolean variables to false.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.DiscountTarget"/>
 		/// </returns>
@@ -134,12 +86,12 @@ public virtual Mozu.Api.Contracts.ProductAdmin.DiscountTarget UpdateDiscountTarg
 		///   var discountTarget = await discounttarget.UpdateDiscountTargetAsync( discountTarget,  discountId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.DiscountTarget> UpdateDiscountTargetAsync(Mozu.Api.Contracts.ProductAdmin.DiscountTarget discountTarget, int discountId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.DiscountTarget> UpdateDiscountTargetAsync(Mozu.Api.Contracts.ProductAdmin.DiscountTarget discountTarget, int discountId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.DiscountTarget> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Discounts.DiscountTargetClient.UpdateDiscountTargetClient( discountTarget,  discountId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
diff --git a/Mozu.Api/Resources/Commerce/Catalog/Admin/FacetResource.cs b/Mozu.Api/Resources/Commerce/Catalog/Admin/FacetResource.cs
old mode 100644
new mode 100755
index f7f98719..c2427bf7
--- a/Mozu.Api/Resources/Commerce/Catalog/Admin/FacetResource.cs
+++ b/Mozu.Api/Resources/Commerce/Catalog/Admin/FacetResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Catalog.Admin
 {
@@ -37,37 +38,12 @@ public FacetResource CloneWithApiContext(Action<IApiContext> contextModification
 		}
 
 				
-		/// <summary>
-		/// Retrieves a facet specified by its unique identifier and displays its properties.
-		/// </summary>
-		/// <param name="facetId">Unique identifier of the facet to retrieve.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="validate">Validates that the product category associated with a facet is active. System-supplied and read only.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.Facet"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var facet = new Facet();
-		///   var facet = facet.GetFacet( facetId,  validate,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.Facet GetFacet(int facetId, bool? validate =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.Facet> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.FacetClient.GetFacetClient( facetId,  validate,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a facet specified by its unique identifier and displays its properties.
+		/// 
 		/// </summary>
 		/// <param name="facetId">Unique identifier of the facet to retrieve.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="validate">Validates that the product category associated with a facet is active. System-supplied and read only.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.Facet"/>
@@ -78,49 +54,23 @@ public virtual Mozu.Api.Contracts.ProductAdmin.Facet GetFacet(int facetId, bool?
 		///   var facet = await facet.GetFacetAsync( facetId,  validate,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.Facet> GetFacetAsync(int facetId, bool? validate =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.Facet> GetFacetAsync(int facetId, bool? validate =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.Facet> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.FacetClient.GetFacetClient( facetId,  validate,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves a list of the facets defined for the specified category.
-		/// </summary>
-		/// <param name="categoryId">Unique identifier of the category to modify.</param>
-		/// <param name="includeAvailable">If true, returns a list of the attributes and categories associated with a product type that have not been defined as a facet for the category.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="validate">Validates that the product category associated with a facet is active. System-supplied and read only.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.FacetSet"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var facet = new Facet();
-		///   var facetSet = facet.GetFacetCategoryList( categoryId,  includeAvailable,  validate,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.FacetSet GetFacetCategoryList(int categoryId, bool? includeAvailable =  null, bool? validate =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.FacetSet> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.FacetClient.GetFacetCategoryListClient( categoryId,  includeAvailable,  validate,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of the facets defined for the specified category.
+		/// 
 		/// </summary>
-		/// <param name="categoryId">Unique identifier of the category to modify.</param>
+		/// <param name="categoryId">Unique identifier of the category associated with the facets to retrieve.</param>
 		/// <param name="includeAvailable">If true, returns a list of the attributes and categories associated with a product type that have not been defined as a facet for the category.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="validate">Validates that the product category associated with a facet is active. System-supplied and read only.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.FacetSet"/>
@@ -131,46 +81,22 @@ public virtual Mozu.Api.Contracts.ProductAdmin.FacetSet GetFacetCategoryList(int
 		///   var facetSet = await facet.GetFacetCategoryListAsync( categoryId,  includeAvailable,  validate,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.FacetSet> GetFacetCategoryListAsync(int categoryId, bool? includeAvailable =  null, bool? validate =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.FacetSet> GetFacetCategoryListAsync(int categoryId, bool? includeAvailable =  null, bool? validate =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.FacetSet> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.FacetClient.GetFacetCategoryListClient( categoryId,  includeAvailable,  validate,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Creates a new category, price, or attribute facet. Define the category or attribute source to use for the facet values.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="facet">Properties of the facet used to retrieve documents.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.Facet"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var facet = new Facet();
-		///   var facet = facet.AddFacet( facet,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.Facet AddFacet(Mozu.Api.Contracts.ProductAdmin.Facet facet, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.Facet> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.FacetClient.AddFacetClient( facet,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Creates a new category, price, or attribute facet. Define the category or attribute source to use for the facet values.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="facet">Properties of the facet used to retrieve documents.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="facet">Properties of the new facet to create. You must specify the source, type, and category.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.Facet"/>
 		/// </returns>
@@ -180,48 +106,23 @@ public virtual Mozu.Api.Contracts.ProductAdmin.Facet AddFacet(Mozu.Api.Contracts
 		///   var facet = await facet.AddFacetAsync( facet,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.Facet> AddFacetAsync(Mozu.Api.Contracts.ProductAdmin.Facet facet, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.Facet> AddFacetAsync(Mozu.Api.Contracts.ProductAdmin.Facet facet, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.Facet> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.FacetClient.AddFacetClient( facet,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Modifies one or more properties of a defined facet.
-		/// </summary>
-		/// <param name="facetId">Unique identifier of the facet to retrieve.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="facet">Properties of the facet used to retrieve documents.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.Facet"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var facet = new Facet();
-		///   var facet = facet.UpdateFacet( facet,  facetId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.Facet UpdateFacet(Mozu.Api.Contracts.ProductAdmin.Facet facet, int facetId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.Facet> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.FacetClient.UpdateFacetClient( facet,  facetId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Modifies one or more properties of a defined facet.
+		/// 
 		/// </summary>
-		/// <param name="facetId">Unique identifier of the facet to retrieve.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="facet">Properties of the facet used to retrieve documents.</param>
+		/// <param name="facetId">Unique identifier of the facet to modify.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="facet">Properties of the defined facet to modify.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.Facet"/>
 		/// </returns>
@@ -231,43 +132,21 @@ public virtual Mozu.Api.Contracts.ProductAdmin.Facet UpdateFacet(Mozu.Api.Contra
 		///   var facet = await facet.UpdateFacetAsync( facet,  facetId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.Facet> UpdateFacetAsync(Mozu.Api.Contracts.ProductAdmin.Facet facet, int facetId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.Facet> UpdateFacetAsync(Mozu.Api.Contracts.ProductAdmin.Facet facet, int facetId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.Facet> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.FacetClient.UpdateFacetClient( facet,  facetId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Deletes the facet specified by its unique identifier.
-		/// </summary>
-		/// <param name="facetId">Unique identifier of the facet to retrieve.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var facet = new Facet();
-		///   facet.DeleteFacetById( facetId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteFacetById(int facetId)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.FacetClient.DeleteFacetByIdClient( facetId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes the facet specified by its unique identifier.
+		/// 
 		/// </summary>
-		/// <param name="facetId">Unique identifier of the facet to retrieve.</param>
+		/// <param name="facetId">Unique identifier of the facet to delete.</param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -277,12 +156,12 @@ public virtual void DeleteFacetById(int facetId)
 		///   await facet.DeleteFacetByIdAsync( facetId);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteFacetByIdAsync(int facetId)
+		public virtual async Task DeleteFacetByIdAsync(int facetId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.FacetClient.DeleteFacetByIdClient( facetId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/Catalog/Admin/LocationInventoryResource.cs b/Mozu.Api/Resources/Commerce/Catalog/Admin/LocationInventoryResource.cs
old mode 100644
new mode 100755
index 36d26eac..1be3af68
--- a/Mozu.Api/Resources/Commerce/Catalog/Admin/LocationInventoryResource.cs
+++ b/Mozu.Api/Resources/Commerce/Catalog/Admin/LocationInventoryResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Catalog.Admin
 {
@@ -44,39 +45,13 @@ public LocationInventoryResource(IApiContext apiContext, DataViewMode dataViewMo
 			_dataViewMode = dataViewMode;
 		}
 				
-		/// <summary>
-		/// Retrieves the details of a product's active inventory at the location specified in the request.
-		/// </summary>
-		/// <param name="locationCode">The unique, user-defined code that identifies a location. </param>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.LocationInventory"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var locationinventory = new LocationInventory();
-		///   var locationInventory = locationinventory.GetLocationInventory(_dataViewMode,  locationCode,  productCode,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.LocationInventory GetLocationInventory(string locationCode, string productCode, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.LocationInventory> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.LocationInventoryClient.GetLocationInventoryClient(_dataViewMode,  locationCode,  productCode,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of a product's active inventory at the location specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="locationCode">The unique, user-defined code that identifies a location. </param>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="locationCode">User-defined code that uniquely identifies the location.</param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.LocationInventory"/>
@@ -87,57 +62,27 @@ public virtual Mozu.Api.Contracts.ProductAdmin.LocationInventory GetLocationInve
 		///   var locationInventory = await locationinventory.GetLocationInventoryAsync(_dataViewMode,  locationCode,  productCode,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.LocationInventory> GetLocationInventoryAsync(string locationCode, string productCode, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.LocationInventory> GetLocationInventoryAsync(string locationCode, string productCode, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.LocationInventory> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.LocationInventoryClient.GetLocationInventoryClient(_dataViewMode,  locationCode,  productCode,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves a list of all product inventory definitions for the location code specified in the request.
-		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="filterFunctions">Functions that optimize commonly used filters for efficiency.For the  operation, you have access to the  filter function. For example, use  to filter only for product inventory that is currently active.</param>
-		/// <param name="locationCode">The unique, user-defined code that identifies a location. </param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.LocationInventoryCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var locationinventory = new LocationInventory();
-		///   var locationInventoryCollection = locationinventory.GetLocationInventories(_dataViewMode,  locationCode,  startIndex,  pageSize,  sortBy,  filter,  filterFunctions,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.LocationInventoryCollection GetLocationInventories(string locationCode, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string filterFunctions =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.LocationInventoryCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.LocationInventoryClient.GetLocationInventoriesClient(_dataViewMode,  locationCode,  startIndex,  pageSize,  sortBy,  filter,  filterFunctions,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of all product inventory definitions for the location code specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="filterFunctions">Functions that optimize commonly used filters for efficiency.For the  operation, you have access to the  filter function. For example, use  to filter only for product inventory that is currently active.</param>
-		/// <param name="locationCode">The unique, user-defined code that identifies a location. </param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+		/// <param name="filter"></param>
+		/// <param name="filterFunctions"></param>
+		/// <param name="locationCode"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.LocationInventoryCollection"/>
@@ -148,50 +93,24 @@ public virtual Mozu.Api.Contracts.ProductAdmin.LocationInventoryCollection GetLo
 		///   var locationInventoryCollection = await locationinventory.GetLocationInventoriesAsync(_dataViewMode,  locationCode,  startIndex,  pageSize,  sortBy,  filter,  filterFunctions,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.LocationInventoryCollection> GetLocationInventoriesAsync(string locationCode, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string filterFunctions =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.LocationInventoryCollection> GetLocationInventoriesAsync(string locationCode, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string filterFunctions =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.LocationInventoryCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.LocationInventoryClient.GetLocationInventoriesClient(_dataViewMode,  locationCode,  startIndex,  pageSize,  sortBy,  filter,  filterFunctions,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Creates an array of product inventory definitions for the location specified in the request. When adding a new inventory definition, you must specify the productCode and stockOnHand value in each array you define. All other properties are system-supplied and read only.
-		/// </summary>
-		/// <param name="locationCode">The unique, user-defined code that identifies a location. </param>
-		/// <param name="performUpserts">Query string parameter lets the service perform an update for a new or existing record. When run, the update occurs without throwing a conflict exception that the record exists. If true, the updates completes regardless of the record currently existing. By default, if no value is specified, the service assumes this value is false.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="locationInventoryList">Properties of an inventory definition that defines the level of inventory for a specific product at a given location.</param>
-		/// <returns>
-		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.LocationInventory"/>}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var locationinventory = new LocationInventory();
-		///   var locationInventory = locationinventory.AddLocationInventory(_dataViewMode,  locationInventoryList,  locationCode,  performUpserts);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<Mozu.Api.Contracts.ProductAdmin.LocationInventory> AddLocationInventory(List<Mozu.Api.Contracts.ProductAdmin.LocationInventory> locationInventoryList, string locationCode, bool? performUpserts =  null)
-		{
-			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.LocationInventory>> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.LocationInventoryClient.AddLocationInventoryClient(_dataViewMode,  locationInventoryList,  locationCode,  performUpserts);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Creates an array of product inventory definitions for the location specified in the request. When adding a new inventory definition, you must specify the productCode and stockOnHand value in each array you define. All other properties are system-supplied and read only.
+		/// 
 		/// </summary>
-		/// <param name="locationCode">The unique, user-defined code that identifies a location. </param>
-		/// <param name="performUpserts">Query string parameter lets the service perform an update for a new or existing record. When run, the update occurs without throwing a conflict exception that the record exists. If true, the updates completes regardless of the record currently existing. By default, if no value is specified, the service assumes this value is false.</param>
+		/// <param name="locationCode">User-defined code that uniquely identifies the location.</param>
+		/// <param name="performUpserts"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="locationInventoryList">Properties of an inventory definition that defines the level of inventory for a specific product at a given location.</param>
+		/// <param name="locationInventoryList">Array list of product inventory definitions for all associated locations. For each location inventory in the list, define the productCode and stockOnHand values.</param>
 		/// <returns>
 		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.LocationInventory"/>}
 		/// </returns>
@@ -201,48 +120,23 @@ public virtual Mozu.Api.Contracts.ProductAdmin.LocationInventoryCollection GetLo
 		///   var locationInventory = await locationinventory.AddLocationInventoryAsync(_dataViewMode,  locationInventoryList,  locationCode,  performUpserts);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.LocationInventory>> AddLocationInventoryAsync(List<Mozu.Api.Contracts.ProductAdmin.LocationInventory> locationInventoryList, string locationCode, bool? performUpserts =  null)
+		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.LocationInventory>> AddLocationInventoryAsync(List<Mozu.Api.Contracts.ProductAdmin.LocationInventory> locationInventoryList, string locationCode, bool? performUpserts =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.LocationInventory>> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.LocationInventoryClient.AddLocationInventoryClient(_dataViewMode,  locationInventoryList,  locationCode,  performUpserts);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates the active stock on hand inventory of products for the location code specified in the request.
-		/// </summary>
-		/// <param name="locationCode">The unique, user-defined code that identifies a location. </param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="locationInventoryAdjustments">Properties of an adjustment to the active product inventory of a specific location.</param>
-		/// <returns>
-		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.LocationInventory"/>}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var locationinventory = new LocationInventory();
-		///   var locationInventory = locationinventory.UpdateLocationInventory(_dataViewMode,  locationInventoryAdjustments,  locationCode);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<Mozu.Api.Contracts.ProductAdmin.LocationInventory> UpdateLocationInventory(List<Mozu.Api.Contracts.ProductAdmin.LocationInventoryAdjustment> locationInventoryAdjustments, string locationCode)
-		{
-			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.LocationInventory>> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.LocationInventoryClient.UpdateLocationInventoryClient(_dataViewMode,  locationInventoryAdjustments,  locationCode);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates the active stock on hand inventory of products for the location code specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="locationCode">The unique, user-defined code that identifies a location. </param>
+		/// <param name="locationCode">User-defined code that uniquely identifies the location.</param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="locationInventoryAdjustments">Properties of an adjustment to the active product inventory of a specific location.</param>
+		/// <param name="locationInventoryAdjustments">Properties of the inventory adjustments to perform for the specified location.</param>
 		/// <returns>
 		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.LocationInventory"/>}
 		/// </returns>
@@ -252,46 +146,22 @@ public virtual Mozu.Api.Contracts.ProductAdmin.LocationInventoryCollection GetLo
 		///   var locationInventory = await locationinventory.UpdateLocationInventoryAsync(_dataViewMode,  locationInventoryAdjustments,  locationCode);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.LocationInventory>> UpdateLocationInventoryAsync(List<Mozu.Api.Contracts.ProductAdmin.LocationInventoryAdjustment> locationInventoryAdjustments, string locationCode)
+		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.LocationInventory>> UpdateLocationInventoryAsync(List<Mozu.Api.Contracts.ProductAdmin.LocationInventoryAdjustment> locationInventoryAdjustments, string locationCode, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.LocationInventory>> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.LocationInventoryClient.UpdateLocationInventoryClient(_dataViewMode,  locationInventoryAdjustments,  locationCode);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Deletes the product code inventory definition for the location specified in the request.
-		/// </summary>
-		/// <param name="locationCode">The unique, user-defined code that identifies a location. </param>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var locationinventory = new LocationInventory();
-		///   locationinventory.DeleteLocationInventory(_dataViewMode,  locationCode,  productCode);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteLocationInventory(string locationCode, string productCode)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.LocationInventoryClient.DeleteLocationInventoryClient(_dataViewMode,  locationCode,  productCode);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes the product code inventory definition for the location specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="locationCode">The unique, user-defined code that identifies a location. </param>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
+		/// <param name="locationCode">User-defined code that uniquely identifies the location.</param>
+		/// <param name="productCode"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		/// 
@@ -302,12 +172,12 @@ public virtual void DeleteLocationInventory(string locationCode, string productC
 		///   await locationinventory.DeleteLocationInventoryAsync(_dataViewMode,  locationCode,  productCode);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteLocationInventoryAsync(string locationCode, string productCode)
+		public virtual async Task DeleteLocationInventoryAsync(string locationCode, string productCode, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.LocationInventoryClient.DeleteLocationInventoryClient(_dataViewMode,  locationCode,  productCode);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/Catalog/Admin/MasterCatalogResource.cs b/Mozu.Api/Resources/Commerce/Catalog/Admin/MasterCatalogResource.cs
old mode 100644
new mode 100755
index a806351b..ac7fdc8e
--- a/Mozu.Api/Resources/Commerce/Catalog/Admin/MasterCatalogResource.cs
+++ b/Mozu.Api/Resources/Commerce/Catalog/Admin/MasterCatalogResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Catalog.Admin
 {
@@ -37,34 +38,11 @@ public MasterCatalogResource CloneWithApiContext(Action<IApiContext> contextModi
 		}
 
 				
-		/// <summary>
-		/// Retrieve the details of all master catalog associated with a tenant.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.MasterCatalogCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var mastercatalog = new MasterCatalog();
-		///   var masterCatalogCollection = mastercatalog.GetMasterCatalogs( responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.MasterCatalogCollection GetMasterCatalogs(string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.MasterCatalogCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.MasterCatalogClient.GetMasterCatalogsClient( responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieve the details of all master catalog associated with a tenant.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.MasterCatalogCollection"/>
 		/// </returns>
@@ -74,46 +52,22 @@ public virtual Mozu.Api.Contracts.ProductAdmin.MasterCatalogCollection GetMaster
 		///   var masterCatalogCollection = await mastercatalog.GetMasterCatalogsAsync( responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.MasterCatalogCollection> GetMasterCatalogsAsync(string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.MasterCatalogCollection> GetMasterCatalogsAsync(string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.MasterCatalogCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.MasterCatalogClient.GetMasterCatalogsClient( responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieve the details of the master catalog specified in the request.
-		/// </summary>
-		/// <param name="masterCatalogId">The unique identifier of the master catalog associated with the entity.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.MasterCatalog"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var mastercatalog = new MasterCatalog();
-		///   var masterCatalog = mastercatalog.GetMasterCatalog( masterCatalogId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.MasterCatalog GetMasterCatalog(int masterCatalogId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.MasterCatalog> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.MasterCatalogClient.GetMasterCatalogClient( masterCatalogId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieve the details of the master catalog specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="masterCatalogId">The unique identifier of the master catalog associated with the entity.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="masterCatalogId"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.MasterCatalog"/>
 		/// </returns>
@@ -123,48 +77,23 @@ public virtual Mozu.Api.Contracts.ProductAdmin.MasterCatalog GetMasterCatalog(in
 		///   var masterCatalog = await mastercatalog.GetMasterCatalogAsync( masterCatalogId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.MasterCatalog> GetMasterCatalogAsync(int masterCatalogId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.MasterCatalog> GetMasterCatalogAsync(int masterCatalogId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.MasterCatalog> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.MasterCatalogClient.GetMasterCatalogClient( masterCatalogId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates the product publishing mode for the master catalog specified in the request.
-		/// </summary>
-		/// <param name="masterCatalogId"></param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="masterCatalog">Properties of a master product catalog defined for a tenant. All catalogs and sites associated with a master catalog share product definitions.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.MasterCatalog"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var mastercatalog = new MasterCatalog();
-		///   var masterCatalog = mastercatalog.UpdateMasterCatalog( masterCatalog,  masterCatalogId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.MasterCatalog UpdateMasterCatalog(Mozu.Api.Contracts.ProductAdmin.MasterCatalog masterCatalog, int masterCatalogId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.MasterCatalog> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.MasterCatalogClient.UpdateMasterCatalogClient( masterCatalog,  masterCatalogId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates the product publishing mode for the master catalog specified in the request.
+		/// 
 		/// </summary>
 		/// <param name="masterCatalogId"></param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="masterCatalog">Properties of a master product catalog defined for a tenant. All catalogs and sites associated with a master catalog share product definitions.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="masterCatalog">Properties of the master catalog to update, which consists of the product publishing mode. Possible values are "Pending" which saves product updates in draft mode until they are published, and "Live" which publishes all product changes immediately.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.MasterCatalog"/>
 		/// </returns>
@@ -174,12 +103,12 @@ public virtual Mozu.Api.Contracts.ProductAdmin.MasterCatalog UpdateMasterCatalog
 		///   var masterCatalog = await mastercatalog.UpdateMasterCatalogAsync( masterCatalog,  masterCatalogId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.MasterCatalog> UpdateMasterCatalogAsync(Mozu.Api.Contracts.ProductAdmin.MasterCatalog masterCatalog, int masterCatalogId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.MasterCatalog> UpdateMasterCatalogAsync(Mozu.Api.Contracts.ProductAdmin.MasterCatalog masterCatalog, int masterCatalogId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.MasterCatalog> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.MasterCatalogClient.UpdateMasterCatalogClient( masterCatalog,  masterCatalogId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
diff --git a/Mozu.Api/Resources/Commerce/Catalog/Admin/PriceListResource.cs b/Mozu.Api/Resources/Commerce/Catalog/Admin/PriceListResource.cs
old mode 100644
new mode 100755
index 2eaa3076..4dea0bf2
--- a/Mozu.Api/Resources/Commerce/Catalog/Admin/PriceListResource.cs
+++ b/Mozu.Api/Resources/Commerce/Catalog/Admin/PriceListResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Catalog.Admin
 {
 	/// <summary>
-	/// Use the Price Lists resource to view and create price lists. You can use price lists to override the catalog pricing of products for specific customer segments and/or sites. You can override products' list price, sale price, advanced pricing information such as MSRP, cost, MAP, and the catalog price of any extras associated with the product in a price list. You can also restrict discounts from applying to the overridden product pricing in a price list. Refer to [Price Lists](../../../guides/catalog/price-lists.htm) in the Guides section for more information about price lists.
+	/// 
 	/// </summary>
 	public partial class PriceListResource  	{
 		///
@@ -37,42 +38,15 @@ public PriceListResource CloneWithApiContext(Action<IApiContext> contextModifica
 		}
 
 				
-		/// <summary>
-		/// Retrieves a list of price lists according to any specified facets, filter criteria, and sort options.
-		/// </summary>
-		/// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.PriceListCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var pricelist = new PriceList();
-		///   var priceListCollection = pricelist.GetPriceLists( startIndex,  pageSize,  sortBy,  filter,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.PriceListCollection GetPriceLists(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.PriceListCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.PriceListClient.GetPriceListsClient( startIndex,  pageSize,  sortBy,  filter,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of price lists according to any specified facets, filter criteria, and sort options.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.PriceListCollection"/>
 		/// </returns>
@@ -82,46 +56,22 @@ public virtual Mozu.Api.Contracts.ProductAdmin.PriceListCollection GetPriceLists
 		///   var priceListCollection = await pricelist.GetPriceListsAsync( startIndex,  pageSize,  sortBy,  filter,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.PriceListCollection> GetPriceListsAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.PriceListCollection> GetPriceListsAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.PriceListCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.PriceListClient.GetPriceListsClient( startIndex,  pageSize,  sortBy,  filter,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the details of the specified price list.
-		/// </summary>
-		/// <param name="priceListCode">The unique, user-defined code of the price list.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.PriceList"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var pricelist = new PriceList();
-		///   var priceList = pricelist.GetPriceList( priceListCode,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.PriceList GetPriceList(string priceListCode, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.PriceList> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.PriceListClient.GetPriceListClient( priceListCode,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of the specified price list.
+		/// 
 		/// </summary>
-		/// <param name="priceListCode">The unique, user-defined code of the price list.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="priceListCode"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.PriceList"/>
 		/// </returns>
@@ -131,46 +81,22 @@ public virtual Mozu.Api.Contracts.ProductAdmin.PriceList GetPriceList(string pri
 		///   var priceList = await pricelist.GetPriceListAsync( priceListCode,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.PriceList> GetPriceListAsync(string priceListCode, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.PriceList> GetPriceListAsync(string priceListCode, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.PriceList> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.PriceListClient.GetPriceListClient( priceListCode,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Adds a new price list to the tenant.
-		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="priceList">The details of the new price list.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.PriceList"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var pricelist = new PriceList();
-		///   var priceList = pricelist.AddPriceList( priceList,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.PriceList AddPriceList(Mozu.Api.Contracts.ProductAdmin.PriceList priceList, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.PriceList> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.PriceListClient.AddPriceListClient( priceList,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Adds a new price list to the tenant.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="priceList">The details of the new price list.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="priceList"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.PriceList"/>
 		/// </returns>
@@ -180,46 +106,22 @@ public virtual Mozu.Api.Contracts.ProductAdmin.PriceList AddPriceList(Mozu.Api.C
 		///   var priceList = await pricelist.AddPriceListAsync( priceList,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.PriceList> AddPriceListAsync(Mozu.Api.Contracts.ProductAdmin.PriceList priceList, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.PriceList> AddPriceListAsync(Mozu.Api.Contracts.ProductAdmin.PriceList priceList, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.PriceList> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.PriceListClient.AddPriceListClient( priceList,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Adds up to 5000 new price list entries in bulk.
-		/// </summary>
-		/// <param name="invalidateCache">Disable this property if you expect to encounter unacceptable performance hits related to clearing the cache for each product in the price list entries. Otherwise, leave this property enabled.</param>
-		/// <param name="publishEvents">Disable this property to prevent publishing the event related to adding price list entries to the system. Disabling this property helps you prevent performance delays if you expect the event to trigger the re-indexing of a large number of products, or if you want to postpone the operations of other applications and services listening for the event.</param>
-		/// <param name="priceListEntriesIn"></param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var pricelist = new PriceList();
-		///   pricelist.BulkAddPriceListEntries( priceListEntriesIn,  publishEvents,  invalidateCache);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void BulkAddPriceListEntries(List<Mozu.Api.Contracts.ProductAdmin.PriceListEntry> priceListEntriesIn, bool? publishEvents =  null, bool? invalidateCache =  null)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.PriceListClient.BulkAddPriceListEntriesClient( priceListEntriesIn,  publishEvents,  invalidateCache);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Adds up to 5000 new price list entries in bulk.
+		/// 
 		/// </summary>
-		/// <param name="invalidateCache">Disable this property if you expect to encounter unacceptable performance hits related to clearing the cache for each product in the price list entries. Otherwise, leave this property enabled.</param>
-		/// <param name="publishEvents">Disable this property to prevent publishing the event related to adding price list entries to the system. Disabling this property helps you prevent performance delays if you expect the event to trigger the re-indexing of a large number of products, or if you want to postpone the operations of other applications and services listening for the event.</param>
+		/// <param name="invalidateCache"></param>
+		/// <param name="publishEvents"></param>
 		/// <param name="priceListEntriesIn"></param>
 		/// <returns>
 		/// 
@@ -230,45 +132,21 @@ public virtual void BulkAddPriceListEntries(List<Mozu.Api.Contracts.ProductAdmin
 		///   await pricelist.BulkAddPriceListEntriesAsync( priceListEntriesIn,  publishEvents,  invalidateCache);
 		/// </code>
 		/// </example>
-		public virtual async Task BulkAddPriceListEntriesAsync(List<Mozu.Api.Contracts.ProductAdmin.PriceListEntry> priceListEntriesIn, bool? publishEvents =  null, bool? invalidateCache =  null)
+		public virtual async Task BulkAddPriceListEntriesAsync(List<Mozu.Api.Contracts.ProductAdmin.PriceListEntry> priceListEntriesIn, bool? publishEvents =  null, bool? invalidateCache =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.PriceListClient.BulkAddPriceListEntriesClient( priceListEntriesIn,  publishEvents,  invalidateCache);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
-		/// <summary>
-		/// Deletes up to 5000 price list entries in bulk.
-		/// </summary>
-		/// <param name="invalidateCache">Disable this property if you expect to encounter unacceptable performance hits related to clearing the cache for each product in the price list entries. Otherwise, leave this property enabled.</param>
-		/// <param name="publishEvents">Disable this property to prevent publishing the event related to deleting price list entries from the system. Disabling this property helps you prevent performance delays if you expect the event to trigger the re-indexing of a large number of products, or if you want to postpone the operations of other applications and services listening for the event.</param>
-		/// <param name="priceListEntriesIn"></param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var pricelist = new PriceList();
-		///   pricelist.BulkDeletePriceListEntries( priceListEntriesIn,  publishEvents,  invalidateCache);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void BulkDeletePriceListEntries(List<Mozu.Api.Contracts.ProductAdmin.PriceListEntry> priceListEntriesIn, bool? publishEvents =  null, bool? invalidateCache =  null)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.PriceListClient.BulkDeletePriceListEntriesClient( priceListEntriesIn,  publishEvents,  invalidateCache);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes up to 5000 price list entries in bulk.
+		/// 
 		/// </summary>
-		/// <param name="invalidateCache">Disable this property if you expect to encounter unacceptable performance hits related to clearing the cache for each product in the price list entries. Otherwise, leave this property enabled.</param>
-		/// <param name="publishEvents">Disable this property to prevent publishing the event related to deleting price list entries from the system. Disabling this property helps you prevent performance delays if you expect the event to trigger the re-indexing of a large number of products, or if you want to postpone the operations of other applications and services listening for the event.</param>
+		/// <param name="invalidateCache"></param>
+		/// <param name="publishEvents"></param>
 		/// <param name="priceListEntriesIn"></param>
 		/// <returns>
 		/// 
@@ -279,45 +157,21 @@ public virtual void BulkDeletePriceListEntries(List<Mozu.Api.Contracts.ProductAd
 		///   await pricelist.BulkDeletePriceListEntriesAsync( priceListEntriesIn,  publishEvents,  invalidateCache);
 		/// </code>
 		/// </example>
-		public virtual async Task BulkDeletePriceListEntriesAsync(List<Mozu.Api.Contracts.ProductAdmin.PriceListEntry> priceListEntriesIn, bool? publishEvents =  null, bool? invalidateCache =  null)
+		public virtual async Task BulkDeletePriceListEntriesAsync(List<Mozu.Api.Contracts.ProductAdmin.PriceListEntry> priceListEntriesIn, bool? publishEvents =  null, bool? invalidateCache =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.PriceListClient.BulkDeletePriceListEntriesClient( priceListEntriesIn,  publishEvents,  invalidateCache);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
-		/// <summary>
-		/// Updates up to 5000 price list entries in bulk.
-		/// </summary>
-		/// <param name="invalidateCache">Disable this property if you expect to encounter unacceptable performance hits related to clearing the cache for each product in the price list entries. Otherwise, leave this property enabled.</param>
-		/// <param name="publishEvents">Disable this property to prevent publishing the event related to updating price list entries in the system. Disabling this property helps you prevent performance delays if you expect the event to trigger the re-indexing of a large number of products, or if you want to postpone the operations of other applications and services listening for the event.</param>
-		/// <param name="priceListEntriesIn"></param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var pricelist = new PriceList();
-		///   pricelist.BulkUpdatePriceListEntries( priceListEntriesIn,  publishEvents,  invalidateCache);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void BulkUpdatePriceListEntries(List<Mozu.Api.Contracts.ProductAdmin.PriceListEntry> priceListEntriesIn, bool? publishEvents =  null, bool? invalidateCache =  null)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.PriceListClient.BulkUpdatePriceListEntriesClient( priceListEntriesIn,  publishEvents,  invalidateCache);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Updates up to 5000 price list entries in bulk.
+		/// 
 		/// </summary>
-		/// <param name="invalidateCache">Disable this property if you expect to encounter unacceptable performance hits related to clearing the cache for each product in the price list entries. Otherwise, leave this property enabled.</param>
-		/// <param name="publishEvents">Disable this property to prevent publishing the event related to updating price list entries in the system. Disabling this property helps you prevent performance delays if you expect the event to trigger the re-indexing of a large number of products, or if you want to postpone the operations of other applications and services listening for the event.</param>
+		/// <param name="invalidateCache"></param>
+		/// <param name="publishEvents"></param>
 		/// <param name="priceListEntriesIn"></param>
 		/// <returns>
 		/// 
@@ -328,47 +182,22 @@ public virtual void BulkUpdatePriceListEntries(List<Mozu.Api.Contracts.ProductAd
 		///   await pricelist.BulkUpdatePriceListEntriesAsync( priceListEntriesIn,  publishEvents,  invalidateCache);
 		/// </code>
 		/// </example>
-		public virtual async Task BulkUpdatePriceListEntriesAsync(List<Mozu.Api.Contracts.ProductAdmin.PriceListEntry> priceListEntriesIn, bool? publishEvents =  null, bool? invalidateCache =  null)
+		public virtual async Task BulkUpdatePriceListEntriesAsync(List<Mozu.Api.Contracts.ProductAdmin.PriceListEntry> priceListEntriesIn, bool? publishEvents =  null, bool? invalidateCache =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.PriceListClient.BulkUpdatePriceListEntriesClient( priceListEntriesIn,  publishEvents,  invalidateCache);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
-		/// <summary>
-		/// Updates the details of the specified price list.
-		/// </summary>
-		/// <param name="priceListCode">The unique, user-defined code of the price list.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="priceList">The details of the updated price list.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.PriceList"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var pricelist = new PriceList();
-		///   var priceList = pricelist.UpdatePriceList( priceList,  priceListCode,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.PriceList UpdatePriceList(Mozu.Api.Contracts.ProductAdmin.PriceList priceList, string priceListCode, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.PriceList> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.PriceListClient.UpdatePriceListClient( priceList,  priceListCode,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates the details of the specified price list.
+		/// 
 		/// </summary>
-		/// <param name="priceListCode">The unique, user-defined code of the price list.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="priceList">The details of the updated price list.</param>
+		/// <param name="priceListCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="priceList"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.PriceList"/>
 		/// </returns>
@@ -378,45 +207,22 @@ public virtual Mozu.Api.Contracts.ProductAdmin.PriceList UpdatePriceList(Mozu.Ap
 		///   var priceList = await pricelist.UpdatePriceListAsync( priceList,  priceListCode,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.PriceList> UpdatePriceListAsync(Mozu.Api.Contracts.ProductAdmin.PriceList priceList, string priceListCode, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.PriceList> UpdatePriceListAsync(Mozu.Api.Contracts.ProductAdmin.PriceList priceList, string priceListCode, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.PriceList> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.PriceListClient.UpdatePriceListClient( priceList,  priceListCode,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Deletes the specified price list from the tenant.
-		/// </summary>
-		/// <param name="cascadeDeleteEntries">Specifies whether to deletes all price list entries associated with the price list.</param>
-		/// <param name="priceListCode">The unique, user-defined code of the price list.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var pricelist = new PriceList();
-		///   pricelist.DeletePriceList( priceListCode,  cascadeDeleteEntries);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeletePriceList(string priceListCode, bool? cascadeDeleteEntries =  null)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.PriceListClient.DeletePriceListClient( priceListCode,  cascadeDeleteEntries);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes the specified price list from the tenant.
+		/// 
 		/// </summary>
-		/// <param name="cascadeDeleteEntries">Specifies whether to deletes all price list entries associated with the price list.</param>
-		/// <param name="priceListCode">The unique, user-defined code of the price list.</param>
+		/// <param name="cascadeDeleteEntries"></param>
+		/// <param name="priceListCode"></param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -426,12 +232,12 @@ public virtual void DeletePriceList(string priceListCode, bool? cascadeDeleteEnt
 		///   await pricelist.DeletePriceListAsync( priceListCode,  cascadeDeleteEntries);
 		/// </code>
 		/// </example>
-		public virtual async Task DeletePriceListAsync(string priceListCode, bool? cascadeDeleteEntries =  null)
+		public virtual async Task DeletePriceListAsync(string priceListCode, bool? cascadeDeleteEntries =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.PriceListClient.DeletePriceListClient( priceListCode,  cascadeDeleteEntries);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/Catalog/Admin/Pricelists/PriceListEntryResource.cs b/Mozu.Api/Resources/Commerce/Catalog/Admin/Pricelists/PriceListEntryResource.cs
old mode 100644
new mode 100755
index 50948744..0808e21e
--- a/Mozu.Api/Resources/Commerce/Catalog/Admin/Pricelists/PriceListEntryResource.cs
+++ b/Mozu.Api/Resources/Commerce/Catalog/Admin/Pricelists/PriceListEntryResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Catalog.Admin.Pricelists
 {
 	/// <summary>
-	/// Use the Entries sub-resource to interact with price list entries. Price list entries enable you to override product pricing as well as control what products shoppers can view and purchase when the price list is exclusive. Refer to the [Price Lists](../../../guides/catalog/price-lists.htm) guides topic for more information.
+	/// 
 	/// </summary>
 	public partial class PriceListEntryResource  	{
 		///
@@ -37,42 +38,15 @@ public PriceListEntryResource CloneWithApiContext(Action<IApiContext> contextMod
 		}
 
 				
-		/// <summary>
-		/// Retrieves the details of a price list entry.
-		/// </summary>
-		/// <param name="currencyCode">The three character ISO currency code, such as USD for US Dollars.</param>
-		/// <param name="priceListCode">The unique code of the price list associated with the price list entry.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="startDate">The start date of the price list entry.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.PriceListEntry"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var pricelistentry = new PriceListEntry();
-		///   var priceListEntry = pricelistentry.GetPriceListEntry( priceListCode,  productCode,  currencyCode,  startDate,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.PriceListEntry GetPriceListEntry(string priceListCode, string productCode, string currencyCode, DateTime? startDate =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.PriceListEntry> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Pricelists.PriceListEntryClient.GetPriceListEntryClient( priceListCode,  productCode,  currencyCode,  startDate,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of a price list entry.
+		/// 
 		/// </summary>
-		/// <param name="currencyCode">The three character ISO currency code, such as USD for US Dollars.</param>
-		/// <param name="priceListCode">The unique code of the price list associated with the price list entry.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="startDate">The start date of the price list entry.</param>
+		/// <param name="currencyCode"></param>
+		/// <param name="priceListCode"></param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="startDate"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.PriceListEntry"/>
 		/// </returns>
@@ -82,54 +56,26 @@ public virtual Mozu.Api.Contracts.ProductAdmin.PriceListEntry GetPriceListEntry(
 		///   var priceListEntry = await pricelistentry.GetPriceListEntryAsync( priceListCode,  productCode,  currencyCode,  startDate,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.PriceListEntry> GetPriceListEntryAsync(string priceListCode, string productCode, string currencyCode, DateTime? startDate =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.PriceListEntry> GetPriceListEntryAsync(string priceListCode, string productCode, string currencyCode, DateTime? startDate =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.PriceListEntry> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Pricelists.PriceListEntryClient.GetPriceListEntryClient( priceListCode,  productCode,  currencyCode,  startDate,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves a list of price list entries associated with the specified price list according to any specified facets, filter criteria, and sort options.
-		/// </summary>
-		/// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="priceListCode">The unique code of the price list associated with the price list entry.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.PriceListEntryCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var pricelistentry = new PriceListEntry();
-		///   var priceListEntryCollection = pricelistentry.GetPriceListEntries( priceListCode,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.PriceListEntryCollection GetPriceListEntries(string priceListCode, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.PriceListEntryCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Pricelists.PriceListEntryClient.GetPriceListEntriesClient( priceListCode,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of price list entries associated with the specified price list according to any specified facets, filter criteria, and sort options.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="priceListCode">The unique code of the price list associated with the price list entry.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="priceListCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.PriceListEntryCollection"/>
 		/// </returns>
@@ -139,48 +85,23 @@ public virtual Mozu.Api.Contracts.ProductAdmin.PriceListEntryCollection GetPrice
 		///   var priceListEntryCollection = await pricelistentry.GetPriceListEntriesAsync( priceListCode,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.PriceListEntryCollection> GetPriceListEntriesAsync(string priceListCode, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.PriceListEntryCollection> GetPriceListEntriesAsync(string priceListCode, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.PriceListEntryCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Pricelists.PriceListEntryClient.GetPriceListEntriesClient( priceListCode,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Adds a new price list entry to the specified price list.
-		/// </summary>
-		/// <param name="priceListCode">The specified price list to which you want to add the price list entry.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="priceListEntryIn">The details of the new price list entry.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.PriceListEntry"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var pricelistentry = new PriceListEntry();
-		///   var priceListEntry = pricelistentry.AddPriceListEntry( priceListEntryIn,  priceListCode,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.PriceListEntry AddPriceListEntry(Mozu.Api.Contracts.ProductAdmin.PriceListEntry priceListEntryIn, string priceListCode, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.PriceListEntry> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Pricelists.PriceListEntryClient.AddPriceListEntryClient( priceListEntryIn,  priceListCode,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Adds a new price list entry to the specified price list.
+		/// 
 		/// </summary>
-		/// <param name="priceListCode">The specified price list to which you want to add the price list entry.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="priceListEntryIn">The details of the new price list entry.</param>
+		/// <param name="priceListCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="priceListEntryIn"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.PriceListEntry"/>
 		/// </returns>
@@ -190,54 +111,26 @@ public virtual Mozu.Api.Contracts.ProductAdmin.PriceListEntry AddPriceListEntry(
 		///   var priceListEntry = await pricelistentry.AddPriceListEntryAsync( priceListEntryIn,  priceListCode,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.PriceListEntry> AddPriceListEntryAsync(Mozu.Api.Contracts.ProductAdmin.PriceListEntry priceListEntryIn, string priceListCode, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.PriceListEntry> AddPriceListEntryAsync(Mozu.Api.Contracts.ProductAdmin.PriceListEntry priceListEntryIn, string priceListCode, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.PriceListEntry> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Pricelists.PriceListEntryClient.AddPriceListEntryClient( priceListEntryIn,  priceListCode,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates the details of a price list entry.
-		/// </summary>
-		/// <param name="currencyCode">The three character ISO currency code, such as USD for US Dollars.</param>
-		/// <param name="priceListCode">The unique code of the price list associated with the price list entry.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="startDate">The start date of the price list entry.</param>
-		/// <param name="priceListEntryIn">The updated details of the price list entry.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.PriceListEntry"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var pricelistentry = new PriceListEntry();
-		///   var priceListEntry = pricelistentry.UpdatePriceListEntry( priceListEntryIn,  priceListCode,  productCode,  currencyCode,  startDate,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.PriceListEntry UpdatePriceListEntry(Mozu.Api.Contracts.ProductAdmin.PriceListEntry priceListEntryIn, string priceListCode, string productCode, string currencyCode, DateTime? startDate =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.PriceListEntry> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Pricelists.PriceListEntryClient.UpdatePriceListEntryClient( priceListEntryIn,  priceListCode,  productCode,  currencyCode,  startDate,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates the details of a price list entry.
+		/// 
 		/// </summary>
-		/// <param name="currencyCode">The three character ISO currency code, such as USD for US Dollars.</param>
-		/// <param name="priceListCode">The unique code of the price list associated with the price list entry.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="startDate">The start date of the price list entry.</param>
-		/// <param name="priceListEntryIn">The updated details of the price list entry.</param>
+		/// <param name="currencyCode"></param>
+		/// <param name="priceListCode"></param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="startDate"></param>
+		/// <param name="priceListEntryIn"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.PriceListEntry"/>
 		/// </returns>
@@ -247,49 +140,24 @@ public virtual Mozu.Api.Contracts.ProductAdmin.PriceListEntry UpdatePriceListEnt
 		///   var priceListEntry = await pricelistentry.UpdatePriceListEntryAsync( priceListEntryIn,  priceListCode,  productCode,  currencyCode,  startDate,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.PriceListEntry> UpdatePriceListEntryAsync(Mozu.Api.Contracts.ProductAdmin.PriceListEntry priceListEntryIn, string priceListCode, string productCode, string currencyCode, DateTime? startDate =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.PriceListEntry> UpdatePriceListEntryAsync(Mozu.Api.Contracts.ProductAdmin.PriceListEntry priceListEntryIn, string priceListCode, string productCode, string currencyCode, DateTime? startDate =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.PriceListEntry> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Pricelists.PriceListEntryClient.UpdatePriceListEntryClient( priceListEntryIn,  priceListCode,  productCode,  currencyCode,  startDate,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Deletes a price list entry.
-		/// </summary>
-		/// <param name="currencyCode">The three character ISO currency code, such as USD for US Dollars.</param>
-		/// <param name="priceListCode">The code of the specified price list associated with the price list entry.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="startDate">The start date of the price list entry.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var pricelistentry = new PriceListEntry();
-		///   pricelistentry.DeletePriceListEntry( priceListCode,  productCode,  currencyCode,  startDate);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeletePriceListEntry(string priceListCode, string productCode, string currencyCode, DateTime? startDate =  null)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Pricelists.PriceListEntryClient.DeletePriceListEntryClient( priceListCode,  productCode,  currencyCode,  startDate);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes a price list entry.
+		/// 
 		/// </summary>
-		/// <param name="currencyCode">The three character ISO currency code, such as USD for US Dollars.</param>
-		/// <param name="priceListCode">The code of the specified price list associated with the price list entry.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="startDate">The start date of the price list entry.</param>
+		/// <param name="currencyCode"></param>
+		/// <param name="priceListCode"></param>
+		/// <param name="productCode"></param>
+		/// <param name="startDate"></param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -299,12 +167,12 @@ public virtual void DeletePriceListEntry(string priceListCode, string productCod
 		///   await pricelistentry.DeletePriceListEntryAsync( priceListCode,  productCode,  currencyCode,  startDate);
 		/// </code>
 		/// </example>
-		public virtual async Task DeletePriceListEntryAsync(string priceListCode, string productCode, string currencyCode, DateTime? startDate =  null)
+		public virtual async Task DeletePriceListEntryAsync(string priceListCode, string productCode, string currencyCode, DateTime? startDate =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Pricelists.PriceListEntryClient.DeletePriceListEntryClient( priceListCode,  productCode,  currencyCode,  startDate);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/Catalog/Admin/ProductReservationResource.cs b/Mozu.Api/Resources/Commerce/Catalog/Admin/ProductReservationResource.cs
old mode 100644
new mode 100755
index aea48228..17c15caf
--- a/Mozu.Api/Resources/Commerce/Catalog/Admin/ProductReservationResource.cs
+++ b/Mozu.Api/Resources/Commerce/Catalog/Admin/ProductReservationResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Catalog.Admin
 {
 	/// <summary>
-	/// Use the Product Reservations resource to temporarily hold a product from inventory while a shopper is filling out payment information. You can create a product reservation when a shopper proceeds to check out and then release the reservation when the order process is complete.
+	/// Temporarily hold a product from inventory while a shopper is filling out payment information. Create a product reservation when a shopper proceeds to check out and then release the reservation when the order process is complete.
 	/// </summary>
 	public partial class ProductReservationResource  	{
 		///
@@ -44,42 +45,14 @@ public ProductReservationResource(IApiContext apiContext, DataViewMode dataViewM
 			_dataViewMode = dataViewMode;
 		}
 				
-		/// <summary>
-		/// Retrieves a list of product reservations according to any specified filter criteria and sort options.
-		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy"></param>
-		/// <param name="startIndex"></param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductReservationCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var productreservation = new ProductReservation();
-		///   var productReservationCollection = productreservation.GetProductReservations(_dataViewMode,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.ProductReservationCollection GetProductReservations(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductReservationCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.ProductReservationClient.GetProductReservationsClient(_dataViewMode,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of product reservations according to any specified filter criteria and sort options.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy"></param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize">Used to page results from a query. Indicates the maximum number of entities to return from a query. Default value: 20. Max value: 200.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy">The element to sort the results by and the order in which the results appear. Either ascending order (a-z) which accepts 'asc' or 'asc' or descending order (z-a) which accepts 'desc' or 'desc'. The sortBy parameter follows an available property.</param>
 		/// <param name="startIndex"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
@@ -91,47 +64,22 @@ public virtual Mozu.Api.Contracts.ProductAdmin.ProductReservationCollection GetP
 		///   var productReservationCollection = await productreservation.GetProductReservationsAsync(_dataViewMode,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductReservationCollection> GetProductReservationsAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductReservationCollection> GetProductReservationsAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductReservationCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.ProductReservationClient.GetProductReservationsClient(_dataViewMode,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the details of a product reservation.
-		/// </summary>
-		/// <param name="productReservationId">Unique identifier of the product reservation.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductReservation"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var productreservation = new ProductReservation();
-		///   var productReservation = productreservation.GetProductReservation(_dataViewMode,  productReservationId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.ProductReservation GetProductReservation(int productReservationId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductReservation> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.ProductReservationClient.GetProductReservationClient(_dataViewMode,  productReservationId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of a product reservation.
+		/// 
 		/// </summary>
 		/// <param name="productReservationId">Unique identifier of the product reservation.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductReservation"/>
@@ -142,48 +90,23 @@ public virtual Mozu.Api.Contracts.ProductAdmin.ProductReservation GetProductRese
 		///   var productReservation = await productreservation.GetProductReservationAsync(_dataViewMode,  productReservationId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductReservation> GetProductReservationAsync(int productReservationId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductReservation> GetProductReservationAsync(int productReservationId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductReservation> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.ProductReservationClient.GetProductReservationClient(_dataViewMode,  productReservationId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Creates a new product reservation for a product. This action places a hold on the product inventory for the quantity specified during the ordering process.
-		/// </summary>
-		/// <param name="skipInventoryCheck">If true, skip the process to validate inventory when creating this product reservation.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="productReservations">A hold placed on product inventory for a particular product so that the quantity specified is set aside and available for purchase during the ordering process.</param>
-		/// <returns>
-		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductReservation"/>}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var productreservation = new ProductReservation();
-		///   var productReservation = productreservation.AddProductReservations(_dataViewMode,  productReservations,  skipInventoryCheck);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<Mozu.Api.Contracts.ProductAdmin.ProductReservation> AddProductReservations(List<Mozu.Api.Contracts.ProductAdmin.ProductReservation> productReservations, bool? skipInventoryCheck =  null)
-		{
-			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.ProductReservation>> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.ProductReservationClient.AddProductReservationsClient(_dataViewMode,  productReservations,  skipInventoryCheck);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Creates a new product reservation for a product. This action places a hold on the product inventory for the quantity specified during the ordering process.
+		/// 
 		/// </summary>
 		/// <param name="skipInventoryCheck">If true, skip the process to validate inventory when creating this product reservation.</param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="productReservations">A hold placed on product inventory for a particular product so that the quantity specified is set aside and available for purchase during the ordering process.</param>
+		/// <param name="productReservations">Details of the product reservations to add.</param>
 		/// <returns>
 		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductReservation"/>}
 		/// </returns>
@@ -193,45 +116,22 @@ public virtual Mozu.Api.Contracts.ProductAdmin.ProductReservation GetProductRese
 		///   var productReservation = await productreservation.AddProductReservationsAsync(_dataViewMode,  productReservations,  skipInventoryCheck);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.ProductReservation>> AddProductReservationsAsync(List<Mozu.Api.Contracts.ProductAdmin.ProductReservation> productReservations, bool? skipInventoryCheck =  null)
+		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.ProductReservation>> AddProductReservationsAsync(List<Mozu.Api.Contracts.ProductAdmin.ProductReservation> productReservations, bool? skipInventoryCheck =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.ProductReservation>> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.ProductReservationClient.AddProductReservationsClient(_dataViewMode,  productReservations,  skipInventoryCheck);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Commits a product reservation to decrement the product's inventory by the quantity specified then release the reservation once the order process completed successfully.
-		/// </summary>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="productReservations">A hold placed on product inventory for a particular product so that the quantity specified is set aside and available for purchase during the ordering process.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var productreservation = new ProductReservation();
-		///   productreservation.CommitReservations(_dataViewMode,  productReservations);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void CommitReservations(List<Mozu.Api.Contracts.ProductAdmin.ProductReservation> productReservations)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.ProductReservationClient.CommitReservationsClient(_dataViewMode,  productReservations);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Commits a product reservation to decrement the product's inventory by the quantity specified then release the reservation once the order process completed successfully.
+		/// 
 		/// </summary>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="productReservations">A hold placed on product inventory for a particular product so that the quantity specified is set aside and available for purchase during the ordering process.</param>
+		/// <param name="productReservations">List of unique identifiers of the reservations to commit.</param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -241,47 +141,22 @@ public virtual void CommitReservations(List<Mozu.Api.Contracts.ProductAdmin.Prod
 		///   await productreservation.CommitReservationsAsync(_dataViewMode,  productReservations);
 		/// </code>
 		/// </example>
-		public virtual async Task CommitReservationsAsync(List<Mozu.Api.Contracts.ProductAdmin.ProductReservation> productReservations)
+		public virtual async Task CommitReservationsAsync(List<Mozu.Api.Contracts.ProductAdmin.ProductReservation> productReservations, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.ProductReservationClient.CommitReservationsClient(_dataViewMode,  productReservations);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
-		/// <summary>
-		/// Updates an existing product reservation for a product.
-		/// </summary>
-		/// <param name="skipInventoryCheck">If true, skip the process to validate inventory when creating this product reservation.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="productReservations">A hold placed on product inventory for a particular product so that the quantity specified is set aside and available for purchase during the ordering process.</param>
-		/// <returns>
-		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductReservation"/>}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var productreservation = new ProductReservation();
-		///   var productReservation = productreservation.UpdateProductReservations(_dataViewMode,  productReservations,  skipInventoryCheck);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<Mozu.Api.Contracts.ProductAdmin.ProductReservation> UpdateProductReservations(List<Mozu.Api.Contracts.ProductAdmin.ProductReservation> productReservations, bool? skipInventoryCheck =  null)
-		{
-			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.ProductReservation>> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.ProductReservationClient.UpdateProductReservationsClient(_dataViewMode,  productReservations,  skipInventoryCheck);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates an existing product reservation for a product.
+		/// 
 		/// </summary>
-		/// <param name="skipInventoryCheck">If true, skip the process to validate inventory when creating this product reservation.</param>
+		/// <param name="skipInventoryCheck">If true, skip the inventory validation process when updating this product reservation.</param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="productReservations">A hold placed on product inventory for a particular product so that the quantity specified is set aside and available for purchase during the ordering process.</param>
+		/// <param name="productReservations">Properties of the product reservations to update.</param>
 		/// <returns>
 		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductReservation"/>}
 		/// </returns>
@@ -291,44 +166,21 @@ public virtual async Task CommitReservationsAsync(List<Mozu.Api.Contracts.Produc
 		///   var productReservation = await productreservation.UpdateProductReservationsAsync(_dataViewMode,  productReservations,  skipInventoryCheck);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.ProductReservation>> UpdateProductReservationsAsync(List<Mozu.Api.Contracts.ProductAdmin.ProductReservation> productReservations, bool? skipInventoryCheck =  null)
+		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.ProductReservation>> UpdateProductReservationsAsync(List<Mozu.Api.Contracts.ProductAdmin.ProductReservation> productReservations, bool? skipInventoryCheck =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.ProductReservation>> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.ProductReservationClient.UpdateProductReservationsClient(_dataViewMode,  productReservations,  skipInventoryCheck);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Deletes a product reservation. For example, delete a reservation when an order is not processed to return the product quantity back to inventory.
-		/// </summary>
-		/// <param name="productReservationId">Unique identifier of the product reservation.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var productreservation = new ProductReservation();
-		///   productreservation.DeleteProductReservation(_dataViewMode,  productReservationId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteProductReservation(int productReservationId)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.ProductReservationClient.DeleteProductReservationClient(_dataViewMode,  productReservationId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes a product reservation. For example, delete a reservation when an order is not processed to return the product quantity back to inventory.
+		/// 
 		/// </summary>
-		/// <param name="productReservationId">Unique identifier of the product reservation.</param>
+		/// <param name="productReservationId">Unique identifier of the reservation.</param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		/// 
@@ -339,12 +191,12 @@ public virtual void DeleteProductReservation(int productReservationId)
 		///   await productreservation.DeleteProductReservationAsync(_dataViewMode,  productReservationId);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteProductReservationAsync(int productReservationId)
+		public virtual async Task DeleteProductReservationAsync(int productReservationId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.ProductReservationClient.DeleteProductReservationClient(_dataViewMode,  productReservationId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/Catalog/Admin/ProductResource.cs b/Mozu.Api/Resources/Commerce/Catalog/Admin/ProductResource.cs
old mode 100644
new mode 100755
index 13fd79c0..13c8366e
--- a/Mozu.Api/Resources/Commerce/Catalog/Admin/ProductResource.cs
+++ b/Mozu.Api/Resources/Commerce/Catalog/Admin/ProductResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Catalog.Admin
 {
@@ -44,46 +45,16 @@ public ProductResource(IApiContext apiContext, DataViewMode dataViewMode)
 			_dataViewMode = dataViewMode;
 		}
 				
-		/// <summary>
-		/// Retrieves a list of products according to any specified facets, filter criteria, and sort options.
-		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="noCount">If true, the operation does not return the TotalCount number of results.</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="q">A list of order search terms (not phrases) to use in the query when searching across order number and the name or email of the billing contact. When entering, separate multiple search terms with a space character.</param>
-		/// <param name="qLimit">The maximum number of search results to return in the response. You can limit any range between 1-100.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy"></param>
-		/// <param name="startIndex"></param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var product = new Product();
-		///   var productCollection = product.GetProducts(_dataViewMode,  startIndex,  pageSize,  sortBy,  filter,  q,  qLimit,  noCount,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.ProductCollection GetProducts(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string q =  null, int? qLimit =  null, bool? noCount =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.ProductClient.GetProductsClient(_dataViewMode,  startIndex,  pageSize,  sortBy,  filter,  q,  qLimit,  noCount,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of products according to any specified facets, filter criteria, and sort options.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
+		/// <param name="filter"></param>
 		/// <param name="noCount">If true, the operation does not return the TotalCount number of results.</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="q">A list of order search terms (not phrases) to use in the query when searching across order number and the name or email of the billing contact. When entering, separate multiple search terms with a space character.</param>
+		/// <param name="pageSize"></param>
+		/// <param name="q">A list of product search terms to use in the query when searching across product code and product name. Separate multiple search terms with a space character.</param>
 		/// <param name="qLimit">The maximum number of search results to return in the response. You can limit any range between 1-100.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="sortBy"></param>
 		/// <param name="startIndex"></param>
 		/// <returns>
@@ -95,44 +66,21 @@ public virtual Mozu.Api.Contracts.ProductAdmin.ProductCollection GetProducts(int
 		///   var productCollection = await product.GetProductsAsync(_dataViewMode,  startIndex,  pageSize,  sortBy,  filter,  q,  qLimit,  noCount,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductCollection> GetProductsAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string q =  null, int? qLimit =  null, bool? noCount =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductCollection> GetProductsAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string q =  null, int? qLimit =  null, bool? noCount =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.ProductClient.GetProductsClient(_dataViewMode,  startIndex,  pageSize,  sortBy,  filter,  q,  qLimit,  noCount,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves a product that is associated with one or more specific catalogs.
-		/// </summary>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <returns>
-		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductInCatalogInfo"/>}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var product = new Product();
-		///   var productInCatalogInfo = product.GetProductInCatalogs(_dataViewMode,  productCode);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<Mozu.Api.Contracts.ProductAdmin.ProductInCatalogInfo> GetProductInCatalogs(string productCode)
-		{
-			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.ProductInCatalogInfo>> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.ProductClient.GetProductInCatalogsClient(_dataViewMode,  productCode);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a product that is associated with one or more specific catalogs.
+		/// 
 		/// </summary>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
+		/// <param name="productCode"></param>
 		/// <returns>
 		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductInCatalogInfo"/>}
 		/// </returns>
@@ -142,48 +90,23 @@ public virtual Mozu.Api.Contracts.ProductAdmin.ProductCollection GetProducts(int
 		///   var productInCatalogInfo = await product.GetProductInCatalogsAsync(_dataViewMode,  productCode);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.ProductInCatalogInfo>> GetProductInCatalogsAsync(string productCode)
+		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.ProductInCatalogInfo>> GetProductInCatalogsAsync(string productCode, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.ProductInCatalogInfo>> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.ProductClient.GetProductInCatalogsClient(_dataViewMode,  productCode);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the details of a product associated with a specific catalog.
-		/// </summary>
-		/// <param name="catalogId">The unique identifier of the catalog of products used by a site.</param>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductInCatalogInfo"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var product = new Product();
-		///   var productInCatalogInfo = product.GetProductInCatalog(_dataViewMode,  productCode,  catalogId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.ProductInCatalogInfo GetProductInCatalog(string productCode, int catalogId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductInCatalogInfo> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.ProductClient.GetProductInCatalogClient(_dataViewMode,  productCode,  catalogId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of a product associated with a specific catalog.
+		/// 
 		/// </summary>
-		/// <param name="catalogId">The unique identifier of the catalog of products used by a site.</param>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="catalogId"></param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductInCatalogInfo"/>
 		/// </returns>
@@ -193,46 +116,22 @@ public virtual Mozu.Api.Contracts.ProductAdmin.ProductInCatalogInfo GetProductIn
 		///   var productInCatalogInfo = await product.GetProductInCatalogAsync(_dataViewMode,  productCode,  catalogId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductInCatalogInfo> GetProductInCatalogAsync(string productCode, int catalogId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductInCatalogInfo> GetProductInCatalogAsync(string productCode, int catalogId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductInCatalogInfo> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.ProductClient.GetProductInCatalogClient(_dataViewMode,  productCode,  catalogId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the details of a product definition.
-		/// </summary>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.Product"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var product = new Product();
-		///   var product = product.GetProduct(_dataViewMode,  productCode,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.Product GetProduct(string productCode, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.Product> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.ProductClient.GetProductClient(_dataViewMode,  productCode,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of a product definition.
+		/// 
 		/// </summary>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.Product"/>
 		/// </returns>
@@ -242,46 +141,22 @@ public virtual Mozu.Api.Contracts.ProductAdmin.Product GetProduct(string product
 		///   var product = await product.GetProductAsync(_dataViewMode,  productCode,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.Product> GetProductAsync(string productCode, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.Product> GetProductAsync(string productCode, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.Product> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.ProductClient.GetProductClient(_dataViewMode,  productCode,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Creates a new product definition in the specified master catalog.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="product">The properties of a product, referenced and used by carts, orders, wish lists, and returns.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.Product"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var product = new Product();
-		///   var product = product.AddProduct(_dataViewMode,  product,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.Product AddProduct(Mozu.Api.Contracts.ProductAdmin.Product product, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.Product> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.ProductClient.AddProductClient(_dataViewMode,  product,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Creates a new product definition in the specified master catalog.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="product">The properties of a product, referenced and used by carts, orders, wish lists, and returns.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="product">Properties of the new product. You must supply values for the product code, product name, and price.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.Product"/>
 		/// </returns>
@@ -291,48 +166,23 @@ public virtual Mozu.Api.Contracts.ProductAdmin.Product AddProduct(Mozu.Api.Contr
 		///   var product = await product.AddProductAsync(_dataViewMode,  product,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.Product> AddProductAsync(Mozu.Api.Contracts.ProductAdmin.Product product, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.Product> AddProductAsync(Mozu.Api.Contracts.ProductAdmin.Product product, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.Product> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.ProductClient.AddProductClient(_dataViewMode,  product,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Associates a new product defined in the master catalog with a specific catalog.
-		/// </summary>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="productInCatalogInfoIn">Properties of a product associated with a specific catalog.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductInCatalogInfo"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var product = new Product();
-		///   var productInCatalogInfo = product.AddProductInCatalog(_dataViewMode,  productInCatalogInfoIn,  productCode,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.ProductInCatalogInfo AddProductInCatalog(Mozu.Api.Contracts.ProductAdmin.ProductInCatalogInfo productInCatalogInfoIn, string productCode, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductInCatalogInfo> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.ProductClient.AddProductInCatalogClient(_dataViewMode,  productInCatalogInfoIn,  productCode,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Associates a new product defined in the master catalog with a specific catalog.
+		/// 
 		/// </summary>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="productInCatalogInfoIn">Properties of a product associated with a specific catalog.</param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="productInCatalogInfoIn">Properties of the product to define for the specific catalog association.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductInCatalogInfo"/>
 		/// </returns>
@@ -342,43 +192,21 @@ public virtual Mozu.Api.Contracts.ProductAdmin.ProductInCatalogInfo AddProductIn
 		///   var productInCatalogInfo = await product.AddProductInCatalogAsync(_dataViewMode,  productInCatalogInfoIn,  productCode,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductInCatalogInfo> AddProductInCatalogAsync(Mozu.Api.Contracts.ProductAdmin.ProductInCatalogInfo productInCatalogInfoIn, string productCode, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductInCatalogInfo> AddProductInCatalogAsync(Mozu.Api.Contracts.ProductAdmin.ProductInCatalogInfo productInCatalogInfoIn, string productCode, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductInCatalogInfo> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.ProductClient.AddProductInCatalogClient(_dataViewMode,  productInCatalogInfoIn,  productCode,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Performs an update to a product code by renaming or replacing the current product code with a new one.
-		/// </summary>
-		/// <param name="productCodeRenames">Properties for a product code current and changed content.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var product = new Product();
-		///   product.RenameProductCodes( productCodeRenames);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void RenameProductCodes(List<Mozu.Api.Contracts.ProductAdmin.ProductCodeRename> productCodeRenames)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.ProductClient.RenameProductCodesClient( productCodeRenames);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Performs an update to a product code by renaming or replacing the current product code with a new one.
+		/// 
 		/// </summary>
-		/// <param name="productCodeRenames">Properties for a product code current and changed content.</param>
+		/// <param name="productCodeRenames"></param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -388,45 +216,21 @@ public virtual void RenameProductCodes(List<Mozu.Api.Contracts.ProductAdmin.Prod
 		///   await product.RenameProductCodesAsync( productCodeRenames);
 		/// </code>
 		/// </example>
-		public virtual async Task RenameProductCodesAsync(List<Mozu.Api.Contracts.ProductAdmin.ProductCodeRename> productCodeRenames)
+		public virtual async Task RenameProductCodesAsync(List<Mozu.Api.Contracts.ProductAdmin.ProductCodeRename> productCodeRenames, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.ProductClient.RenameProductCodesClient( productCodeRenames);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
-		/// <summary>
-		/// Updates the properties of a product specific to each catalog associated with the product.
-		/// </summary>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="productInCatalogsIn">Properties of a product associated with a specific catalog.</param>
-		/// <returns>
-		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductInCatalogInfo"/>}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var product = new Product();
-		///   var productInCatalogInfo = product.UpdateProductInCatalogs(_dataViewMode,  productInCatalogsIn,  productCode);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<Mozu.Api.Contracts.ProductAdmin.ProductInCatalogInfo> UpdateProductInCatalogs(List<Mozu.Api.Contracts.ProductAdmin.ProductInCatalogInfo> productInCatalogsIn, string productCode)
-		{
-			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.ProductInCatalogInfo>> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.ProductClient.UpdateProductInCatalogsClient(_dataViewMode,  productInCatalogsIn,  productCode);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates the properties of a product specific to each catalog associated with the product.
+		/// 
 		/// </summary>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="productInCatalogsIn">Properties of a product associated with a specific catalog.</param>
+		/// <param name="productCode"></param>
+		/// <param name="productInCatalogsIn">Properties of the product to update for each associated catalog.</param>
 		/// <returns>
 		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductInCatalogInfo"/>}
 		/// </returns>
@@ -436,50 +240,24 @@ public virtual async Task RenameProductCodesAsync(List<Mozu.Api.Contracts.Produc
 		///   var productInCatalogInfo = await product.UpdateProductInCatalogsAsync(_dataViewMode,  productInCatalogsIn,  productCode);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.ProductInCatalogInfo>> UpdateProductInCatalogsAsync(List<Mozu.Api.Contracts.ProductAdmin.ProductInCatalogInfo> productInCatalogsIn, string productCode)
+		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.ProductInCatalogInfo>> UpdateProductInCatalogsAsync(List<Mozu.Api.Contracts.ProductAdmin.ProductInCatalogInfo> productInCatalogsIn, string productCode, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.ProductInCatalogInfo>> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.ProductClient.UpdateProductInCatalogsClient(_dataViewMode,  productInCatalogsIn,  productCode);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates one or more properties of a product associated with a specific catalog.
-		/// </summary>
-		/// <param name="catalogId">The unique identifier of the catalog of products used by a site.</param>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="productInCatalogInfoIn">Properties of a product associated with a specific catalog.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductInCatalogInfo"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var product = new Product();
-		///   var productInCatalogInfo = product.UpdateProductInCatalog(_dataViewMode,  productInCatalogInfoIn,  productCode,  catalogId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.ProductInCatalogInfo UpdateProductInCatalog(Mozu.Api.Contracts.ProductAdmin.ProductInCatalogInfo productInCatalogInfoIn, string productCode, int catalogId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductInCatalogInfo> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.ProductClient.UpdateProductInCatalogClient(_dataViewMode,  productInCatalogInfoIn,  productCode,  catalogId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates one or more properties of a product associated with a specific catalog.
+		/// 
 		/// </summary>
-		/// <param name="catalogId">The unique identifier of the catalog of products used by a site.</param>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="productInCatalogInfoIn">Properties of a product associated with a specific catalog.</param>
+		/// <param name="catalogId"></param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="productInCatalogInfoIn">Properties of the product associated with the catalog specified in the request.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductInCatalogInfo"/>
 		/// </returns>
@@ -489,48 +267,23 @@ public virtual Mozu.Api.Contracts.ProductAdmin.ProductInCatalogInfo UpdateProduc
 		///   var productInCatalogInfo = await product.UpdateProductInCatalogAsync(_dataViewMode,  productInCatalogInfoIn,  productCode,  catalogId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductInCatalogInfo> UpdateProductInCatalogAsync(Mozu.Api.Contracts.ProductAdmin.ProductInCatalogInfo productInCatalogInfoIn, string productCode, int catalogId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductInCatalogInfo> UpdateProductInCatalogAsync(Mozu.Api.Contracts.ProductAdmin.ProductInCatalogInfo productInCatalogInfoIn, string productCode, int catalogId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductInCatalogInfo> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.ProductClient.UpdateProductInCatalogClient(_dataViewMode,  productInCatalogInfoIn,  productCode,  catalogId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates one or more properties of a product definition in a master catalog.
-		/// </summary>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="product">The properties of a product, referenced and used by carts, orders, wish lists, and returns.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.Product"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var product = new Product();
-		///   var product = product.UpdateProduct(_dataViewMode,  product,  productCode,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.Product UpdateProduct(Mozu.Api.Contracts.ProductAdmin.Product product, string productCode, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.Product> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.ProductClient.UpdateProductClient(_dataViewMode,  product,  productCode,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates one or more properties of a product definition in a master catalog.
+		/// 
 		/// </summary>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="product">The properties of a product, referenced and used by carts, orders, wish lists, and returns.</param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="product">Properties of the product definition to update in the master catalog.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.Product"/>
 		/// </returns>
@@ -540,43 +293,21 @@ public virtual Mozu.Api.Contracts.ProductAdmin.Product UpdateProduct(Mozu.Api.Co
 		///   var product = await product.UpdateProductAsync(_dataViewMode,  product,  productCode,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.Product> UpdateProductAsync(Mozu.Api.Contracts.ProductAdmin.Product product, string productCode, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.Product> UpdateProductAsync(Mozu.Api.Contracts.ProductAdmin.Product product, string productCode, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.Product> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.ProductClient.UpdateProductClient(_dataViewMode,  product,  productCode,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Deletes the specified product from a master catalog.
-		/// </summary>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var product = new Product();
-		///   product.DeleteProduct(_dataViewMode,  productCode);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteProduct(string productCode)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.ProductClient.DeleteProductClient(_dataViewMode,  productCode);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes the specified product from a master catalog.
+		/// 
 		/// </summary>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
+		/// <param name="productCode"></param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -586,44 +317,21 @@ public virtual void DeleteProduct(string productCode)
 		///   await product.DeleteProductAsync(_dataViewMode,  productCode);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteProductAsync(string productCode)
+		public virtual async Task DeleteProductAsync(string productCode, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.ProductClient.DeleteProductClient(_dataViewMode,  productCode);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
-		/// <summary>
-		/// Removes the product association defined for a specific catalog.
-		/// </summary>
-		/// <param name="catalogId">The unique identifier of the catalog of products used by a site.</param>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var product = new Product();
-		///   product.DeleteProductInCatalog(_dataViewMode,  productCode,  catalogId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteProductInCatalog(string productCode, int catalogId)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.ProductClient.DeleteProductInCatalogClient(_dataViewMode,  productCode,  catalogId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Removes the product association defined for a specific catalog.
+		/// 
 		/// </summary>
-		/// <param name="catalogId">The unique identifier of the catalog of products used by a site.</param>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
+		/// <param name="catalogId"></param>
+		/// <param name="productCode"></param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -633,12 +341,12 @@ public virtual void DeleteProductInCatalog(string productCode, int catalogId)
 		///   await product.DeleteProductInCatalogAsync(_dataViewMode,  productCode,  catalogId);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteProductInCatalogAsync(string productCode, int catalogId)
+		public virtual async Task DeleteProductInCatalogAsync(string productCode, int catalogId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.ProductClient.DeleteProductInCatalogClient(_dataViewMode,  productCode,  catalogId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/Catalog/Admin/Products/LocationInventoryResource.cs b/Mozu.Api/Resources/Commerce/Catalog/Admin/Products/LocationInventoryResource.cs
old mode 100644
new mode 100755
index 0fe0b576..32c984cc
--- a/Mozu.Api/Resources/Commerce/Catalog/Admin/Products/LocationInventoryResource.cs
+++ b/Mozu.Api/Resources/Commerce/Catalog/Admin/Products/LocationInventoryResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Catalog.Admin.Products
 {
@@ -44,44 +45,16 @@ public LocationInventoryResource(IApiContext apiContext, DataViewMode dataViewMo
 			_dataViewMode = dataViewMode;
 		}
 				
-		/// <summary>
-		/// Retrieves all locations for which a product has inventory defined and displays the inventory definition properties of each location.
-		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.LocationInventoryCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var locationinventory = new LocationInventory();
-		///   var locationInventoryCollection = locationinventory.GetLocationInventories(_dataViewMode,  productCode,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.LocationInventoryCollection GetLocationInventories(string productCode, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.LocationInventoryCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.LocationInventoryClient.GetLocationInventoriesClient(_dataViewMode,  productCode,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves all locations for which a product has inventory defined and displays the inventory definition properties of each location.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.LocationInventoryCollection"/>
 		/// </returns>
@@ -91,48 +64,23 @@ public virtual Mozu.Api.Contracts.ProductAdmin.LocationInventoryCollection GetLo
 		///   var locationInventoryCollection = await locationinventory.GetLocationInventoriesAsync(_dataViewMode,  productCode,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.LocationInventoryCollection> GetLocationInventoriesAsync(string productCode, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.LocationInventoryCollection> GetLocationInventoriesAsync(string productCode, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.LocationInventoryCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.LocationInventoryClient.GetLocationInventoriesClient(_dataViewMode,  productCode,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the details of the inventory of the product in the location specified in the request.
-		/// </summary>
-		/// <param name="locationCode">The unique, user-defined code that identifies a location. </param>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.LocationInventory"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var locationinventory = new LocationInventory();
-		///   var locationInventory = locationinventory.GetLocationInventory(_dataViewMode,  productCode,  locationCode,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.LocationInventory GetLocationInventory(string productCode, string locationCode, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.LocationInventory> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.LocationInventoryClient.GetLocationInventoryClient(_dataViewMode,  productCode,  locationCode,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of the inventory of the product in the location specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="locationCode">The unique, user-defined code that identifies a location. </param>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="locationCode">User-defined code that identifies the location.</param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.LocationInventory"/>
 		/// </returns>
@@ -142,48 +90,23 @@ public virtual Mozu.Api.Contracts.ProductAdmin.LocationInventory GetLocationInve
 		///   var locationInventory = await locationinventory.GetLocationInventoryAsync(_dataViewMode,  productCode,  locationCode,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.LocationInventory> GetLocationInventoryAsync(string productCode, string locationCode, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.LocationInventory> GetLocationInventoryAsync(string productCode, string locationCode, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.LocationInventory> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.LocationInventoryClient.GetLocationInventoryClient(_dataViewMode,  productCode,  locationCode,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Creates a new location inventory definition for the product code specified in the request.
-		/// </summary>
-		/// <param name="performUpserts">Query string parameter lets the service perform an update for a new or existing record. When run, the update occurs without throwing a conflict exception that the record exists. If true, the updates completes regardless of the record currently existing. By default, if no value is specified, the service assumes this value is false.</param>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="locationInventoryList">Properties of an inventory definition that defines the level of inventory for a specific product at a given location.</param>
-		/// <returns>
-		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.LocationInventory"/>}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var locationinventory = new LocationInventory();
-		///   var locationInventory = locationinventory.AddLocationInventory(_dataViewMode,  locationInventoryList,  productCode,  performUpserts);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<Mozu.Api.Contracts.ProductAdmin.LocationInventory> AddLocationInventory(List<Mozu.Api.Contracts.ProductAdmin.LocationInventory> locationInventoryList, string productCode, bool? performUpserts =  null)
-		{
-			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.LocationInventory>> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.LocationInventoryClient.AddLocationInventoryClient(_dataViewMode,  locationInventoryList,  productCode,  performUpserts);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Creates a new location inventory definition for the product code specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="performUpserts">Query string parameter lets the service perform an update for a new or existing record. When run, the update occurs without throwing a conflict exception that the record exists. If true, the updates completes regardless of the record currently existing. By default, if no value is specified, the service assumes this value is false.</param>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="locationInventoryList">Properties of an inventory definition that defines the level of inventory for a specific product at a given location.</param>
+		/// <param name="performUpserts">The performUpserts query string parameter lets the service perform an update if the record already exists instead of throwing an already exists conflict exception. PerformUpserts=true means it updates if the record already exists. By default, no value specified means that the service assumes PerformUpserts=false.</param>
+		/// <param name="productCode"></param>
+		/// <param name="locationInventoryList">Array list of the location inventory definitions associated with the product code specified in the request. For each location, you must define the locationCode value and the stockOnHand value. All other properties in the array are system-supplied and read only.</param>
 		/// <returns>
 		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.LocationInventory"/>}
 		/// </returns>
@@ -193,46 +116,22 @@ public virtual Mozu.Api.Contracts.ProductAdmin.LocationInventory GetLocationInve
 		///   var locationInventory = await locationinventory.AddLocationInventoryAsync(_dataViewMode,  locationInventoryList,  productCode,  performUpserts);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.LocationInventory>> AddLocationInventoryAsync(List<Mozu.Api.Contracts.ProductAdmin.LocationInventory> locationInventoryList, string productCode, bool? performUpserts =  null)
+		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.LocationInventory>> AddLocationInventoryAsync(List<Mozu.Api.Contracts.ProductAdmin.LocationInventory> locationInventoryList, string productCode, bool? performUpserts =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.LocationInventory>> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.LocationInventoryClient.AddLocationInventoryClient(_dataViewMode,  locationInventoryList,  productCode,  performUpserts);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates the current level of stock at each location associated with the product code specified in the request.
-		/// </summary>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="locationInventoryAdjustments">Properties of an adjustment to the active product inventory of a specific location.</param>
-		/// <returns>
-		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.LocationInventory"/>}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var locationinventory = new LocationInventory();
-		///   var locationInventory = locationinventory.UpdateLocationInventory(_dataViewMode,  locationInventoryAdjustments,  productCode);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<Mozu.Api.Contracts.ProductAdmin.LocationInventory> UpdateLocationInventory(List<Mozu.Api.Contracts.ProductAdmin.LocationInventoryAdjustment> locationInventoryAdjustments, string productCode)
-		{
-			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.LocationInventory>> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.LocationInventoryClient.UpdateLocationInventoryClient(_dataViewMode,  locationInventoryAdjustments,  productCode);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates the current level of stock at each location associated with the product code specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="locationInventoryAdjustments">Properties of an adjustment to the active product inventory of a specific location.</param>
+		/// <param name="productCode">The product code of the product for which to update active stock on hand inventory at a specified location.</param>
+		/// <param name="locationInventoryAdjustments">Properties of the inventory adjustments to perform for the specified location.</param>
 		/// <returns>
 		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.LocationInventory"/>}
 		/// </returns>
@@ -242,45 +141,22 @@ public virtual Mozu.Api.Contracts.ProductAdmin.LocationInventory GetLocationInve
 		///   var locationInventory = await locationinventory.UpdateLocationInventoryAsync(_dataViewMode,  locationInventoryAdjustments,  productCode);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.LocationInventory>> UpdateLocationInventoryAsync(List<Mozu.Api.Contracts.ProductAdmin.LocationInventoryAdjustment> locationInventoryAdjustments, string productCode)
+		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.LocationInventory>> UpdateLocationInventoryAsync(List<Mozu.Api.Contracts.ProductAdmin.LocationInventoryAdjustment> locationInventoryAdjustments, string productCode, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.LocationInventory>> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.LocationInventoryClient.UpdateLocationInventoryClient(_dataViewMode,  locationInventoryAdjustments,  productCode);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Deletes the location inventory definition for the product code specified in the request.
-		/// </summary>
-		/// <param name="locationCode">The unique, user-defined code that identifies a location. </param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var locationinventory = new LocationInventory();
-		///   locationinventory.DeleteLocationInventory(_dataViewMode,  productCode,  locationCode);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteLocationInventory(string productCode, string locationCode)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.LocationInventoryClient.DeleteLocationInventoryClient(_dataViewMode,  productCode,  locationCode);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes the location inventory definition for the product code specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="locationCode">The unique, user-defined code that identifies a location. </param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
+		/// <param name="locationCode">The code that identifies the location for which to delete product inventory.</param>
+		/// <param name="productCode">The product code for which to delete a location's inventory.</param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -290,12 +166,12 @@ public virtual void DeleteLocationInventory(string productCode, string locationC
 		///   await locationinventory.DeleteLocationInventoryAsync(_dataViewMode,  productCode,  locationCode);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteLocationInventoryAsync(string productCode, string locationCode)
+		public virtual async Task DeleteLocationInventoryAsync(string productCode, string locationCode, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.LocationInventoryClient.DeleteLocationInventoryClient(_dataViewMode,  productCode,  locationCode);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/Catalog/Admin/Products/ProductExtraResource.cs b/Mozu.Api/Resources/Commerce/Catalog/Admin/Products/ProductExtraResource.cs
old mode 100644
new mode 100755
index 3e95b6aa..bc5f41c1
--- a/Mozu.Api/Resources/Commerce/Catalog/Admin/Products/ProductExtraResource.cs
+++ b/Mozu.Api/Resources/Commerce/Catalog/Admin/Products/ProductExtraResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Catalog.Admin.Products
 {
@@ -44,34 +45,11 @@ public ProductExtraResource(IApiContext apiContext, DataViewMode dataViewMode)
 			_dataViewMode = dataViewMode;
 		}
 				
-		/// <summary>
-		/// Retrieves a list of extras configured for the product according to any defined filter and sort criteria.
-		/// </summary>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <returns>
-		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductExtra"/>}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var productextra = new ProductExtra();
-		///   var productExtra = productextra.GetExtras(_dataViewMode,  productCode);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<Mozu.Api.Contracts.ProductAdmin.ProductExtra> GetExtras(string productCode)
-		{
-			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.ProductExtra>> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductExtraClient.GetExtrasClient(_dataViewMode,  productCode);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of extras configured for the product according to any defined filter and sort criteria.
+		/// 
 		/// </summary>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
+		/// <param name="productCode"></param>
 		/// <returns>
 		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductExtra"/>}
 		/// </returns>
@@ -81,48 +59,23 @@ public ProductExtraResource(IApiContext apiContext, DataViewMode dataViewMode)
 		///   var productExtra = await productextra.GetExtrasAsync(_dataViewMode,  productCode);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.ProductExtra>> GetExtrasAsync(string productCode)
+		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.ProductExtra>> GetExtrasAsync(string productCode, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.ProductExtra>> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductExtraClient.GetExtrasClient(_dataViewMode,  productCode);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves a collection of all localized delta price values for a product extra. Localized delta prices are deltas between two differing monetary conversion amounts between countries, such as US Dollar vs Euro.
-		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="value">The value string to create.</param>
-		/// <returns>
-		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductExtraValueDeltaPrice"/>}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var productextra = new ProductExtra();
-		///   var productExtraValueDeltaPrice = productextra.GetExtraValueLocalizedDeltaPrices(_dataViewMode,  productCode,  attributeFQN,  value);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<Mozu.Api.Contracts.ProductAdmin.ProductExtraValueDeltaPrice> GetExtraValueLocalizedDeltaPrices(string productCode, string attributeFQN, string value)
-		{
-			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.ProductExtraValueDeltaPrice>> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductExtraClient.GetExtraValueLocalizedDeltaPricesClient(_dataViewMode,  productCode,  attributeFQN,  value);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a collection of all localized delta price values for a product extra. Localized delta prices are deltas between two differing monetary conversion amounts between countries, such as US Dollar vs Euro.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="value">The value string to create.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="productCode"></param>
+		/// <param name="value"></param>
 		/// <returns>
 		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductExtraValueDeltaPrice"/>}
 		/// </returns>
@@ -132,52 +85,25 @@ public ProductExtraResource(IApiContext apiContext, DataViewMode dataViewMode)
 		///   var productExtraValueDeltaPrice = await productextra.GetExtraValueLocalizedDeltaPricesAsync(_dataViewMode,  productCode,  attributeFQN,  value);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.ProductExtraValueDeltaPrice>> GetExtraValueLocalizedDeltaPricesAsync(string productCode, string attributeFQN, string value)
+		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.ProductExtraValueDeltaPrice>> GetExtraValueLocalizedDeltaPricesAsync(string productCode, string attributeFQN, string value, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.ProductExtraValueDeltaPrice>> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductExtraClient.GetExtraValueLocalizedDeltaPricesClient(_dataViewMode,  productCode,  attributeFQN,  value);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the localized delta price value for a product extra. Localized delta prices are deltas between two differing monetary conversion amounts between countries, such as US Dollar vs Euro.
-		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="currencyCode">The three character ISO currency code, such as USD for US Dollars.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="value">The value string to create.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductExtraValueDeltaPrice"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var productextra = new ProductExtra();
-		///   var productExtraValueDeltaPrice = productextra.GetExtraValueLocalizedDeltaPrice(_dataViewMode,  productCode,  attributeFQN,  value,  currencyCode,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.ProductExtraValueDeltaPrice GetExtraValueLocalizedDeltaPrice(string productCode, string attributeFQN, string value, string currencyCode, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductExtraValueDeltaPrice> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductExtraClient.GetExtraValueLocalizedDeltaPriceClient(_dataViewMode,  productCode,  attributeFQN,  value,  currencyCode,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the localized delta price value for a product extra. Localized delta prices are deltas between two differing monetary conversion amounts between countries, such as US Dollar vs Euro.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="currencyCode">The three character ISO currency code, such as USD for US Dollars.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="value">The value string to create.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="currencyCode"></param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="value"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductExtraValueDeltaPrice"/>
 		/// </returns>
@@ -187,48 +113,23 @@ public virtual Mozu.Api.Contracts.ProductAdmin.ProductExtraValueDeltaPrice GetEx
 		///   var productExtraValueDeltaPrice = await productextra.GetExtraValueLocalizedDeltaPriceAsync(_dataViewMode,  productCode,  attributeFQN,  value,  currencyCode,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductExtraValueDeltaPrice> GetExtraValueLocalizedDeltaPriceAsync(string productCode, string attributeFQN, string value, string currencyCode, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductExtraValueDeltaPrice> GetExtraValueLocalizedDeltaPriceAsync(string productCode, string attributeFQN, string value, string currencyCode, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductExtraValueDeltaPrice> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductExtraClient.GetExtraValueLocalizedDeltaPriceClient(_dataViewMode,  productCode,  attributeFQN,  value,  currencyCode,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the details of an extra attribute configuration for the product specified in the request.
-		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductExtra"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var productextra = new ProductExtra();
-		///   var productExtra = productextra.GetExtra(_dataViewMode,  productCode,  attributeFQN,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.ProductExtra GetExtra(string productCode, string attributeFQN, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductExtra> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductExtraClient.GetExtraClient(_dataViewMode,  productCode,  attributeFQN,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of an extra attribute configuration for the product specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductExtra"/>
 		/// </returns>
@@ -238,52 +139,25 @@ public virtual Mozu.Api.Contracts.ProductAdmin.ProductExtra GetExtra(string prod
 		///   var productExtra = await productextra.GetExtraAsync(_dataViewMode,  productCode,  attributeFQN,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductExtra> GetExtraAsync(string productCode, string attributeFQN, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductExtra> GetExtraAsync(string productCode, string attributeFQN, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductExtra> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductExtraClient.GetExtraClient(_dataViewMode,  productCode,  attributeFQN,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Adds a localized delta price value for a product extra. Localized delta prices are deltas between two differing monetary conversion amounts between countries, such as US Dollar vs Euro.
-		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="value">The value string to create.</param>
-		/// <param name="localizedDeltaPrice">The properties of the price difference between the product extra and the base product.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductExtraValueDeltaPrice"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var productextra = new ProductExtra();
-		///   var productExtraValueDeltaPrice = productextra.AddExtraValueLocalizedDeltaPrice(_dataViewMode,  localizedDeltaPrice,  productCode,  attributeFQN,  value,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.ProductExtraValueDeltaPrice AddExtraValueLocalizedDeltaPrice(Mozu.Api.Contracts.ProductAdmin.ProductExtraValueDeltaPrice localizedDeltaPrice, string productCode, string attributeFQN, string value, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductExtraValueDeltaPrice> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductExtraClient.AddExtraValueLocalizedDeltaPriceClient(_dataViewMode,  localizedDeltaPrice,  productCode,  attributeFQN,  value,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Adds a localized delta price value for a product extra. Localized delta prices are deltas between two differing monetary conversion amounts between countries, such as US Dollar vs Euro.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="value">The value string to create.</param>
-		/// <param name="localizedDeltaPrice">The properties of the price difference between the product extra and the base product.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="value"></param>
+		/// <param name="localizedDeltaPrice"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductExtraValueDeltaPrice"/>
 		/// </returns>
@@ -293,48 +167,23 @@ public virtual Mozu.Api.Contracts.ProductAdmin.ProductExtraValueDeltaPrice AddEx
 		///   var productExtraValueDeltaPrice = await productextra.AddExtraValueLocalizedDeltaPriceAsync(_dataViewMode,  localizedDeltaPrice,  productCode,  attributeFQN,  value,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductExtraValueDeltaPrice> AddExtraValueLocalizedDeltaPriceAsync(Mozu.Api.Contracts.ProductAdmin.ProductExtraValueDeltaPrice localizedDeltaPrice, string productCode, string attributeFQN, string value, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductExtraValueDeltaPrice> AddExtraValueLocalizedDeltaPriceAsync(Mozu.Api.Contracts.ProductAdmin.ProductExtraValueDeltaPrice localizedDeltaPrice, string productCode, string attributeFQN, string value, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductExtraValueDeltaPrice> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductExtraClient.AddExtraValueLocalizedDeltaPriceClient(_dataViewMode,  localizedDeltaPrice,  productCode,  attributeFQN,  value,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Configure an extra attribute for the product specified in the request.
-		/// </summary>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="productExtra">Properties of an extra attribute to defined for a product that is associated with a product type that uses the extra. Setting up extras for a product enables shopper-entered information, such as initials for a monogram.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductExtra"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var productextra = new ProductExtra();
-		///   var productExtra = productextra.AddExtra(_dataViewMode,  productExtra,  productCode,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.ProductExtra AddExtra(Mozu.Api.Contracts.ProductAdmin.ProductExtra productExtra, string productCode, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductExtra> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductExtraClient.AddExtraClient(_dataViewMode,  productExtra,  productCode,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Configure an extra attribute for the product specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="productExtra">Properties of an extra attribute to defined for a product that is associated with a product type that uses the extra. Setting up extras for a product enables shopper-entered information, such as initials for a monogram.</param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="productExtra">Properties of the product extra to configure for the specified product.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductExtra"/>
 		/// </returns>
@@ -344,50 +193,24 @@ public virtual Mozu.Api.Contracts.ProductAdmin.ProductExtra AddExtra(Mozu.Api.Co
 		///   var productExtra = await productextra.AddExtraAsync(_dataViewMode,  productExtra,  productCode,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductExtra> AddExtraAsync(Mozu.Api.Contracts.ProductAdmin.ProductExtra productExtra, string productCode, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductExtra> AddExtraAsync(Mozu.Api.Contracts.ProductAdmin.ProductExtra productExtra, string productCode, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductExtra> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductExtraClient.AddExtraClient(_dataViewMode,  productExtra,  productCode,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates all localized delta price values for a product extra. Localized delta prices are deltas between two differing monetary conversion amounts between countries, such as US Dollar vs Euro.
-		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="value">The value string to create.</param>
-		/// <param name="localizedDeltaPrice">The properties of the price difference between the product extra and the base product.</param>
-		/// <returns>
-		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductExtraValueDeltaPrice"/>}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var productextra = new ProductExtra();
-		///   var productExtraValueDeltaPrice = productextra.UpdateExtraValueLocalizedDeltaPrices(_dataViewMode,  localizedDeltaPrice,  productCode,  attributeFQN,  value);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<Mozu.Api.Contracts.ProductAdmin.ProductExtraValueDeltaPrice> UpdateExtraValueLocalizedDeltaPrices(List<Mozu.Api.Contracts.ProductAdmin.ProductExtraValueDeltaPrice> localizedDeltaPrice, string productCode, string attributeFQN, string value)
-		{
-			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.ProductExtraValueDeltaPrice>> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductExtraClient.UpdateExtraValueLocalizedDeltaPricesClient(_dataViewMode,  localizedDeltaPrice,  productCode,  attributeFQN,  value);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates all localized delta price values for a product extra. Localized delta prices are deltas between two differing monetary conversion amounts between countries, such as US Dollar vs Euro.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="value">The value string to create.</param>
-		/// <param name="localizedDeltaPrice">The properties of the price difference between the product extra and the base product.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="productCode"></param>
+		/// <param name="value"></param>
+		/// <param name="localizedDeltaPrice"></param>
 		/// <returns>
 		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductExtraValueDeltaPrice"/>}
 		/// </returns>
@@ -397,54 +220,26 @@ public virtual Mozu.Api.Contracts.ProductAdmin.ProductExtra AddExtra(Mozu.Api.Co
 		///   var productExtraValueDeltaPrice = await productextra.UpdateExtraValueLocalizedDeltaPricesAsync(_dataViewMode,  localizedDeltaPrice,  productCode,  attributeFQN,  value);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.ProductExtraValueDeltaPrice>> UpdateExtraValueLocalizedDeltaPricesAsync(List<Mozu.Api.Contracts.ProductAdmin.ProductExtraValueDeltaPrice> localizedDeltaPrice, string productCode, string attributeFQN, string value)
+		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.ProductExtraValueDeltaPrice>> UpdateExtraValueLocalizedDeltaPricesAsync(List<Mozu.Api.Contracts.ProductAdmin.ProductExtraValueDeltaPrice> localizedDeltaPrice, string productCode, string attributeFQN, string value, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.ProductExtraValueDeltaPrice>> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductExtraClient.UpdateExtraValueLocalizedDeltaPricesClient(_dataViewMode,  localizedDeltaPrice,  productCode,  attributeFQN,  value);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates the localized delta price value for a product extra. Localized delta prices are deltas between two differing monetary conversion amounts between countries, such as US Dollar vs Euro.
-		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="currencyCode">The three character ISO currency code, such as USD for US Dollars.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="value">The value string to create.</param>
-		/// <param name="localizedDeltaPrice">The properties of the price difference between the product extra and the base product.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductExtraValueDeltaPrice"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var productextra = new ProductExtra();
-		///   var productExtraValueDeltaPrice = productextra.UpdateExtraValueLocalizedDeltaPrice(_dataViewMode,  localizedDeltaPrice,  productCode,  attributeFQN,  value,  currencyCode,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.ProductExtraValueDeltaPrice UpdateExtraValueLocalizedDeltaPrice(Mozu.Api.Contracts.ProductAdmin.ProductExtraValueDeltaPrice localizedDeltaPrice, string productCode, string attributeFQN, string value, string currencyCode, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductExtraValueDeltaPrice> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductExtraClient.UpdateExtraValueLocalizedDeltaPriceClient(_dataViewMode,  localizedDeltaPrice,  productCode,  attributeFQN,  value,  currencyCode,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates the localized delta price value for a product extra. Localized delta prices are deltas between two differing monetary conversion amounts between countries, such as US Dollar vs Euro.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="currencyCode">The three character ISO currency code, such as USD for US Dollars.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="value">The value string to create.</param>
-		/// <param name="localizedDeltaPrice">The properties of the price difference between the product extra and the base product.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="currencyCode"></param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="value"></param>
+		/// <param name="localizedDeltaPrice"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductExtraValueDeltaPrice"/>
 		/// </returns>
@@ -454,50 +249,24 @@ public virtual Mozu.Api.Contracts.ProductAdmin.ProductExtraValueDeltaPrice Updat
 		///   var productExtraValueDeltaPrice = await productextra.UpdateExtraValueLocalizedDeltaPriceAsync(_dataViewMode,  localizedDeltaPrice,  productCode,  attributeFQN,  value,  currencyCode,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductExtraValueDeltaPrice> UpdateExtraValueLocalizedDeltaPriceAsync(Mozu.Api.Contracts.ProductAdmin.ProductExtraValueDeltaPrice localizedDeltaPrice, string productCode, string attributeFQN, string value, string currencyCode, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductExtraValueDeltaPrice> UpdateExtraValueLocalizedDeltaPriceAsync(Mozu.Api.Contracts.ProductAdmin.ProductExtraValueDeltaPrice localizedDeltaPrice, string productCode, string attributeFQN, string value, string currencyCode, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductExtraValueDeltaPrice> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductExtraClient.UpdateExtraValueLocalizedDeltaPriceClient(_dataViewMode,  localizedDeltaPrice,  productCode,  attributeFQN,  value,  currencyCode,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates the configuration of an extra attribute for the product specified in the request.
-		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="productExtra">Properties of an extra attribute to defined for a product that is associated with a product type that uses the extra. Setting up extras for a product enables shopper-entered information, such as initials for a monogram.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductExtra"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var productextra = new ProductExtra();
-		///   var productExtra = productextra.UpdateExtra(_dataViewMode,  productExtra,  productCode,  attributeFQN,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.ProductExtra UpdateExtra(Mozu.Api.Contracts.ProductAdmin.ProductExtra productExtra, string productCode, string attributeFQN, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductExtra> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductExtraClient.UpdateExtraClient(_dataViewMode,  productExtra,  productCode,  attributeFQN,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates the configuration of an extra attribute for the product specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="productExtra">Properties of an extra attribute to defined for a product that is associated with a product type that uses the extra. Setting up extras for a product enables shopper-entered information, such as initials for a monogram.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="productExtra">Properties of the extra attribute to update for the specified product.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductExtra"/>
 		/// </returns>
@@ -507,45 +276,22 @@ public virtual Mozu.Api.Contracts.ProductAdmin.ProductExtra UpdateExtra(Mozu.Api
 		///   var productExtra = await productextra.UpdateExtraAsync(_dataViewMode,  productExtra,  productCode,  attributeFQN,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductExtra> UpdateExtraAsync(Mozu.Api.Contracts.ProductAdmin.ProductExtra productExtra, string productCode, string attributeFQN, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductExtra> UpdateExtraAsync(Mozu.Api.Contracts.ProductAdmin.ProductExtra productExtra, string productCode, string attributeFQN, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductExtra> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductExtraClient.UpdateExtraClient(_dataViewMode,  productExtra,  productCode,  attributeFQN,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Delete a product extra configuration for the product specified in the request.
-		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var productextra = new ProductExtra();
-		///   productextra.DeleteExtra(_dataViewMode,  productCode,  attributeFQN);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteExtra(string productCode, string attributeFQN)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductExtraClient.DeleteExtraClient(_dataViewMode,  productCode,  attributeFQN);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Delete a product extra configuration for the product specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="productCode"></param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -555,48 +301,23 @@ public virtual void DeleteExtra(string productCode, string attributeFQN)
 		///   await productextra.DeleteExtraAsync(_dataViewMode,  productCode,  attributeFQN);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteExtraAsync(string productCode, string attributeFQN)
+		public virtual async Task DeleteExtraAsync(string productCode, string attributeFQN, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductExtraClient.DeleteExtraClient(_dataViewMode,  productCode,  attributeFQN);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
-		/// <summary>
-		/// Deletes the localized delta price value for a product extra. Localized delta prices are deltas between two differing monetary conversion amounts between countries, such as US Dollar vs Euro.
-		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="currencyCode">The three character ISO currency code, such as USD for US Dollars.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="value">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var productextra = new ProductExtra();
-		///   productextra.DeleteExtraValueLocalizedDeltaPrice(_dataViewMode,  productCode,  attributeFQN,  value,  currencyCode);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteExtraValueLocalizedDeltaPrice(string productCode, string attributeFQN, string value, string currencyCode)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductExtraClient.DeleteExtraValueLocalizedDeltaPriceClient(_dataViewMode,  productCode,  attributeFQN,  value,  currencyCode);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes the localized delta price value for a product extra. Localized delta prices are deltas between two differing monetary conversion amounts between countries, such as US Dollar vs Euro.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="currencyCode">The three character ISO currency code, such as USD for US Dollars.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="value">Use this field to include those fields which are not included by default.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="currencyCode"></param>
+		/// <param name="productCode"></param>
+		/// <param name="value"></param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -606,12 +327,12 @@ public virtual void DeleteExtraValueLocalizedDeltaPrice(string productCode, stri
 		///   await productextra.DeleteExtraValueLocalizedDeltaPriceAsync(_dataViewMode,  productCode,  attributeFQN,  value,  currencyCode);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteExtraValueLocalizedDeltaPriceAsync(string productCode, string attributeFQN, string value, string currencyCode)
+		public virtual async Task DeleteExtraValueLocalizedDeltaPriceAsync(string productCode, string attributeFQN, string value, string currencyCode, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductExtraClient.DeleteExtraValueLocalizedDeltaPriceClient(_dataViewMode,  productCode,  attributeFQN,  value,  currencyCode);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/Catalog/Admin/Products/ProductOptionResource.cs b/Mozu.Api/Resources/Commerce/Catalog/Admin/Products/ProductOptionResource.cs
old mode 100644
new mode 100755
index 5544f889..f3839b30
--- a/Mozu.Api/Resources/Commerce/Catalog/Admin/Products/ProductOptionResource.cs
+++ b/Mozu.Api/Resources/Commerce/Catalog/Admin/Products/ProductOptionResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Catalog.Admin.Products
 {
@@ -44,34 +45,11 @@ public ProductOptionResource(IApiContext apiContext, DataViewMode dataViewMode)
 			_dataViewMode = dataViewMode;
 		}
 				
-		/// <summary>
-		/// Retrieves a list of all option attributes configured for the product specified in the request.
-		/// </summary>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <returns>
-		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductOption"/>}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var productoption = new ProductOption();
-		///   var productOption = productoption.GetOptions(_dataViewMode,  productCode);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<Mozu.Api.Contracts.ProductAdmin.ProductOption> GetOptions(string productCode)
-		{
-			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.ProductOption>> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductOptionClient.GetOptionsClient(_dataViewMode,  productCode);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of all option attributes configured for the product specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
+		/// <param name="productCode"></param>
 		/// <returns>
 		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductOption"/>}
 		/// </returns>
@@ -81,48 +59,23 @@ public ProductOptionResource(IApiContext apiContext, DataViewMode dataViewMode)
 		///   var productOption = await productoption.GetOptionsAsync(_dataViewMode,  productCode);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.ProductOption>> GetOptionsAsync(string productCode)
+		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.ProductOption>> GetOptionsAsync(string productCode, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.ProductOption>> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductOptionClient.GetOptionsClient(_dataViewMode,  productCode);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the details of an option attribute configuration for the specified product.
-		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductOption"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var productoption = new ProductOption();
-		///   var productOption = productoption.GetOption(_dataViewMode,  productCode,  attributeFQN,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.ProductOption GetOption(string productCode, string attributeFQN, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductOption> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductOptionClient.GetOptionClient(_dataViewMode,  productCode,  attributeFQN,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of an option attribute configuration for the specified product.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductOption"/>
 		/// </returns>
@@ -132,48 +85,23 @@ public virtual Mozu.Api.Contracts.ProductAdmin.ProductOption GetOption(string pr
 		///   var productOption = await productoption.GetOptionAsync(_dataViewMode,  productCode,  attributeFQN,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductOption> GetOptionAsync(string productCode, string attributeFQN, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductOption> GetOptionAsync(string productCode, string attributeFQN, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductOption> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductOptionClient.GetOptionClient(_dataViewMode,  productCode,  attributeFQN,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Configures an option attribute for the product specified in the request.
-		/// </summary>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="productOption">Properties of the product option to create such as attribute detail, fully qualified name, and list of product option values.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductOption"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var productoption = new ProductOption();
-		///   var productOption = productoption.AddOption(_dataViewMode,  productOption,  productCode,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.ProductOption AddOption(Mozu.Api.Contracts.ProductAdmin.ProductOption productOption, string productCode, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductOption> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductOptionClient.AddOptionClient(_dataViewMode,  productOption,  productCode,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Configures an option attribute for the product specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="productOption">Properties of the product option to create such as attribute detail, fully qualified name, and list of product option values.</param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="productOption">Properties of the option attribute to define for the product.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductOption"/>
 		/// </returns>
@@ -183,50 +111,24 @@ public virtual Mozu.Api.Contracts.ProductAdmin.ProductOption AddOption(Mozu.Api.
 		///   var productOption = await productoption.AddOptionAsync(_dataViewMode,  productOption,  productCode,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductOption> AddOptionAsync(Mozu.Api.Contracts.ProductAdmin.ProductOption productOption, string productCode, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductOption> AddOptionAsync(Mozu.Api.Contracts.ProductAdmin.ProductOption productOption, string productCode, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductOption> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductOptionClient.AddOptionClient(_dataViewMode,  productOption,  productCode,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates one or more properties of an option attribute configured for a product.
-		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="productOption">Properties of the product option to create such as attribute detail, fully qualified name, and list of product option values.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductOption"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var productoption = new ProductOption();
-		///   var productOption = productoption.UpdateOption(_dataViewMode,  productOption,  productCode,  attributeFQN,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.ProductOption UpdateOption(Mozu.Api.Contracts.ProductAdmin.ProductOption productOption, string productCode, string attributeFQN, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductOption> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductOptionClient.UpdateOptionClient(_dataViewMode,  productOption,  productCode,  attributeFQN,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates one or more properties of an option attribute configured for a product.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="productOption">Properties of the product option to create such as attribute detail, fully qualified name, and list of product option values.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="productOption">Properties of the product option attribute configuration to update.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductOption"/>
 		/// </returns>
@@ -236,45 +138,22 @@ public virtual Mozu.Api.Contracts.ProductAdmin.ProductOption UpdateOption(Mozu.A
 		///   var productOption = await productoption.UpdateOptionAsync(_dataViewMode,  productOption,  productCode,  attributeFQN,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductOption> UpdateOptionAsync(Mozu.Api.Contracts.ProductAdmin.ProductOption productOption, string productCode, string attributeFQN, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductOption> UpdateOptionAsync(Mozu.Api.Contracts.ProductAdmin.ProductOption productOption, string productCode, string attributeFQN, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductOption> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductOptionClient.UpdateOptionClient(_dataViewMode,  productOption,  productCode,  attributeFQN,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Deletes the configuration of an option attribute for the product specified in the request.
-		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var productoption = new ProductOption();
-		///   productoption.DeleteOption(_dataViewMode,  productCode,  attributeFQN);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteOption(string productCode, string attributeFQN)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductOptionClient.DeleteOptionClient(_dataViewMode,  productCode,  attributeFQN);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes the configuration of an option attribute for the product specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="productCode"></param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -284,12 +163,12 @@ public virtual void DeleteOption(string productCode, string attributeFQN)
 		///   await productoption.DeleteOptionAsync(_dataViewMode,  productCode,  attributeFQN);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteOptionAsync(string productCode, string attributeFQN)
+		public virtual async Task DeleteOptionAsync(string productCode, string attributeFQN, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductOptionClient.DeleteOptionClient(_dataViewMode,  productCode,  attributeFQN);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/Catalog/Admin/Products/ProductPropertyResource.cs b/Mozu.Api/Resources/Commerce/Catalog/Admin/Products/ProductPropertyResource.cs
old mode 100644
new mode 100755
index 71d33c2f..dd656563
--- a/Mozu.Api/Resources/Commerce/Catalog/Admin/Products/ProductPropertyResource.cs
+++ b/Mozu.Api/Resources/Commerce/Catalog/Admin/Products/ProductPropertyResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Catalog.Admin.Products
 {
@@ -44,34 +45,11 @@ public ProductPropertyResource(IApiContext apiContext, DataViewMode dataViewMode
 			_dataViewMode = dataViewMode;
 		}
 				
-		/// <summary>
-		/// Retrieves a list of the property attributes configured for the product specified in the request.
-		/// </summary>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <returns>
-		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductProperty"/>}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var productproperty = new ProductProperty();
-		///   var productProperty = productproperty.GetProperties(_dataViewMode,  productCode);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<Mozu.Api.Contracts.ProductAdmin.ProductProperty> GetProperties(string productCode)
-		{
-			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.ProductProperty>> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductPropertyClient.GetPropertiesClient(_dataViewMode,  productCode);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of the property attributes configured for the product specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
+		/// <param name="productCode"></param>
 		/// <returns>
 		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductProperty"/>}
 		/// </returns>
@@ -81,48 +59,23 @@ public ProductPropertyResource(IApiContext apiContext, DataViewMode dataViewMode
 		///   var productProperty = await productproperty.GetPropertiesAsync(_dataViewMode,  productCode);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.ProductProperty>> GetPropertiesAsync(string productCode)
+		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.ProductProperty>> GetPropertiesAsync(string productCode, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.ProductProperty>> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductPropertyClient.GetPropertiesClient(_dataViewMode,  productCode);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves a collection of property values for localized content. This content is set by the locale code. 
-		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="value">The value string to create.</param>
-		/// <returns>
-		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductPropertyValueLocalizedContent"/>}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var productproperty = new ProductProperty();
-		///   var productPropertyValueLocalizedContent = productproperty.GetPropertyValueLocalizedContents(_dataViewMode,  productCode,  attributeFQN,  value);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<Mozu.Api.Contracts.ProductAdmin.ProductPropertyValueLocalizedContent> GetPropertyValueLocalizedContents(string productCode, string attributeFQN, string value)
-		{
-			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.ProductPropertyValueLocalizedContent>> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductPropertyClient.GetPropertyValueLocalizedContentsClient(_dataViewMode,  productCode,  attributeFQN,  value);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a collection of property values for localized content. This content is set by the locale code. 
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="value">The value string to create.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="productCode"></param>
+		/// <param name="value"></param>
 		/// <returns>
 		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductPropertyValueLocalizedContent"/>}
 		/// </returns>
@@ -132,52 +85,25 @@ public ProductPropertyResource(IApiContext apiContext, DataViewMode dataViewMode
 		///   var productPropertyValueLocalizedContent = await productproperty.GetPropertyValueLocalizedContentsAsync(_dataViewMode,  productCode,  attributeFQN,  value);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.ProductPropertyValueLocalizedContent>> GetPropertyValueLocalizedContentsAsync(string productCode, string attributeFQN, string value)
+		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.ProductPropertyValueLocalizedContent>> GetPropertyValueLocalizedContentsAsync(string productCode, string attributeFQN, string value, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.ProductPropertyValueLocalizedContent>> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductPropertyClient.GetPropertyValueLocalizedContentsClient(_dataViewMode,  productCode,  attributeFQN,  value);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the property value for localized content. This content is set by the locale code. 
-		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="localeCode">Language used for the entity. Currently, only "en-US" is supported.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="value">The value string to create.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductPropertyValueLocalizedContent"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var productproperty = new ProductProperty();
-		///   var productPropertyValueLocalizedContent = productproperty.GetPropertyValueLocalizedContent(_dataViewMode,  productCode,  attributeFQN,  value,  localeCode,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.ProductPropertyValueLocalizedContent GetPropertyValueLocalizedContent(string productCode, string attributeFQN, string value, string localeCode, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductPropertyValueLocalizedContent> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductPropertyClient.GetPropertyValueLocalizedContentClient(_dataViewMode,  productCode,  attributeFQN,  value,  localeCode,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the property value for localized content. This content is set by the locale code. 
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="localeCode">Language used for the entity. Currently, only "en-US" is supported.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="value">The value string to create.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="localeCode"></param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="value"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductPropertyValueLocalizedContent"/>
 		/// </returns>
@@ -187,48 +113,23 @@ public virtual Mozu.Api.Contracts.ProductAdmin.ProductPropertyValueLocalizedCont
 		///   var productPropertyValueLocalizedContent = await productproperty.GetPropertyValueLocalizedContentAsync(_dataViewMode,  productCode,  attributeFQN,  value,  localeCode,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductPropertyValueLocalizedContent> GetPropertyValueLocalizedContentAsync(string productCode, string attributeFQN, string value, string localeCode, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductPropertyValueLocalizedContent> GetPropertyValueLocalizedContentAsync(string productCode, string attributeFQN, string value, string localeCode, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductPropertyValueLocalizedContent> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductPropertyClient.GetPropertyValueLocalizedContentClient(_dataViewMode,  productCode,  attributeFQN,  value,  localeCode,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the details of a property attribute configuration for the product specified in the request.
-		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductProperty"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var productproperty = new ProductProperty();
-		///   var productProperty = productproperty.GetProperty(_dataViewMode,  productCode,  attributeFQN,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.ProductProperty GetProperty(string productCode, string attributeFQN, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductProperty> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductPropertyClient.GetPropertyClient(_dataViewMode,  productCode,  attributeFQN,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of a property attribute configuration for the product specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductProperty"/>
 		/// </returns>
@@ -238,52 +139,25 @@ public virtual Mozu.Api.Contracts.ProductAdmin.ProductProperty GetProperty(strin
 		///   var productProperty = await productproperty.GetPropertyAsync(_dataViewMode,  productCode,  attributeFQN,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductProperty> GetPropertyAsync(string productCode, string attributeFQN, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductProperty> GetPropertyAsync(string productCode, string attributeFQN, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductProperty> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductPropertyClient.GetPropertyClient(_dataViewMode,  productCode,  attributeFQN,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Adds a property value for localized content. This content is set by the locale code. 
-		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="value">The value string to create.</param>
-		/// <param name="localizedContent">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductPropertyValueLocalizedContent"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var productproperty = new ProductProperty();
-		///   var productPropertyValueLocalizedContent = productproperty.AddPropertyValueLocalizedContent(_dataViewMode,  localizedContent,  productCode,  attributeFQN,  value,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.ProductPropertyValueLocalizedContent AddPropertyValueLocalizedContent(Mozu.Api.Contracts.ProductAdmin.ProductPropertyValueLocalizedContent localizedContent, string productCode, string attributeFQN, string value, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductPropertyValueLocalizedContent> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductPropertyClient.AddPropertyValueLocalizedContentClient(_dataViewMode,  localizedContent,  productCode,  attributeFQN,  value,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Adds a property value for localized content. This content is set by the locale code. 
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="value">The value string to create.</param>
-		/// <param name="localizedContent">Use this field to include those fields which are not included by default.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="value"></param>
+		/// <param name="localizedContent"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductPropertyValueLocalizedContent"/>
 		/// </returns>
@@ -293,48 +167,23 @@ public virtual Mozu.Api.Contracts.ProductAdmin.ProductPropertyValueLocalizedCont
 		///   var productPropertyValueLocalizedContent = await productproperty.AddPropertyValueLocalizedContentAsync(_dataViewMode,  localizedContent,  productCode,  attributeFQN,  value,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductPropertyValueLocalizedContent> AddPropertyValueLocalizedContentAsync(Mozu.Api.Contracts.ProductAdmin.ProductPropertyValueLocalizedContent localizedContent, string productCode, string attributeFQN, string value, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductPropertyValueLocalizedContent> AddPropertyValueLocalizedContentAsync(Mozu.Api.Contracts.ProductAdmin.ProductPropertyValueLocalizedContent localizedContent, string productCode, string attributeFQN, string value, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductPropertyValueLocalizedContent> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductPropertyClient.AddPropertyValueLocalizedContentClient(_dataViewMode,  localizedContent,  productCode,  attributeFQN,  value,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Configures a property attribute for the product specified in the request.
-		/// </summary>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="productProperty">Details of a property defined for a product.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductProperty"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var productproperty = new ProductProperty();
-		///   var productProperty = productproperty.AddProperty(_dataViewMode,  productProperty,  productCode,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.ProductProperty AddProperty(Mozu.Api.Contracts.ProductAdmin.ProductProperty productProperty, string productCode, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductProperty> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductPropertyClient.AddPropertyClient(_dataViewMode,  productProperty,  productCode,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Configures a property attribute for the product specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="productProperty">Details of a property defined for a product.</param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="productProperty">Properties of the property attribute to configure for a product.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductProperty"/>
 		/// </returns>
@@ -344,50 +193,24 @@ public virtual Mozu.Api.Contracts.ProductAdmin.ProductProperty AddProperty(Mozu.
 		///   var productProperty = await productproperty.AddPropertyAsync(_dataViewMode,  productProperty,  productCode,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductProperty> AddPropertyAsync(Mozu.Api.Contracts.ProductAdmin.ProductProperty productProperty, string productCode, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductProperty> AddPropertyAsync(Mozu.Api.Contracts.ProductAdmin.ProductProperty productProperty, string productCode, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductProperty> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductPropertyClient.AddPropertyClient(_dataViewMode,  productProperty,  productCode,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates all property values for localized content. This content is set by the locale code. 
-		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="value">The value string to create.</param>
-		/// <param name="localizedContent">Content of the product property value in the language defined for the locale code.</param>
-		/// <returns>
-		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductPropertyValueLocalizedContent"/>}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var productproperty = new ProductProperty();
-		///   var productPropertyValueLocalizedContent = productproperty.UpdatePropertyValueLocalizedContents(_dataViewMode,  localizedContent,  productCode,  attributeFQN,  value);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<Mozu.Api.Contracts.ProductAdmin.ProductPropertyValueLocalizedContent> UpdatePropertyValueLocalizedContents(List<Mozu.Api.Contracts.ProductAdmin.ProductPropertyValueLocalizedContent> localizedContent, string productCode, string attributeFQN, string value)
-		{
-			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.ProductPropertyValueLocalizedContent>> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductPropertyClient.UpdatePropertyValueLocalizedContentsClient(_dataViewMode,  localizedContent,  productCode,  attributeFQN,  value);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates all property values for localized content. This content is set by the locale code. 
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="value">The value string to create.</param>
-		/// <param name="localizedContent">Content of the product property value in the language defined for the locale code.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="productCode"></param>
+		/// <param name="value"></param>
+		/// <param name="localizedContent"></param>
 		/// <returns>
 		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductPropertyValueLocalizedContent"/>}
 		/// </returns>
@@ -397,54 +220,26 @@ public virtual Mozu.Api.Contracts.ProductAdmin.ProductProperty AddProperty(Mozu.
 		///   var productPropertyValueLocalizedContent = await productproperty.UpdatePropertyValueLocalizedContentsAsync(_dataViewMode,  localizedContent,  productCode,  attributeFQN,  value);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.ProductPropertyValueLocalizedContent>> UpdatePropertyValueLocalizedContentsAsync(List<Mozu.Api.Contracts.ProductAdmin.ProductPropertyValueLocalizedContent> localizedContent, string productCode, string attributeFQN, string value)
+		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.ProductPropertyValueLocalizedContent>> UpdatePropertyValueLocalizedContentsAsync(List<Mozu.Api.Contracts.ProductAdmin.ProductPropertyValueLocalizedContent> localizedContent, string productCode, string attributeFQN, string value, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.ProductPropertyValueLocalizedContent>> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductPropertyClient.UpdatePropertyValueLocalizedContentsClient(_dataViewMode,  localizedContent,  productCode,  attributeFQN,  value);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates the property value for localized content. This content is set by the locale code. 
-		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="localeCode">Language used for the entity. Currently, only "en-US" is supported.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="value">The value string to create.</param>
-		/// <param name="localizedContent">Content of the product property value in the language defined for the locale code.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductPropertyValueLocalizedContent"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var productproperty = new ProductProperty();
-		///   var productPropertyValueLocalizedContent = productproperty.UpdatePropertyValueLocalizedContent(_dataViewMode,  localizedContent,  productCode,  attributeFQN,  value,  localeCode,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.ProductPropertyValueLocalizedContent UpdatePropertyValueLocalizedContent(Mozu.Api.Contracts.ProductAdmin.ProductPropertyValueLocalizedContent localizedContent, string productCode, string attributeFQN, string value, string localeCode, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductPropertyValueLocalizedContent> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductPropertyClient.UpdatePropertyValueLocalizedContentClient(_dataViewMode,  localizedContent,  productCode,  attributeFQN,  value,  localeCode,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates the property value for localized content. This content is set by the locale code. 
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="localeCode">Language used for the entity. Currently, only "en-US" is supported.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="value">The value string to create.</param>
-		/// <param name="localizedContent">Content of the product property value in the language defined for the locale code.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="localeCode"></param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="value"></param>
+		/// <param name="localizedContent"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductPropertyValueLocalizedContent"/>
 		/// </returns>
@@ -454,50 +249,24 @@ public virtual Mozu.Api.Contracts.ProductAdmin.ProductPropertyValueLocalizedCont
 		///   var productPropertyValueLocalizedContent = await productproperty.UpdatePropertyValueLocalizedContentAsync(_dataViewMode,  localizedContent,  productCode,  attributeFQN,  value,  localeCode,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductPropertyValueLocalizedContent> UpdatePropertyValueLocalizedContentAsync(Mozu.Api.Contracts.ProductAdmin.ProductPropertyValueLocalizedContent localizedContent, string productCode, string attributeFQN, string value, string localeCode, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductPropertyValueLocalizedContent> UpdatePropertyValueLocalizedContentAsync(Mozu.Api.Contracts.ProductAdmin.ProductPropertyValueLocalizedContent localizedContent, string productCode, string attributeFQN, string value, string localeCode, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductPropertyValueLocalizedContent> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductPropertyClient.UpdatePropertyValueLocalizedContentClient(_dataViewMode,  localizedContent,  productCode,  attributeFQN,  value,  localeCode,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Update one or more details of a property attribute configuration for the product specified in the request.
-		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="productProperty">Details of a property defined for a product.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductProperty"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var productproperty = new ProductProperty();
-		///   var productProperty = productproperty.UpdateProperty(_dataViewMode,  productProperty,  productCode,  attributeFQN,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.ProductProperty UpdateProperty(Mozu.Api.Contracts.ProductAdmin.ProductProperty productProperty, string productCode, string attributeFQN, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductProperty> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductPropertyClient.UpdatePropertyClient(_dataViewMode,  productProperty,  productCode,  attributeFQN,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Update one or more details of a property attribute configuration for the product specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="productProperty">Details of a property defined for a product.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="productProperty">Details of the property attribute to update for the product configuration.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductProperty"/>
 		/// </returns>
@@ -507,45 +276,22 @@ public virtual Mozu.Api.Contracts.ProductAdmin.ProductProperty UpdateProperty(Mo
 		///   var productProperty = await productproperty.UpdatePropertyAsync(_dataViewMode,  productProperty,  productCode,  attributeFQN,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductProperty> UpdatePropertyAsync(Mozu.Api.Contracts.ProductAdmin.ProductProperty productProperty, string productCode, string attributeFQN, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductProperty> UpdatePropertyAsync(Mozu.Api.Contracts.ProductAdmin.ProductProperty productProperty, string productCode, string attributeFQN, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductProperty> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductPropertyClient.UpdatePropertyClient(_dataViewMode,  productProperty,  productCode,  attributeFQN,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Deletes the configuration of a property attribute for the product specified in the request.
-		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var productproperty = new ProductProperty();
-		///   productproperty.DeleteProperty(_dataViewMode,  productCode,  attributeFQN);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteProperty(string productCode, string attributeFQN)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductPropertyClient.DeletePropertyClient(_dataViewMode,  productCode,  attributeFQN);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes the configuration of a property attribute for the product specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="productCode"></param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -555,48 +301,23 @@ public virtual void DeleteProperty(string productCode, string attributeFQN)
 		///   await productproperty.DeletePropertyAsync(_dataViewMode,  productCode,  attributeFQN);
 		/// </code>
 		/// </example>
-		public virtual async Task DeletePropertyAsync(string productCode, string attributeFQN)
+		public virtual async Task DeletePropertyAsync(string productCode, string attributeFQN, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductPropertyClient.DeletePropertyClient(_dataViewMode,  productCode,  attributeFQN);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
-		/// <summary>
-		/// Deletes the property value for localized content. This content is set by the locale code. 
-		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="localeCode">Language used for the entity. Currently, only "en-US" is supported.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="value">The value string to create.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var productproperty = new ProductProperty();
-		///   productproperty.DeletePropertyValueLocalizedContent(_dataViewMode,  productCode,  attributeFQN,  value,  localeCode);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeletePropertyValueLocalizedContent(string productCode, string attributeFQN, string value, string localeCode)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductPropertyClient.DeletePropertyValueLocalizedContentClient(_dataViewMode,  productCode,  attributeFQN,  value,  localeCode);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes the property value for localized content. This content is set by the locale code. 
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="localeCode">Language used for the entity. Currently, only "en-US" is supported.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="value">The value string to create.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="localeCode"></param>
+		/// <param name="productCode"></param>
+		/// <param name="value"></param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -606,12 +327,12 @@ public virtual void DeletePropertyValueLocalizedContent(string productCode, stri
 		///   await productproperty.DeletePropertyValueLocalizedContentAsync(_dataViewMode,  productCode,  attributeFQN,  value,  localeCode);
 		/// </code>
 		/// </example>
-		public virtual async Task DeletePropertyValueLocalizedContentAsync(string productCode, string attributeFQN, string value, string localeCode)
+		public virtual async Task DeletePropertyValueLocalizedContentAsync(string productCode, string attributeFQN, string value, string localeCode, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductPropertyClient.DeletePropertyValueLocalizedContentClient(_dataViewMode,  productCode,  attributeFQN,  value,  localeCode);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/Catalog/Admin/Products/ProductVariationResource.cs b/Mozu.Api/Resources/Commerce/Catalog/Admin/Products/ProductVariationResource.cs
old mode 100644
new mode 100755
index 0a6e1992..163d13b7
--- a/Mozu.Api/Resources/Commerce/Catalog/Admin/Products/ProductVariationResource.cs
+++ b/Mozu.Api/Resources/Commerce/Catalog/Admin/Products/ProductVariationResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Catalog.Admin.Products
 {
@@ -44,36 +45,12 @@ public ProductVariationResource(IApiContext apiContext, DataViewMode dataViewMod
 			_dataViewMode = dataViewMode;
 		}
 				
-		/// <summary>
-		/// Retrieves a collection of the localized delta price values for a product variation. Localized delta prices are deltas between two differing monetary conversion amounts between countries, such as US Dollar vs Euro.
-		/// </summary>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="variationKey">System-generated key that represents the attribute values that uniquely identify a specific product variation.</param>
-		/// <returns>
-		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice"/>}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var productvariation = new ProductVariation();
-		///   var productVariationDeltaPrice = productvariation.GetProductVariationLocalizedDeltaPrices(_dataViewMode,  productCode,  variationKey);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice> GetProductVariationLocalizedDeltaPrices(string productCode, string variationKey)
-		{
-			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice>> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductVariationClient.GetProductVariationLocalizedDeltaPricesClient(_dataViewMode,  productCode,  variationKey);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a collection of the localized delta price values for a product variation. Localized delta prices are deltas between two differing monetary conversion amounts between countries, such as US Dollar vs Euro.
+		/// 
 		/// </summary>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="variationKey">System-generated key that represents the attribute values that uniquely identify a specific product variation.</param>
+		/// <param name="productCode"></param>
+		/// <param name="variationKey"></param>
 		/// <returns>
 		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice"/>}
 		/// </returns>
@@ -83,50 +60,24 @@ public ProductVariationResource(IApiContext apiContext, DataViewMode dataViewMod
 		///   var productVariationDeltaPrice = await productvariation.GetProductVariationLocalizedDeltaPricesAsync(_dataViewMode,  productCode,  variationKey);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice>> GetProductVariationLocalizedDeltaPricesAsync(string productCode, string variationKey)
+		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice>> GetProductVariationLocalizedDeltaPricesAsync(string productCode, string variationKey, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice>> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductVariationClient.GetProductVariationLocalizedDeltaPricesClient(_dataViewMode,  productCode,  variationKey);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the localized delta price value for a product variation. Localized delta prices are deltas between two differing monetary conversion amounts between countries, such as US Dollar vs Euro.
-		/// </summary>
-		/// <param name="currencyCode">The three character ISO currency code, such as USD for US Dollars.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="variationKey">System-generated key that represents the attribute values that uniquely identify a specific product variation.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var productvariation = new ProductVariation();
-		///   var productVariationDeltaPrice = productvariation.GetProductVariationLocalizedDeltaPrice(_dataViewMode,  productCode,  variationKey,  currencyCode,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice GetProductVariationLocalizedDeltaPrice(string productCode, string variationKey, string currencyCode, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductVariationClient.GetProductVariationLocalizedDeltaPriceClient(_dataViewMode,  productCode,  variationKey,  currencyCode,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the localized delta price value for a product variation. Localized delta prices are deltas between two differing monetary conversion amounts between countries, such as US Dollar vs Euro.
+		/// 
 		/// </summary>
-		/// <param name="currencyCode">The three character ISO currency code, such as USD for US Dollars.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="variationKey">System-generated key that represents the attribute values that uniquely identify a specific product variation.</param>
+		/// <param name="currencyCode"></param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="variationKey"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice"/>
 		/// </returns>
@@ -136,46 +87,22 @@ public virtual Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice GetPro
 		///   var productVariationDeltaPrice = await productvariation.GetProductVariationLocalizedDeltaPriceAsync(_dataViewMode,  productCode,  variationKey,  currencyCode,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice> GetProductVariationLocalizedDeltaPriceAsync(string productCode, string variationKey, string currencyCode, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice> GetProductVariationLocalizedDeltaPriceAsync(string productCode, string variationKey, string currencyCode, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductVariationClient.GetProductVariationLocalizedDeltaPriceClient(_dataViewMode,  productCode,  variationKey,  currencyCode,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves a list of details of the localized price values for a product variation.
-		/// </summary>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="variationKey">System-generated key that represents the attribute values that uniquely identify a specific product variation.</param>
-		/// <returns>
-		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice"/>}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var productvariation = new ProductVariation();
-		///   var productVariationFixedPrice = productvariation.GetProductVariationLocalizedPrices(_dataViewMode,  productCode,  variationKey);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice> GetProductVariationLocalizedPrices(string productCode, string variationKey)
-		{
-			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice>> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductVariationClient.GetProductVariationLocalizedPricesClient(_dataViewMode,  productCode,  variationKey);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of details of the localized price values for a product variation.
+		/// 
 		/// </summary>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="variationKey">System-generated key that represents the attribute values that uniquely identify a specific product variation.</param>
+		/// <param name="productCode"></param>
+		/// <param name="variationKey"></param>
 		/// <returns>
 		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice"/>}
 		/// </returns>
@@ -185,50 +112,24 @@ public virtual Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice GetPro
 		///   var productVariationFixedPrice = await productvariation.GetProductVariationLocalizedPricesAsync(_dataViewMode,  productCode,  variationKey);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice>> GetProductVariationLocalizedPricesAsync(string productCode, string variationKey)
+		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice>> GetProductVariationLocalizedPricesAsync(string productCode, string variationKey, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice>> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductVariationClient.GetProductVariationLocalizedPricesClient(_dataViewMode,  productCode,  variationKey);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the details of the localized price value for a product variation and a specific localized currency.
-		/// </summary>
-		/// <param name="currencyCode">The three character ISO currency code, such as USD for US Dollars.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="variationKey">System-generated key that represents the attribute values that uniquely identify a specific product variation.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var productvariation = new ProductVariation();
-		///   var productVariationFixedPrice = productvariation.GetProductVariationLocalizedPrice(_dataViewMode,  productCode,  variationKey,  currencyCode,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice GetProductVariationLocalizedPrice(string productCode, string variationKey, string currencyCode, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductVariationClient.GetProductVariationLocalizedPriceClient(_dataViewMode,  productCode,  variationKey,  currencyCode,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of the localized price value for a product variation and a specific localized currency.
+		/// 
 		/// </summary>
-		/// <param name="currencyCode">The three character ISO currency code, such as USD for US Dollars.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="variationKey">System-generated key that represents the attribute values that uniquely identify a specific product variation.</param>
+		/// <param name="currencyCode"></param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="variationKey"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice"/>
 		/// </returns>
@@ -238,47 +139,22 @@ public virtual Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice GetPro
 		///   var productVariationFixedPrice = await productvariation.GetProductVariationLocalizedPriceAsync(_dataViewMode,  productCode,  variationKey,  currencyCode,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice> GetProductVariationLocalizedPriceAsync(string productCode, string variationKey, string currencyCode, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice> GetProductVariationLocalizedPriceAsync(string productCode, string variationKey, string currencyCode, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductVariationClient.GetProductVariationLocalizedPriceClient(_dataViewMode,  productCode,  variationKey,  currencyCode,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the details of a product variation based on the supplied product code and variation key.
-		/// </summary>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="variationKey">System-generated key that represents the attribute values that uniquely identify a specific product variation.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductVariation"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var productvariation = new ProductVariation();
-		///   var productVariation = productvariation.GetProductVariation(_dataViewMode,  productCode,  variationKey,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.ProductVariation GetProductVariation(string productCode, string variationKey, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductVariation> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductVariationClient.GetProductVariationClient(_dataViewMode,  productCode,  variationKey,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of a product variation based on the supplied product code and variation key.
+		/// 
 		/// </summary>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
 		/// <param name="variationKey">System-generated key that represents the attribute values that uniquely identify a specific product variation.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductVariation"/>
@@ -289,54 +165,26 @@ public virtual Mozu.Api.Contracts.ProductAdmin.ProductVariation GetProductVariat
 		///   var productVariation = await productvariation.GetProductVariationAsync(_dataViewMode,  productCode,  variationKey,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductVariation> GetProductVariationAsync(string productCode, string variationKey, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductVariation> GetProductVariationAsync(string productCode, string variationKey, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductVariation> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductVariationClient.GetProductVariationClient(_dataViewMode,  productCode,  variationKey,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves a list of the product variations configured for the specified product code.
-		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductVariationPagedCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var productvariation = new ProductVariation();
-		///   var productVariationPagedCollection = productvariation.GetProductVariations(_dataViewMode,  productCode,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.ProductVariationPagedCollection GetProductVariations(string productCode, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductVariationPagedCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductVariationClient.GetProductVariationsClient(_dataViewMode,  productCode,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of the product variations configured for the specified product code.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductVariationPagedCollection"/>
 		/// </returns>
@@ -346,50 +194,24 @@ public virtual Mozu.Api.Contracts.ProductAdmin.ProductVariationPagedCollection G
 		///   var productVariationPagedCollection = await productvariation.GetProductVariationsAsync(_dataViewMode,  productCode,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductVariationPagedCollection> GetProductVariationsAsync(string productCode, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductVariationPagedCollection> GetProductVariationsAsync(string productCode, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductVariationPagedCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductVariationClient.GetProductVariationsClient(_dataViewMode,  productCode,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Adds the localized delta price value for a product variation. Localized delta prices are deltas between two differing monetary conversion amounts between countries, such as US Dollar vs Euro.
-		/// </summary>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="variationKey">System-generated key that represents the attribute values that uniquely identify a specific product variation.</param>
-		/// <param name="localizedDeltaPrice">The difference between the base price for the product and this variation of the product, which can be a positive or negative decimal value. For example, if the base price for a t-shirt product is $10, but the XL variation should cost $12, the DeltaPrice value should be "2". However, if the XS variation should only cost $8, the DeltaPrice value should be "-2".</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var productvariation = new ProductVariation();
-		///   var productVariationDeltaPrice = productvariation.AddProductVariationLocalizedDeltaPrice(_dataViewMode,  localizedDeltaPrice,  productCode,  variationKey,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice AddProductVariationLocalizedDeltaPrice(Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice localizedDeltaPrice, string productCode, string variationKey, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductVariationClient.AddProductVariationLocalizedDeltaPriceClient(_dataViewMode,  localizedDeltaPrice,  productCode,  variationKey,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Adds the localized delta price value for a product variation. Localized delta prices are deltas between two differing monetary conversion amounts between countries, such as US Dollar vs Euro.
+		/// 
 		/// </summary>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="variationKey">System-generated key that represents the attribute values that uniquely identify a specific product variation.</param>
-		/// <param name="localizedDeltaPrice">The difference between the base price for the product and this variation of the product, which can be a positive or negative decimal value. For example, if the base price for a t-shirt product is $10, but the XL variation should cost $12, the DeltaPrice value should be "2". However, if the XS variation should only cost $8, the DeltaPrice value should be "-2".</param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="variationKey"></param>
+		/// <param name="localizedDeltaPrice"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice"/>
 		/// </returns>
@@ -399,50 +221,24 @@ public virtual Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice AddPro
 		///   var productVariationDeltaPrice = await productvariation.AddProductVariationLocalizedDeltaPriceAsync(_dataViewMode,  localizedDeltaPrice,  productCode,  variationKey,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice> AddProductVariationLocalizedDeltaPriceAsync(Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice localizedDeltaPrice, string productCode, string variationKey, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice> AddProductVariationLocalizedDeltaPriceAsync(Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice localizedDeltaPrice, string productCode, string variationKey, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductVariationClient.AddProductVariationLocalizedDeltaPriceClient(_dataViewMode,  localizedDeltaPrice,  productCode,  variationKey,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Adds the localized price value for a product variation and a specific localized currency.
-		/// </summary>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="variationKey">System-generated key that represents the attribute values that uniquely identify a specific product variation.</param>
-		/// <param name="localizedPrice">The details of the product variation localized price.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var productvariation = new ProductVariation();
-		///   var productVariationFixedPrice = productvariation.AddProductVariationLocalizedPrice(_dataViewMode,  localizedPrice,  productCode,  variationKey,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice AddProductVariationLocalizedPrice(Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice localizedPrice, string productCode, string variationKey, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductVariationClient.AddProductVariationLocalizedPriceClient(_dataViewMode,  localizedPrice,  productCode,  variationKey,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Adds the localized price value for a product variation and a specific localized currency.
+		/// 
 		/// </summary>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="variationKey">System-generated key that represents the attribute values that uniquely identify a specific product variation.</param>
-		/// <param name="localizedPrice">The details of the product variation localized price.</param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="variationKey"></param>
+		/// <param name="localizedPrice"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice"/>
 		/// </returns>
@@ -452,48 +248,23 @@ public virtual Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice AddPro
 		///   var productVariationFixedPrice = await productvariation.AddProductVariationLocalizedPriceAsync(_dataViewMode,  localizedPrice,  productCode,  variationKey,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice> AddProductVariationLocalizedPriceAsync(Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice localizedPrice, string productCode, string variationKey, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice> AddProductVariationLocalizedPriceAsync(Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice localizedPrice, string productCode, string variationKey, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductVariationClient.AddProductVariationLocalizedPriceClient(_dataViewMode,  localizedPrice,  productCode,  variationKey,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates all localized delta price values for a product variation. Localized delta prices are deltas between two differing monetary conversion amounts between countries, such as US Dollar vs Euro.
-		/// </summary>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="variationKey">System-generated key that represents the attribute values that uniquely identify a specific product variation.</param>
-		/// <param name="localizedDeltaPrice">The difference between the base price for the product and this variation of the product, which can be a positive or negative decimal value. For example, if the base price for a t-shirt product is $10, but the XL variation should cost $12, the DeltaPrice value should be "2". However, if the XS variation should only cost $8, the DeltaPrice value should be "-2".</param>
-		/// <returns>
-		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice"/>}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var productvariation = new ProductVariation();
-		///   var productVariationDeltaPrice = productvariation.UpdateProductVariationLocalizedDeltaPrices(_dataViewMode,  localizedDeltaPrice,  productCode,  variationKey);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice> UpdateProductVariationLocalizedDeltaPrices(List<Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice> localizedDeltaPrice, string productCode, string variationKey)
-		{
-			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice>> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductVariationClient.UpdateProductVariationLocalizedDeltaPricesClient(_dataViewMode,  localizedDeltaPrice,  productCode,  variationKey);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates all localized delta price values for a product variation. Localized delta prices are deltas between two differing monetary conversion amounts between countries, such as US Dollar vs Euro.
+		/// 
 		/// </summary>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="variationKey">System-generated key that represents the attribute values that uniquely identify a specific product variation.</param>
-		/// <param name="localizedDeltaPrice">The difference between the base price for the product and this variation of the product, which can be a positive or negative decimal value. For example, if the base price for a t-shirt product is $10, but the XL variation should cost $12, the DeltaPrice value should be "2". However, if the XS variation should only cost $8, the DeltaPrice value should be "-2".</param>
+		/// <param name="productCode"></param>
+		/// <param name="variationKey"></param>
+		/// <param name="localizedDeltaPrice"></param>
 		/// <returns>
 		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice"/>}
 		/// </returns>
@@ -503,52 +274,25 @@ public virtual Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice AddPro
 		///   var productVariationDeltaPrice = await productvariation.UpdateProductVariationLocalizedDeltaPricesAsync(_dataViewMode,  localizedDeltaPrice,  productCode,  variationKey);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice>> UpdateProductVariationLocalizedDeltaPricesAsync(List<Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice> localizedDeltaPrice, string productCode, string variationKey)
+		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice>> UpdateProductVariationLocalizedDeltaPricesAsync(List<Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice> localizedDeltaPrice, string productCode, string variationKey, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice>> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductVariationClient.UpdateProductVariationLocalizedDeltaPricesClient(_dataViewMode,  localizedDeltaPrice,  productCode,  variationKey);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates the localized delta price value for a product variation. Localized delta prices are deltas between two differing monetary conversion amounts between countries, such as US Dollar vs Euro.
-		/// </summary>
-		/// <param name="currencyCode">The three character ISO currency code, such as USD for US Dollars.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="variationKey">System-generated key that represents the attribute values that uniquely identify a specific product variation.</param>
-		/// <param name="localizedDeltaPrice">The difference between the base price for the product and this variation of the product, which can be a positive or negative decimal value. For example, if the base price for a t-shirt product is $10, but the XL variation should cost $12, the DeltaPrice value should be "2". However, if the XS variation should only cost $8, the DeltaPrice value should be "-2".</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var productvariation = new ProductVariation();
-		///   var productVariationDeltaPrice = productvariation.UpdateProductVariationLocalizedDeltaPrice(_dataViewMode,  localizedDeltaPrice,  productCode,  variationKey,  currencyCode,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice UpdateProductVariationLocalizedDeltaPrice(Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice localizedDeltaPrice, string productCode, string variationKey, string currencyCode, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductVariationClient.UpdateProductVariationLocalizedDeltaPriceClient(_dataViewMode,  localizedDeltaPrice,  productCode,  variationKey,  currencyCode,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates the localized delta price value for a product variation. Localized delta prices are deltas between two differing monetary conversion amounts between countries, such as US Dollar vs Euro.
+		/// 
 		/// </summary>
-		/// <param name="currencyCode">The three character ISO currency code, such as USD for US Dollars.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="variationKey">System-generated key that represents the attribute values that uniquely identify a specific product variation.</param>
-		/// <param name="localizedDeltaPrice">The difference between the base price for the product and this variation of the product, which can be a positive or negative decimal value. For example, if the base price for a t-shirt product is $10, but the XL variation should cost $12, the DeltaPrice value should be "2". However, if the XS variation should only cost $8, the DeltaPrice value should be "-2".</param>
+		/// <param name="currencyCode"></param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="variationKey"></param>
+		/// <param name="localizedDeltaPrice"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice"/>
 		/// </returns>
@@ -558,48 +302,23 @@ public virtual Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice Update
 		///   var productVariationDeltaPrice = await productvariation.UpdateProductVariationLocalizedDeltaPriceAsync(_dataViewMode,  localizedDeltaPrice,  productCode,  variationKey,  currencyCode,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice> UpdateProductVariationLocalizedDeltaPriceAsync(Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice localizedDeltaPrice, string productCode, string variationKey, string currencyCode, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice> UpdateProductVariationLocalizedDeltaPriceAsync(Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice localizedDeltaPrice, string productCode, string variationKey, string currencyCode, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductVariationClient.UpdateProductVariationLocalizedDeltaPriceClient(_dataViewMode,  localizedDeltaPrice,  productCode,  variationKey,  currencyCode,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates a list of localized price values for a product variation.
-		/// </summary>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="variationKey">System-generated key that represents the attribute values that uniquely identify a specific product variation.</param>
-		/// <param name="localizedPrice">The details of the product variation localized price.</param>
-		/// <returns>
-		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice"/>}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var productvariation = new ProductVariation();
-		///   var productVariationFixedPrice = productvariation.UpdateProductVariationLocalizedPrices(_dataViewMode,  localizedPrice,  productCode,  variationKey);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice> UpdateProductVariationLocalizedPrices(List<Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice> localizedPrice, string productCode, string variationKey)
-		{
-			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice>> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductVariationClient.UpdateProductVariationLocalizedPricesClient(_dataViewMode,  localizedPrice,  productCode,  variationKey);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates a list of localized price values for a product variation.
+		/// 
 		/// </summary>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="variationKey">System-generated key that represents the attribute values that uniquely identify a specific product variation.</param>
-		/// <param name="localizedPrice">The details of the product variation localized price.</param>
+		/// <param name="productCode"></param>
+		/// <param name="variationKey"></param>
+		/// <param name="localizedPrice"></param>
 		/// <returns>
 		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice"/>}
 		/// </returns>
@@ -609,52 +328,25 @@ public virtual Mozu.Api.Contracts.ProductAdmin.ProductVariationDeltaPrice Update
 		///   var productVariationFixedPrice = await productvariation.UpdateProductVariationLocalizedPricesAsync(_dataViewMode,  localizedPrice,  productCode,  variationKey);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice>> UpdateProductVariationLocalizedPricesAsync(List<Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice> localizedPrice, string productCode, string variationKey)
+		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice>> UpdateProductVariationLocalizedPricesAsync(List<Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice> localizedPrice, string productCode, string variationKey, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice>> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductVariationClient.UpdateProductVariationLocalizedPricesClient(_dataViewMode,  localizedPrice,  productCode,  variationKey);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates the localized price value for a product variation and a specific localized currency.
-		/// </summary>
-		/// <param name="currencyCode">The three character ISO currency code, such as USD for US Dollars.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="variationKey">System-generated key that represents the attribute values that uniquely identify a specific product variation.</param>
-		/// <param name="localizedPrice">The details of the product variation localized price.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var productvariation = new ProductVariation();
-		///   var productVariationFixedPrice = productvariation.UpdateProductVariationLocalizedPrice(_dataViewMode,  localizedPrice,  productCode,  variationKey,  currencyCode,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice UpdateProductVariationLocalizedPrice(Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice localizedPrice, string productCode, string variationKey, string currencyCode, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductVariationClient.UpdateProductVariationLocalizedPriceClient(_dataViewMode,  localizedPrice,  productCode,  variationKey,  currencyCode,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates the localized price value for a product variation and a specific localized currency.
+		/// 
 		/// </summary>
-		/// <param name="currencyCode">The three character ISO currency code, such as USD for US Dollars.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="variationKey">System-generated key that represents the attribute values that uniquely identify a specific product variation.</param>
-		/// <param name="localizedPrice">The details of the product variation localized price.</param>
+		/// <param name="currencyCode"></param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="variationKey"></param>
+		/// <param name="localizedPrice"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice"/>
 		/// </returns>
@@ -664,50 +356,24 @@ public virtual Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice Update
 		///   var productVariationFixedPrice = await productvariation.UpdateProductVariationLocalizedPriceAsync(_dataViewMode,  localizedPrice,  productCode,  variationKey,  currencyCode,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice> UpdateProductVariationLocalizedPriceAsync(Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice localizedPrice, string productCode, string variationKey, string currencyCode, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice> UpdateProductVariationLocalizedPriceAsync(Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice localizedPrice, string productCode, string variationKey, string currencyCode, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductVariationFixedPrice> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductVariationClient.UpdateProductVariationLocalizedPriceClient(_dataViewMode,  localizedPrice,  productCode,  variationKey,  currencyCode,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Modifies the details of a variation, based on the supplied variation key, for the specified product code.
-		/// </summary>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="variationKey">System-generated key that represents the attribute values that uniquely identify a specific product variation.</param>
-		/// <param name="productVariation">Properties of a specific product variation.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductVariation"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var productvariation = new ProductVariation();
-		///   var productVariation = productvariation.UpdateProductVariation(_dataViewMode,  productVariation,  productCode,  variationKey,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.ProductVariation UpdateProductVariation(Mozu.Api.Contracts.ProductAdmin.ProductVariation productVariation, string productCode, string variationKey, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductVariation> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductVariationClient.UpdateProductVariationClient(_dataViewMode,  productVariation,  productCode,  variationKey,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Modifies the details of a variation, based on the supplied variation key, for the specified product code.
+		/// 
 		/// </summary>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
 		/// <param name="variationKey">System-generated key that represents the attribute values that uniquely identify a specific product variation.</param>
-		/// <param name="productVariation">Properties of a specific product variation.</param>
+		/// <param name="productVariation">Wrapper for the properties of the specified product variation.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductVariation"/>
 		/// </returns>
@@ -717,48 +383,23 @@ public virtual Mozu.Api.Contracts.ProductAdmin.ProductVariation UpdateProductVar
 		///   var productVariation = await productvariation.UpdateProductVariationAsync(_dataViewMode,  productVariation,  productCode,  variationKey,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductVariation> UpdateProductVariationAsync(Mozu.Api.Contracts.ProductAdmin.ProductVariation productVariation, string productCode, string variationKey, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductVariation> UpdateProductVariationAsync(Mozu.Api.Contracts.ProductAdmin.ProductVariation productVariation, string productCode, string variationKey, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductVariation> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductVariationClient.UpdateProductVariationClient(_dataViewMode,  productVariation,  productCode,  variationKey,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Modifies the collection of variations for the specified product code. Because this PUT replaces the existing resource, supply all information necessary to maintain for the product variation.
-		/// </summary>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="productVariations">Collection of variations configured for a product.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductVariationCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var productvariation = new ProductVariation();
-		///   var productVariationCollection = productvariation.UpdateProductVariations(_dataViewMode,  productVariations,  productCode,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.ProductVariationCollection UpdateProductVariations(Mozu.Api.Contracts.ProductAdmin.ProductVariationCollection productVariations, string productCode, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductVariationCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductVariationClient.UpdateProductVariationsClient(_dataViewMode,  productVariations,  productCode,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Modifies the collection of variations for the specified product code. Because this PUT replaces the existing resource, supply all information necessary to maintain for the product variation.
+		/// 
 		/// </summary>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="productVariations">Collection of variations configured for a product.</param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="productVariations">Wrapper for the collection of variations configured for the specified product code.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.ProductVariationCollection"/>
 		/// </returns>
@@ -768,44 +409,21 @@ public virtual Mozu.Api.Contracts.ProductAdmin.ProductVariationCollection Update
 		///   var productVariationCollection = await productvariation.UpdateProductVariationsAsync(_dataViewMode,  productVariations,  productCode,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductVariationCollection> UpdateProductVariationsAsync(Mozu.Api.Contracts.ProductAdmin.ProductVariationCollection productVariations, string productCode, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.ProductVariationCollection> UpdateProductVariationsAsync(Mozu.Api.Contracts.ProductAdmin.ProductVariationCollection productVariations, string productCode, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.ProductVariationCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductVariationClient.UpdateProductVariationsClient(_dataViewMode,  productVariations,  productCode,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Deletes a variation, based on the supplied variation key, for the specified product code.
-		/// </summary>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="variationKey">System-generated key that represents the attribute values that uniquely identify a specific product variation.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var productvariation = new ProductVariation();
-		///   productvariation.DeleteProductVariation(_dataViewMode,  productCode,  variationKey);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteProductVariation(string productCode, string variationKey)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductVariationClient.DeleteProductVariationClient(_dataViewMode,  productCode,  variationKey);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes a variation, based on the supplied variation key, for the specified product code.
+		/// 
 		/// </summary>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
+		/// <param name="productCode"></param>
 		/// <param name="variationKey">System-generated key that represents the attribute values that uniquely identify a specific product variation.</param>
 		/// <returns>
 		/// 
@@ -816,46 +434,22 @@ public virtual void DeleteProductVariation(string productCode, string variationK
 		///   await productvariation.DeleteProductVariationAsync(_dataViewMode,  productCode,  variationKey);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteProductVariationAsync(string productCode, string variationKey)
+		public virtual async Task DeleteProductVariationAsync(string productCode, string variationKey, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductVariationClient.DeleteProductVariationClient(_dataViewMode,  productCode,  variationKey);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
-		/// <summary>
-		/// Deletes the localized delta price value for a product variation. Localized delta prices are deltas between two differing monetary conversion amounts between countries, such as US Dollar vs Euro.
-		/// </summary>
-		/// <param name="currencyCode">The three character ISO currency code, such as USD for US Dollars.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="variationKey">System-generated key that represents the attribute values that uniquely identify a specific product variation.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var productvariation = new ProductVariation();
-		///   productvariation.DeleteProductVariationLocalizedDeltaPrice(_dataViewMode,  productCode,  variationKey,  currencyCode);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteProductVariationLocalizedDeltaPrice(string productCode, string variationKey, string currencyCode)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductVariationClient.DeleteProductVariationLocalizedDeltaPriceClient(_dataViewMode,  productCode,  variationKey,  currencyCode);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes the localized delta price value for a product variation. Localized delta prices are deltas between two differing monetary conversion amounts between countries, such as US Dollar vs Euro.
+		/// 
 		/// </summary>
-		/// <param name="currencyCode">The three character ISO currency code, such as USD for US Dollars.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="variationKey">System-generated key that represents the attribute values that uniquely identify a specific product variation.</param>
+		/// <param name="currencyCode"></param>
+		/// <param name="productCode"></param>
+		/// <param name="variationKey"></param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -865,46 +459,22 @@ public virtual void DeleteProductVariationLocalizedDeltaPrice(string productCode
 		///   await productvariation.DeleteProductVariationLocalizedDeltaPriceAsync(_dataViewMode,  productCode,  variationKey,  currencyCode);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteProductVariationLocalizedDeltaPriceAsync(string productCode, string variationKey, string currencyCode)
+		public virtual async Task DeleteProductVariationLocalizedDeltaPriceAsync(string productCode, string variationKey, string currencyCode, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductVariationClient.DeleteProductVariationLocalizedDeltaPriceClient(_dataViewMode,  productCode,  variationKey,  currencyCode);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
-		/// <summary>
-		/// Deletes the localized price value for a product variation and a specific localized currency.
-		/// </summary>
-		/// <param name="currencyCode">The three character ISO currency code, such as USD for US Dollars.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="variationKey">System-generated key that represents the attribute values that uniquely identify a specific product variation.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var productvariation = new ProductVariation();
-		///   productvariation.DeleteProductVariationLocalizedPrice(_dataViewMode,  productCode,  variationKey,  currencyCode);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteProductVariationLocalizedPrice(string productCode, string variationKey, string currencyCode)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductVariationClient.DeleteProductVariationLocalizedPriceClient(_dataViewMode,  productCode,  variationKey,  currencyCode);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes the localized price value for a product variation and a specific localized currency.
+		/// 
 		/// </summary>
-		/// <param name="currencyCode">The three character ISO currency code, such as USD for US Dollars.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="variationKey">System-generated key that represents the attribute values that uniquely identify a specific product variation.</param>
+		/// <param name="currencyCode"></param>
+		/// <param name="productCode"></param>
+		/// <param name="variationKey"></param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -914,12 +484,12 @@ public virtual void DeleteProductVariationLocalizedPrice(string productCode, str
 		///   await productvariation.DeleteProductVariationLocalizedPriceAsync(_dataViewMode,  productCode,  variationKey,  currencyCode);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteProductVariationLocalizedPriceAsync(string productCode, string variationKey, string currencyCode)
+		public virtual async Task DeleteProductVariationLocalizedPriceAsync(string productCode, string variationKey, string currencyCode, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.Products.ProductVariationClient.DeleteProductVariationLocalizedPriceClient(_dataViewMode,  productCode,  variationKey,  currencyCode);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/Catalog/Admin/PublishingScopeResource.cs b/Mozu.Api/Resources/Commerce/Catalog/Admin/PublishingScopeResource.cs
old mode 100644
new mode 100755
index 50787440..b58bab58
--- a/Mozu.Api/Resources/Commerce/Catalog/Admin/PublishingScopeResource.cs
+++ b/Mozu.Api/Resources/Commerce/Catalog/Admin/PublishingScopeResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Catalog.Admin
 {
 	/// <summary>
-	/// Use the Product Publishing resource to publish or discard pending changes to products in a master catalog, or to add or remove pending changes to and from product publish sets.You can use product publish sets to group pending product changes together and publish them all at the same time.
+	/// Use the Product Publishing resource to publish or discard pending changes to product definitions in the master catalog.
 	/// </summary>
 	public partial class PublishingScopeResource  	{
 		///
@@ -44,37 +45,12 @@ public PublishingScopeResource(IApiContext apiContext, DataViewMode dataViewMode
 			_dataViewMode = dataViewMode;
 		}
 				
-		/// <summary>
-		/// Retrieves the details of the specified product publish set.
-		/// </summary>
-		/// <param name="publishSetCode">The unique identifier of the publish set.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.PublishSet"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var publishingscope = new PublishingScope();
-		///   var publishSet = publishingscope.GetPublishSet( publishSetCode,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.PublishSet GetPublishSet(string publishSetCode, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.PublishSet> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.PublishingScopeClient.GetPublishSetClient( publishSetCode,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of the specified product publish set.
+		/// 
 		/// </summary>
-		/// <param name="publishSetCode">The unique identifier of the publish set.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="publishSetCode"></param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.PublishSet"/>
@@ -85,45 +61,21 @@ public virtual Mozu.Api.Contracts.ProductAdmin.PublishSet GetPublishSet(string p
 		///   var publishSet = await publishingscope.GetPublishSetAsync( publishSetCode,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.PublishSet> GetPublishSetAsync(string publishSetCode, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.PublishSet> GetPublishSetAsync(string publishSetCode, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.PublishSet> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.PublishingScopeClient.GetPublishSetClient( publishSetCode,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves a list of product publish sets and their properties, including the amount of pending product changes that are included in each one.
-		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.PublishSetCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var publishingscope = new PublishingScope();
-		///   var publishSetCollection = publishingscope.GetPublishSets( responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.PublishSetCollection GetPublishSets(string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.PublishSetCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.PublishingScopeClient.GetPublishSetsClient( responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of product publish sets and their properties, including the amount of pending product changes that are included in each one.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.PublishSetCollection"/>
@@ -134,45 +86,22 @@ public virtual Mozu.Api.Contracts.ProductAdmin.PublishSetCollection GetPublishSe
 		///   var publishSetCollection = await publishingscope.GetPublishSetsAsync( responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.PublishSetCollection> GetPublishSetsAsync(string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.PublishSetCollection> GetPublishSetsAsync(string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.PublishSetCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.PublishingScopeClient.GetPublishSetsClient( responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Deletes the draft version of product changes (pending product changes) for each product code specified in the request.
-		/// </summary>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="publishScope">Describes the scope of the product publishing update, which can include individual product codes or all pending changes.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var publishingscope = new PublishingScope();
-		///   publishingscope.DiscardDrafts(_dataViewMode,  publishScope);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DiscardDrafts(Mozu.Api.Contracts.ProductAdmin.PublishingScope publishScope)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.PublishingScopeClient.DiscardDraftsClient(_dataViewMode,  publishScope);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes the draft version of product changes (pending product changes) for each product code specified in the request.
+		/// 
 		/// </summary>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="publishScope">Describes the scope of the product publishing update, which can include individual product codes or all pending changes.</param>
+		/// <param name="publishScope">Properties of the pending product changes to include in this operation.</param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -182,44 +111,21 @@ public virtual void DiscardDrafts(Mozu.Api.Contracts.ProductAdmin.PublishingScop
 		///   await publishingscope.DiscardDraftsAsync(_dataViewMode,  publishScope);
 		/// </code>
 		/// </example>
-		public virtual async Task DiscardDraftsAsync(Mozu.Api.Contracts.ProductAdmin.PublishingScope publishScope)
+		public virtual async Task DiscardDraftsAsync(Mozu.Api.Contracts.ProductAdmin.PublishingScope publishScope, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.PublishingScopeClient.DiscardDraftsClient(_dataViewMode,  publishScope);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
-		/// <summary>
-		/// Publishes the draft version of product changes (pending product changes) for each product code specified in the request, and changes the product publish state to "live".
-		/// </summary>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="publishScope">Describes the scope of the product publishing update, which can include individual product codes or all pending changes.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var publishingscope = new PublishingScope();
-		///   publishingscope.PublishDrafts(_dataViewMode,  publishScope);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void PublishDrafts(Mozu.Api.Contracts.ProductAdmin.PublishingScope publishScope)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.PublishingScopeClient.PublishDraftsClient(_dataViewMode,  publishScope);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Publishes the draft version of product changes (pending product changes) for each product code specified in the request, and changes the product publish state to "live".
+		/// 
 		/// </summary>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="publishScope">Describes the scope of the product publishing update, which can include individual product codes or all pending changes.</param>
+		/// <param name="publishScope">Properties of the pending product changes to include in this operation.</param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -229,47 +135,22 @@ public virtual void PublishDrafts(Mozu.Api.Contracts.ProductAdmin.PublishingScop
 		///   await publishingscope.PublishDraftsAsync(_dataViewMode,  publishScope);
 		/// </code>
 		/// </example>
-		public virtual async Task PublishDraftsAsync(Mozu.Api.Contracts.ProductAdmin.PublishingScope publishScope)
+		public virtual async Task PublishDraftsAsync(Mozu.Api.Contracts.ProductAdmin.PublishingScope publishScope, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.PublishingScopeClient.PublishDraftsClient(_dataViewMode,  publishScope);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
-		/// <summary>
-		/// Assigns pending product changes to a specified product publish set. Use the code field to specify the product publish set.
-		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="publishSet">The details of the publish to which you want to assign products.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.PublishSet"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var publishingscope = new PublishingScope();
-		///   var publishSet = publishingscope.AssignProductsToPublishSet( publishSet,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.PublishSet AssignProductsToPublishSet(Mozu.Api.Contracts.ProductAdmin.PublishSet publishSet, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.PublishSet> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.PublishingScopeClient.AssignProductsToPublishSetClient( publishSet,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Assigns pending product changes to a specified product publish set. Use the code field to specify the product publish set.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="publishSet">The details of the publish to which you want to assign products.</param>
+		/// <param name="publishSet"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.PublishSet"/>
 		/// </returns>
@@ -279,46 +160,22 @@ public virtual Mozu.Api.Contracts.ProductAdmin.PublishSet AssignProductsToPublis
 		///   var publishSet = await publishingscope.AssignProductsToPublishSetAsync( publishSet,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.PublishSet> AssignProductsToPublishSetAsync(Mozu.Api.Contracts.ProductAdmin.PublishSet publishSet, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.PublishSet> AssignProductsToPublishSetAsync(Mozu.Api.Contracts.ProductAdmin.PublishSet publishSet, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.PublishSet> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.PublishingScopeClient.AssignProductsToPublishSetClient( publishSet,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Deletes the specified product publish set. If you set the discardDrafts parameter to true, this operation also deletes the product drafts assigned to the publish set.
-		/// </summary>
-		/// <param name="discardDrafts">Specifies whether to discard all the drafts assigned to the publish set when the publish set is deleted.</param>
-		/// <param name="publishSetCode">The unique identifier of the publish set.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var publishingscope = new PublishingScope();
-		///   publishingscope.DeletePublishSet( publishSetCode,  discardDrafts);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeletePublishSet(string publishSetCode, bool? discardDrafts =  null)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.PublishingScopeClient.DeletePublishSetClient( publishSetCode,  discardDrafts);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes the specified product publish set. If you set the discardDrafts parameter to true, this operation also deletes the product drafts assigned to the publish set.
+		/// 
 		/// </summary>
-		/// <param name="discardDrafts">Specifies whether to discard all the drafts assigned to the publish set when the publish set is deleted.</param>
-		/// <param name="publishSetCode">The unique identifier of the publish set.</param>
+		/// <param name="discardDrafts"></param>
+		/// <param name="publishSetCode"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		/// 
@@ -329,12 +186,12 @@ public virtual void DeletePublishSet(string publishSetCode, bool? discardDrafts
 		///   await publishingscope.DeletePublishSetAsync( publishSetCode,  discardDrafts);
 		/// </code>
 		/// </example>
-		public virtual async Task DeletePublishSetAsync(string publishSetCode, bool? discardDrafts =  null)
+		public virtual async Task DeletePublishSetAsync(string publishSetCode, bool? discardDrafts =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.PublishingScopeClient.DeletePublishSetClient( publishSetCode,  discardDrafts);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/Catalog/Admin/SearchResource.cs b/Mozu.Api/Resources/Commerce/Catalog/Admin/SearchResource.cs
old mode 100644
new mode 100755
index b2efb707..4812c15d
--- a/Mozu.Api/Resources/Commerce/Catalog/Admin/SearchResource.cs
+++ b/Mozu.Api/Resources/Commerce/Catalog/Admin/SearchResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Catalog.Admin
 {
 	/// <summary>
-	/// Use the Search resource to manage all settings and options for providing product search on your site, as well as search tuning rules.
+	/// 
 	/// </summary>
 	public partial class SearchResource  	{
 		///
@@ -37,36 +38,12 @@ public SearchResource CloneWithApiContext(Action<IApiContext> contextModificatio
 		}
 
 				
-		/// <summary>
-		/// Retrieves the details of the specified search tuning rule.
-		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="searchTuningRuleCode">The unique identifier of the search tuning rule.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRule"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var search = new Search();
-		///   var searchTuningRule = search.GetSearchTuningRule( searchTuningRuleCode,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRule GetSearchTuningRule(string searchTuningRuleCode, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRule> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.SearchClient.GetSearchTuningRuleClient( searchTuningRuleCode,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of the specified search tuning rule.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="searchTuningRuleCode">The unique identifier of the search tuning rule.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="searchTuningRuleCode"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRule"/>
 		/// </returns>
@@ -76,52 +53,25 @@ public virtual Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRule GetSearch
 		///   var searchTuningRule = await search.GetSearchTuningRuleAsync( searchTuningRuleCode,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRule> GetSearchTuningRuleAsync(string searchTuningRuleCode, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRule> GetSearchTuningRuleAsync(string searchTuningRuleCode, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRule> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.SearchClient.GetSearchTuningRuleClient( searchTuningRuleCode,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves a list of search tuning rules and their properties.
-		/// </summary>
-		/// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRuleCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var search = new Search();
-		///   var searchTuningRuleCollection = search.GetSearchTuningRules( startIndex,  pageSize,  sortBy,  filter,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRuleCollection GetSearchTuningRules(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRuleCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.SearchClient.GetSearchTuningRulesClient( startIndex,  pageSize,  sortBy,  filter,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of search tuning rules and their properties.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRuleCollection"/>
 		/// </returns>
@@ -131,44 +81,21 @@ public virtual Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRuleCollection
 		///   var searchTuningRuleCollection = await search.GetSearchTuningRulesAsync( startIndex,  pageSize,  sortBy,  filter,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRuleCollection> GetSearchTuningRulesAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRuleCollection> GetSearchTuningRulesAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRuleCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.SearchClient.GetSearchTuningRulesClient( startIndex,  pageSize,  sortBy,  filter,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the details of the specified search tuning rule sort fields. Sort fields allow you to control the product relevance whenver shoppers sort products on a page. For more information about sort relevance, refer to [Search Tuning Rules and Sorting](../../../developer/api-guides/search-tuning-rules.htm#search_tuning_rules_and_sorting).
-		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRuleSortFields"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var search = new Search();
-		///   var searchTuningRuleSortFields = search.GetSearchTuningRuleSortFields( responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRuleSortFields GetSearchTuningRuleSortFields(string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRuleSortFields> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.SearchClient.GetSearchTuningRuleSortFieldsClient( responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of the specified search tuning rule sort fields. Sort fields allow you to control the product relevance whenver shoppers sort products on a page. For more information about sort relevance, refer to [Search Tuning Rules and Sorting](../../../developer/api-guides/search-tuning-rules.htm#search_tuning_rules_and_sorting).
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRuleSortFields"/>
 		/// </returns>
@@ -178,44 +105,21 @@ public virtual Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRuleSortFields
 		///   var searchTuningRuleSortFields = await search.GetSearchTuningRuleSortFieldsAsync( responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRuleSortFields> GetSearchTuningRuleSortFieldsAsync(string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRuleSortFields> GetSearchTuningRuleSortFieldsAsync(string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRuleSortFields> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.SearchClient.GetSearchTuningRuleSortFieldsClient( responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the search settings for the specified site.Refer to [Search Settings API Overview](../../../../developer/api-guides/search-settings.htm) for more information about 's search settings.
-		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.SearchSettings"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var search = new Search();
-		///   var searchSettings = search.GetSettings( responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.SearchSettings GetSettings(string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.SearchSettings> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.SearchClient.GetSettingsClient( responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the search settings for the specified site.Refer to [Search Settings API Overview](../../../../developer/api-guides/search-settings.htm) for more information about 's search settings.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.SearchSettings"/>
 		/// </returns>
@@ -225,46 +129,22 @@ public virtual Mozu.Api.Contracts.ProductAdmin.SearchSettings GetSettings(string
 		///   var searchSettings = await search.GetSettingsAsync( responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.SearchSettings> GetSettingsAsync(string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.SearchSettings> GetSettingsAsync(string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.SearchSettings> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.SearchClient.GetSettingsClient( responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves a collection of synonyms definitions for product searches.Refer to [Search Synonyms](../../../../developer/api-guides/search-settings.htm#search_synonyms) for more information about search synonyms.
-		/// </summary>
-		/// <param name="localeCode">The two character country code that sets the locale, such as US for United States. Sites, tenants, and catalogs use locale codes for localizing content, such as translated product text per supported country.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinitionCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var search = new Search();
-		///   var synonymDefinitionCollection = search.GetSynonymDefinitionCollection( localeCode,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinitionCollection GetSynonymDefinitionCollection(string localeCode, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinitionCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.SearchClient.GetSynonymDefinitionCollectionClient( localeCode,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a collection of synonyms definitions for product searches.Refer to [Search Synonyms](../../../../developer/api-guides/search-settings.htm#search_synonyms) for more information about search synonyms.
+		/// 
 		/// </summary>
-		/// <param name="localeCode">The two character country code that sets the locale, such as US for United States. Sites, tenants, and catalogs use locale codes for localizing content, such as translated product text per supported country.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="localeCode"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinitionCollection"/>
 		/// </returns>
@@ -274,52 +154,25 @@ public virtual Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinitionCollectio
 		///   var synonymDefinitionCollection = await search.GetSynonymDefinitionCollectionAsync( localeCode,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinitionCollection> GetSynonymDefinitionCollectionAsync(string localeCode, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinitionCollection> GetSynonymDefinitionCollectionAsync(string localeCode, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinitionCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.SearchClient.GetSynonymDefinitionCollectionClient( localeCode,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves a list of synonym definitions according to any specified filter criteria and sort options.Refer to [Search Synonyms](../../../../developer/api-guides/search-settings.htm#search_synonyms) for more information about search synonyms.
-		/// </summary>
-		/// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinitionPagedCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var search = new Search();
-		///   var synonymDefinitionPagedCollection = search.GetSynonymDefinitions( startIndex,  pageSize,  sortBy,  filter,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinitionPagedCollection GetSynonymDefinitions(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinitionPagedCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.SearchClient.GetSynonymDefinitionsClient( startIndex,  pageSize,  sortBy,  filter,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of synonym definitions according to any specified filter criteria and sort options.Refer to [Search Synonyms](../../../../developer/api-guides/search-settings.htm#search_synonyms) for more information about search synonyms.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinitionPagedCollection"/>
 		/// </returns>
@@ -329,46 +182,22 @@ public virtual Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinitionPagedColl
 		///   var synonymDefinitionPagedCollection = await search.GetSynonymDefinitionsAsync( startIndex,  pageSize,  sortBy,  filter,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinitionPagedCollection> GetSynonymDefinitionsAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinitionPagedCollection> GetSynonymDefinitionsAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinitionPagedCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.SearchClient.GetSynonymDefinitionsClient( startIndex,  pageSize,  sortBy,  filter,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the details of the specified synonym defintion.Refer to [Search Synonyms](../../../../developer/api-guides/search-settings.htm#search_synonyms) for more information about search synonyms.
-		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="synonymId">The unique identifier of the synonym definition.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinition"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var search = new Search();
-		///   var synonymDefinition = search.GetSynonymDefinition( synonymId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinition GetSynonymDefinition(int synonymId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinition> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.SearchClient.GetSynonymDefinitionClient( synonymId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of the specified synonym defintion.Refer to [Search Synonyms](../../../../developer/api-guides/search-settings.htm#search_synonyms) for more information about search synonyms.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="synonymId">The unique identifier of the synonym definition.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="synonymId"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinition"/>
 		/// </returns>
@@ -378,46 +207,22 @@ public virtual Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinition GetSynon
 		///   var synonymDefinition = await search.GetSynonymDefinitionAsync( synonymId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinition> GetSynonymDefinitionAsync(int synonymId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinition> GetSynonymDefinitionAsync(int synonymId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinition> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.SearchClient.GetSynonymDefinitionClient( synonymId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Creates a search tuning rule for your site. You can use search tuning rules to fine tune the product search results that appear when a shopper searches for a specific keyword, or navigates to a category page.For more information on search tuning rules, refer to [Search Tuning Rules](../../../../developer/api-guides/search-tuning-rules.htm).
-		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="searchTuningRuleIn">The details of the new search tuning rule.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRule"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var search = new Search();
-		///   var searchTuningRule = search.AddSearchTuningRule( searchTuningRuleIn,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRule AddSearchTuningRule(Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRule searchTuningRuleIn, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRule> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.SearchClient.AddSearchTuningRuleClient( searchTuningRuleIn,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Creates a search tuning rule for your site. You can use search tuning rules to fine tune the product search results that appear when a shopper searches for a specific keyword, or navigates to a category page.For more information on search tuning rules, refer to [Search Tuning Rules](../../../../developer/api-guides/search-tuning-rules.htm).
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="searchTuningRuleIn">The details of the new search tuning rule.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="searchTuningRuleIn"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRule"/>
 		/// </returns>
@@ -427,46 +232,22 @@ public virtual Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRule AddSearch
 		///   var searchTuningRule = await search.AddSearchTuningRuleAsync( searchTuningRuleIn,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRule> AddSearchTuningRuleAsync(Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRule searchTuningRuleIn, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRule> AddSearchTuningRuleAsync(Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRule searchTuningRuleIn, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRule> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.SearchClient.AddSearchTuningRuleClient( searchTuningRuleIn,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates the details of the search tuning rule sort fields.
-		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="searchTuningRuleSortFieldsIn">The details of the updated search tuning rule sort fields.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRuleSortFields"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var search = new Search();
-		///   var searchTuningRuleSortFields = search.UpdateSearchTuningRuleSortFields( searchTuningRuleSortFieldsIn,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRuleSortFields UpdateSearchTuningRuleSortFields(Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRuleSortFields searchTuningRuleSortFieldsIn, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRuleSortFields> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.SearchClient.UpdateSearchTuningRuleSortFieldsClient( searchTuningRuleSortFieldsIn,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates the details of the search tuning rule sort fields.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="searchTuningRuleSortFieldsIn">The details of the updated search tuning rule sort fields.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="searchTuningRuleSortFieldsIn"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRuleSortFields"/>
 		/// </returns>
@@ -476,48 +257,23 @@ public virtual Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRuleSortFields
 		///   var searchTuningRuleSortFields = await search.UpdateSearchTuningRuleSortFieldsAsync( searchTuningRuleSortFieldsIn,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRuleSortFields> UpdateSearchTuningRuleSortFieldsAsync(Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRuleSortFields searchTuningRuleSortFieldsIn, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRuleSortFields> UpdateSearchTuningRuleSortFieldsAsync(Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRuleSortFields searchTuningRuleSortFieldsIn, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRuleSortFields> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.SearchClient.UpdateSearchTuningRuleSortFieldsClient( searchTuningRuleSortFieldsIn,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates a collection of synonym definitions.Refer to [Search Synonyms](../../../../developer/api-guides/search-settings.htm#search_synonyms) for more information about search synonyms.
-		/// </summary>
-		/// <param name="localeCode">The two character country code that sets the locale, such as US for United States. Sites, tenants, and catalogs use locale codes for localizing content, such as translated product text per supported country.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="collection">The updated details of the synonym definition collection.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinitionCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var search = new Search();
-		///   var synonymDefinitionCollection = search.UpdateSynonymDefinitionCollection( collection,  localeCode,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinitionCollection UpdateSynonymDefinitionCollection(Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinitionCollection collection, string localeCode, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinitionCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.SearchClient.UpdateSynonymDefinitionCollectionClient( collection,  localeCode,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates a collection of synonym definitions.Refer to [Search Synonyms](../../../../developer/api-guides/search-settings.htm#search_synonyms) for more information about search synonyms.
+		/// 
 		/// </summary>
-		/// <param name="localeCode">The two character country code that sets the locale, such as US for United States. Sites, tenants, and catalogs use locale codes for localizing content, such as translated product text per supported country.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="collection">The updated details of the synonym definition collection.</param>
+		/// <param name="localeCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="collection"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinitionCollection"/>
 		/// </returns>
@@ -527,46 +283,22 @@ public virtual Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinitionCollectio
 		///   var synonymDefinitionCollection = await search.UpdateSynonymDefinitionCollectionAsync( collection,  localeCode,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinitionCollection> UpdateSynonymDefinitionCollectionAsync(Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinitionCollection collection, string localeCode, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinitionCollection> UpdateSynonymDefinitionCollectionAsync(Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinitionCollection collection, string localeCode, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinitionCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.SearchClient.UpdateSynonymDefinitionCollectionClient( collection,  localeCode,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Creates a new synonym definition.Refer to [Search Synonyms](../../../../developer/api-guides/search-settings.htm#search_synonyms) for more information about search synonyms.
-		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="synonymDefinition">The details of the new synonym definition.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinition"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var search = new Search();
-		///   var synonymDefinition = search.AddSynonymDefinition( synonymDefinition,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinition AddSynonymDefinition(Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinition synonymDefinition, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinition> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.SearchClient.AddSynonymDefinitionClient( synonymDefinition,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Creates a new synonym definition.Refer to [Search Synonyms](../../../../developer/api-guides/search-settings.htm#search_synonyms) for more information about search synonyms.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="synonymDefinition">The details of the new synonym definition.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="synonymDefinition"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinition"/>
 		/// </returns>
@@ -576,48 +308,23 @@ public virtual Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinition AddSynon
 		///   var synonymDefinition = await search.AddSynonymDefinitionAsync( synonymDefinition,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinition> AddSynonymDefinitionAsync(Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinition synonymDefinition, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinition> AddSynonymDefinitionAsync(Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinition synonymDefinition, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinition> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.SearchClient.AddSynonymDefinitionClient( synonymDefinition,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates the details of the specified search tuning rule.
-		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="searchTuningRuleCode">The unique identifier of the search tuning rule.</param>
-		/// <param name="searchTuningRuleIn">The details of the updated search tuning rule.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRule"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var search = new Search();
-		///   var searchTuningRule = search.UpdateSearchTuningRule( searchTuningRuleIn,  searchTuningRuleCode,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRule UpdateSearchTuningRule(Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRule searchTuningRuleIn, string searchTuningRuleCode, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRule> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.SearchClient.UpdateSearchTuningRuleClient( searchTuningRuleIn,  searchTuningRuleCode,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates the details of the specified search tuning rule.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="searchTuningRuleCode">The unique identifier of the search tuning rule.</param>
-		/// <param name="searchTuningRuleIn">The details of the updated search tuning rule.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="searchTuningRuleCode"></param>
+		/// <param name="searchTuningRuleIn"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRule"/>
 		/// </returns>
@@ -627,46 +334,22 @@ public virtual Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRule UpdateSea
 		///   var searchTuningRule = await search.UpdateSearchTuningRuleAsync( searchTuningRuleIn,  searchTuningRuleCode,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRule> UpdateSearchTuningRuleAsync(Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRule searchTuningRuleIn, string searchTuningRuleCode, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRule> UpdateSearchTuningRuleAsync(Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRule searchTuningRuleIn, string searchTuningRuleCode, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.Search.SearchTuningRule> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.SearchClient.UpdateSearchTuningRuleClient( searchTuningRuleIn,  searchTuningRuleCode,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates the search setting properties for a specific site.Refer to [Search Settings API Overview](../../../../developer/api-guides/search-settings.htm) for more information about 's search settings.
-		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="settings">The search settings to update.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.SearchSettings"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var search = new Search();
-		///   var searchSettings = search.UpdateSettings( settings,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.SearchSettings UpdateSettings(Mozu.Api.Contracts.ProductAdmin.SearchSettings settings, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.SearchSettings> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.SearchClient.UpdateSettingsClient( settings,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates the search setting properties for a specific site.Refer to [Search Settings API Overview](../../../../developer/api-guides/search-settings.htm) for more information about 's search settings.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="settings">The search settings to update.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="settings"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.SearchSettings"/>
 		/// </returns>
@@ -676,48 +359,23 @@ public virtual Mozu.Api.Contracts.ProductAdmin.SearchSettings UpdateSettings(Moz
 		///   var searchSettings = await search.UpdateSettingsAsync( settings,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.SearchSettings> UpdateSettingsAsync(Mozu.Api.Contracts.ProductAdmin.SearchSettings settings, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.SearchSettings> UpdateSettingsAsync(Mozu.Api.Contracts.ProductAdmin.SearchSettings settings, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.SearchSettings> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.SearchClient.UpdateSettingsClient( settings,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates the details of a synonym definition.Refer to [Search Synonyms](../../../../developer/api-guides/search-settings.htm#search_synonyms) for more information about search synonyms.
-		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="synonymId">The unique identifier of the synonym definition.</param>
-		/// <param name="synonymDefinition">The updated synonym definition details.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinition"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var search = new Search();
-		///   var synonymDefinition = search.UpdateSynonymDefinition( synonymDefinition,  synonymId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinition UpdateSynonymDefinition(Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinition synonymDefinition, int synonymId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinition> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.SearchClient.UpdateSynonymDefinitionClient( synonymDefinition,  synonymId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates the details of a synonym definition.Refer to [Search Synonyms](../../../../developer/api-guides/search-settings.htm#search_synonyms) for more information about search synonyms.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="synonymId">The unique identifier of the synonym definition.</param>
-		/// <param name="synonymDefinition">The updated synonym definition details.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="synonymId"></param>
+		/// <param name="synonymDefinition"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinition"/>
 		/// </returns>
@@ -727,43 +385,21 @@ public virtual Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinition UpdateSy
 		///   var synonymDefinition = await search.UpdateSynonymDefinitionAsync( synonymDefinition,  synonymId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinition> UpdateSynonymDefinitionAsync(Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinition synonymDefinition, int synonymId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinition> UpdateSynonymDefinitionAsync(Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinition synonymDefinition, int synonymId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.Search.SynonymDefinition> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.SearchClient.UpdateSynonymDefinitionClient( synonymDefinition,  synonymId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Deletes the specified search tuning rule from the site.
-		/// </summary>
-		/// <param name="searchTuningRuleCode">The unique identifier of the search tuning rule.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var search = new Search();
-		///   search.DeleteSearchTuningRule( searchTuningRuleCode);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteSearchTuningRule(string searchTuningRuleCode)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.SearchClient.DeleteSearchTuningRuleClient( searchTuningRuleCode);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes the specified search tuning rule from the site.
+		/// 
 		/// </summary>
-		/// <param name="searchTuningRuleCode">The unique identifier of the search tuning rule.</param>
+		/// <param name="searchTuningRuleCode"></param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -773,42 +409,20 @@ public virtual void DeleteSearchTuningRule(string searchTuningRuleCode)
 		///   await search.DeleteSearchTuningRuleAsync( searchTuningRuleCode);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteSearchTuningRuleAsync(string searchTuningRuleCode)
+		public virtual async Task DeleteSearchTuningRuleAsync(string searchTuningRuleCode, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.SearchClient.DeleteSearchTuningRuleClient( searchTuningRuleCode);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
-		/// <summary>
-		/// Deletes the specified synonym definition.Refer to [Search Synonyms](../../../../developer/api-guides/search-settings.htm#search_synonyms) for more information about search synonyms.
-		/// </summary>
-		/// <param name="synonymId">The unique identifier of the synonym definition.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var search = new Search();
-		///   search.DeleteSynonymDefinition( synonymId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteSynonymDefinition(int synonymId)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.SearchClient.DeleteSynonymDefinitionClient( synonymId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes the specified synonym definition.Refer to [Search Synonyms](../../../../developer/api-guides/search-settings.htm#search_synonyms) for more information about search synonyms.
+		/// 
 		/// </summary>
-		/// <param name="synonymId">The unique identifier of the synonym definition.</param>
+		/// <param name="synonymId"></param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -818,12 +432,12 @@ public virtual void DeleteSynonymDefinition(int synonymId)
 		///   await search.DeleteSynonymDefinitionAsync( synonymId);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteSynonymDefinitionAsync(int synonymId)
+		public virtual async Task DeleteSynonymDefinitionAsync(int synonymId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.SearchClient.DeleteSynonymDefinitionClient( synonymId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/Catalog/Admin/SoftAllocationResource.cs b/Mozu.Api/Resources/Commerce/Catalog/Admin/SoftAllocationResource.cs
old mode 100644
new mode 100755
index cf6f54df..b87e3bca
--- a/Mozu.Api/Resources/Commerce/Catalog/Admin/SoftAllocationResource.cs
+++ b/Mozu.Api/Resources/Commerce/Catalog/Admin/SoftAllocationResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Catalog.Admin
 {
 	/// <summary>
-	/// The Soft Allocations resource allows you to temporarily hold a product from inventory while a shopper is filling out payment information. You create a product reservation when a shopper proceeds to check out and then release the reservation when the order process is complete.
+	/// 
 	/// </summary>
 	public partial class SoftAllocationResource  	{
 		///
@@ -37,43 +38,15 @@ public SoftAllocationResource CloneWithApiContext(Action<IApiContext> contextMod
 		}
 
 				
-		/// <summary>
-		/// Retrieves a list of sof allocations according to any specified filter criteria and sort options.
-		/// </summary>
-		/// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.SoftAllocationCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var softallocation = new SoftAllocation();
-		///   var softAllocationCollection = softallocation.GetSoftAllocations( startIndex,  pageSize,  sortBy,  filter,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.SoftAllocationCollection GetSoftAllocations(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.SoftAllocationCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.SoftAllocationClient.GetSoftAllocationsClient( startIndex,  pageSize,  sortBy,  filter,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of sof allocations according to any specified filter criteria and sort options.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.SoftAllocationCollection"/>
@@ -84,47 +57,22 @@ public virtual Mozu.Api.Contracts.ProductAdmin.SoftAllocationCollection GetSoftA
 		///   var softAllocationCollection = await softallocation.GetSoftAllocationsAsync( startIndex,  pageSize,  sortBy,  filter,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.SoftAllocationCollection> GetSoftAllocationsAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.SoftAllocationCollection> GetSoftAllocationsAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.SoftAllocationCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.SoftAllocationClient.GetSoftAllocationsClient( startIndex,  pageSize,  sortBy,  filter,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the details of a soft allocation.
-		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="softAllocationId">The unique identifier of the soft allocation.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductAdmin.SoftAllocation"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var softallocation = new SoftAllocation();
-		///   var softAllocation = softallocation.GetSoftAllocation( softAllocationId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductAdmin.SoftAllocation GetSoftAllocation(int softAllocationId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductAdmin.SoftAllocation> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.SoftAllocationClient.GetSoftAllocationClient( softAllocationId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of a soft allocation.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="softAllocationId">The unique identifier of the soft allocation.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="softAllocationId"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductAdmin.SoftAllocation"/>
@@ -135,46 +83,22 @@ public virtual Mozu.Api.Contracts.ProductAdmin.SoftAllocation GetSoftAllocation(
 		///   var softAllocation = await softallocation.GetSoftAllocationAsync( softAllocationId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.SoftAllocation> GetSoftAllocationAsync(int softAllocationId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductAdmin.SoftAllocation> GetSoftAllocationAsync(int softAllocationId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductAdmin.SoftAllocation> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.SoftAllocationClient.GetSoftAllocationClient( softAllocationId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Creates a new soft allocation for a product. This places a hold on the product inventory for the quantity specified during the ordering process.
-		/// </summary>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="softAllocationsIn">The details of the new soft allocation.</param>
-		/// <returns>
-		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.SoftAllocation"/>}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var softallocation = new SoftAllocation();
-		///   var softAllocation = softallocation.AddSoftAllocations( softAllocationsIn);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<Mozu.Api.Contracts.ProductAdmin.SoftAllocation> AddSoftAllocations(List<Mozu.Api.Contracts.ProductAdmin.SoftAllocation> softAllocationsIn)
-		{
-			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.SoftAllocation>> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.SoftAllocationClient.AddSoftAllocationsClient( softAllocationsIn);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Creates a new soft allocation for a product. This places a hold on the product inventory for the quantity specified during the ordering process.
+		/// 
 		/// </summary>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="softAllocationsIn">The details of the new soft allocation.</param>
+		/// <param name="softAllocationsIn"></param>
 		/// <returns>
 		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.SoftAllocation"/>}
 		/// </returns>
@@ -184,46 +108,22 @@ public virtual Mozu.Api.Contracts.ProductAdmin.SoftAllocation GetSoftAllocation(
 		///   var softAllocation = await softallocation.AddSoftAllocationsAsync( softAllocationsIn);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.SoftAllocation>> AddSoftAllocationsAsync(List<Mozu.Api.Contracts.ProductAdmin.SoftAllocation> softAllocationsIn)
+		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.SoftAllocation>> AddSoftAllocationsAsync(List<Mozu.Api.Contracts.ProductAdmin.SoftAllocation> softAllocationsIn, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.SoftAllocation>> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.SoftAllocationClient.AddSoftAllocationsClient( softAllocationsIn);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Converts a set of existing soft product allocations into product reservations.
-		/// </summary>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="softAllocations">The details of the soft allocation which you want to convert into product reservations.</param>
-		/// <returns>
-		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductReservation"/>}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var softallocation = new SoftAllocation();
-		///   var productReservation = softallocation.ConvertToProductReservation( softAllocations);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<Mozu.Api.Contracts.ProductAdmin.ProductReservation> ConvertToProductReservation(List<Mozu.Api.Contracts.ProductAdmin.SoftAllocation> softAllocations)
-		{
-			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.ProductReservation>> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.SoftAllocationClient.ConvertToProductReservationClient( softAllocations);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Converts a set of existing soft product allocations into product reservations.
+		/// 
 		/// </summary>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="softAllocations">The details of the soft allocation which you want to convert into product reservations.</param>
+		/// <param name="softAllocations"></param>
 		/// <returns>
 		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.ProductReservation"/>}
 		/// </returns>
@@ -233,46 +133,22 @@ public virtual Mozu.Api.Contracts.ProductAdmin.SoftAllocation GetSoftAllocation(
 		///   var productReservation = await softallocation.ConvertToProductReservationAsync( softAllocations);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.ProductReservation>> ConvertToProductReservationAsync(List<Mozu.Api.Contracts.ProductAdmin.SoftAllocation> softAllocations)
+		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.ProductReservation>> ConvertToProductReservationAsync(List<Mozu.Api.Contracts.ProductAdmin.SoftAllocation> softAllocations, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.ProductReservation>> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.SoftAllocationClient.ConvertToProductReservationClient( softAllocations);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates the expiration time for a set of soft allocations in a non-transactional batch.
-		/// </summary>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="softAllocationRenew">The details of the soft allocation that you want to renew.</param>
-		/// <returns>
-		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.SoftAllocation"/>}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var softallocation = new SoftAllocation();
-		///   var softAllocation = softallocation.RenewSoftAllocations( softAllocationRenew);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<Mozu.Api.Contracts.ProductAdmin.SoftAllocation> RenewSoftAllocations(Mozu.Api.Contracts.ProductAdmin.SoftAllocationRenew softAllocationRenew)
-		{
-			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.SoftAllocation>> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.SoftAllocationClient.RenewSoftAllocationsClient( softAllocationRenew);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates the expiration time for a set of soft allocations in a non-transactional batch.
+		/// 
 		/// </summary>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="softAllocationRenew">The details of the soft allocation that you want to renew.</param>
+		/// <param name="softAllocationRenew"></param>
 		/// <returns>
 		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.SoftAllocation"/>}
 		/// </returns>
@@ -282,46 +158,22 @@ public virtual Mozu.Api.Contracts.ProductAdmin.SoftAllocation GetSoftAllocation(
 		///   var softAllocation = await softallocation.RenewSoftAllocationsAsync( softAllocationRenew);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.SoftAllocation>> RenewSoftAllocationsAsync(Mozu.Api.Contracts.ProductAdmin.SoftAllocationRenew softAllocationRenew)
+		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.SoftAllocation>> RenewSoftAllocationsAsync(Mozu.Api.Contracts.ProductAdmin.SoftAllocationRenew softAllocationRenew, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.SoftAllocation>> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.SoftAllocationClient.RenewSoftAllocationsClient( softAllocationRenew);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates a soft allocation. This updates a hold on the product inventory for the quantity specified during the ordering process.
-		/// </summary>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="softAllocations">The details of the updated soft allocations.</param>
-		/// <returns>
-		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.SoftAllocation"/>}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var softallocation = new SoftAllocation();
-		///   var softAllocation = softallocation.UpdateSoftAllocations( softAllocations);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<Mozu.Api.Contracts.ProductAdmin.SoftAllocation> UpdateSoftAllocations(List<Mozu.Api.Contracts.ProductAdmin.SoftAllocation> softAllocations)
-		{
-			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.SoftAllocation>> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.SoftAllocationClient.UpdateSoftAllocationsClient( softAllocations);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates a soft allocation. This updates a hold on the product inventory for the quantity specified during the ordering process.
+		/// 
 		/// </summary>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="softAllocations">The details of the updated soft allocations.</param>
+		/// <param name="softAllocations"></param>
 		/// <returns>
 		/// List{<see cref="Mozu.Api.Contracts.ProductAdmin.SoftAllocation"/>}
 		/// </returns>
@@ -331,44 +183,21 @@ public virtual Mozu.Api.Contracts.ProductAdmin.SoftAllocation GetSoftAllocation(
 		///   var softAllocation = await softallocation.UpdateSoftAllocationsAsync( softAllocations);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.SoftAllocation>> UpdateSoftAllocationsAsync(List<Mozu.Api.Contracts.ProductAdmin.SoftAllocation> softAllocations)
+		public virtual async Task<List<Mozu.Api.Contracts.ProductAdmin.SoftAllocation>> UpdateSoftAllocationsAsync(List<Mozu.Api.Contracts.ProductAdmin.SoftAllocation> softAllocations, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<Mozu.Api.Contracts.ProductAdmin.SoftAllocation>> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.SoftAllocationClient.UpdateSoftAllocationsClient( softAllocations);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Deletes a soft allocation. You might delete a soft allocation when an order or cart is not processed in order to return the product quantity back to inventory.
-		/// </summary>
-		/// <param name="softAllocationId">The unique identifier of the soft allocation.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var softallocation = new SoftAllocation();
-		///   softallocation.DeleteSoftAllocation( softAllocationId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteSoftAllocation(int softAllocationId)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.SoftAllocationClient.DeleteSoftAllocationClient( softAllocationId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes a soft allocation. You might delete a soft allocation when an order or cart is not processed in order to return the product quantity back to inventory.
+		/// 
 		/// </summary>
-		/// <param name="softAllocationId">The unique identifier of the soft allocation.</param>
+		/// <param name="softAllocationId"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		/// 
@@ -379,12 +208,12 @@ public virtual void DeleteSoftAllocation(int softAllocationId)
 		///   await softallocation.DeleteSoftAllocationAsync( softAllocationId);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteSoftAllocationAsync(int softAllocationId)
+		public virtual async Task DeleteSoftAllocationAsync(int softAllocationId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Admin.SoftAllocationClient.DeleteSoftAllocationClient( softAllocationId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/Catalog/Storefront/CategoryResource.cs b/Mozu.Api/Resources/Commerce/Catalog/Storefront/CategoryResource.cs
old mode 100644
new mode 100755
index cc51c086..fce70bc2
--- a/Mozu.Api/Resources/Commerce/Catalog/Storefront/CategoryResource.cs
+++ b/Mozu.Api/Resources/Commerce/Catalog/Storefront/CategoryResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Catalog.Storefront
 {
@@ -44,40 +45,13 @@ public CategoryResource(IApiContext apiContext, DataViewMode dataViewMode)
 			_dataViewMode = dataViewMode;
 		}
 				
-		/// <summary>
-		/// Retrieves a list of categories according to any specified filter criteria and sort options.
-		/// </summary>
-		/// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="sortBy"></param>
-		/// <param name="startIndex"></param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductRuntime.CategoryPagedCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var category = new Category();
-		///   var categoryPagedCollection = category.GetCategories(_dataViewMode,  filter,  startIndex,  pageSize,  sortBy,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductRuntime.CategoryPagedCollection GetCategories(string filter =  null, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductRuntime.CategoryPagedCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Storefront.CategoryClient.GetCategoriesClient(_dataViewMode,  filter,  startIndex,  pageSize,  sortBy,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of categories according to any specified filter criteria and sort options.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. You can filter product category search results by any of its properties, including its position in the category hierarchy. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
 		/// <param name="sortBy"></param>
 		/// <param name="startIndex"></param>
 		/// <returns>
@@ -89,48 +63,23 @@ public virtual Mozu.Api.Contracts.ProductRuntime.CategoryPagedCollection GetCate
 		///   var categoryPagedCollection = await category.GetCategoriesAsync(_dataViewMode,  filter,  startIndex,  pageSize,  sortBy,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductRuntime.CategoryPagedCollection> GetCategoriesAsync(string filter =  null, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductRuntime.CategoryPagedCollection> GetCategoriesAsync(string filter =  null, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductRuntime.CategoryPagedCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Storefront.CategoryClient.GetCategoriesClient(_dataViewMode,  filter,  startIndex,  pageSize,  sortBy,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the details of a single category.
-		/// </summary>
-		/// <param name="allowInactive">If true, allow inactive categories to be retrieved in the category list response. If false, the categories retrieved will not include ones marked inactive.</param>
-		/// <param name="categoryId">Unique identifier for the storefront container used to organize products.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductRuntime.Category"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var category = new Category();
-		///   var category = category.GetCategory(_dataViewMode,  categoryId,  allowInactive,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductRuntime.Category GetCategory(int categoryId, bool? allowInactive =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductRuntime.Category> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Storefront.CategoryClient.GetCategoryClient(_dataViewMode,  categoryId,  allowInactive,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of a single category.
+		/// 
 		/// </summary>
 		/// <param name="allowInactive">If true, allow inactive categories to be retrieved in the category list response. If false, the categories retrieved will not include ones marked inactive.</param>
-		/// <param name="categoryId">Unique identifier for the storefront container used to organize products.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="categoryId">Unique identifier of the product category.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductRuntime.Category"/>
 		/// </returns>
@@ -140,44 +89,21 @@ public virtual Mozu.Api.Contracts.ProductRuntime.Category GetCategory(int catego
 		///   var category = await category.GetCategoryAsync(_dataViewMode,  categoryId,  allowInactive,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductRuntime.Category> GetCategoryAsync(int categoryId, bool? allowInactive =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductRuntime.Category> GetCategoryAsync(int categoryId, bool? allowInactive =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductRuntime.Category> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Storefront.CategoryClient.GetCategoryClient(_dataViewMode,  categoryId,  allowInactive,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the list of product categories that appear on the storefront organized in a hierarchical format. Hidden categories do not appear in the list.
-		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductRuntime.CategoryCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var category = new Category();
-		///   var categoryCollection = category.GetCategoryTree(_dataViewMode,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductRuntime.CategoryCollection GetCategoryTree(string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductRuntime.CategoryCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Storefront.CategoryClient.GetCategoryTreeClient(_dataViewMode,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the list of product categories that appear on the storefront organized in a hierarchical format. Hidden categories do not appear in the list.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductRuntime.CategoryCollection"/>
 		/// </returns>
@@ -187,12 +113,12 @@ public virtual Mozu.Api.Contracts.ProductRuntime.CategoryCollection GetCategoryT
 		///   var categoryCollection = await category.GetCategoryTreeAsync(_dataViewMode,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductRuntime.CategoryCollection> GetCategoryTreeAsync(string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductRuntime.CategoryCollection> GetCategoryTreeAsync(string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductRuntime.CategoryCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Storefront.CategoryClient.GetCategoryTreeClient(_dataViewMode,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
diff --git a/Mozu.Api/Resources/Commerce/Catalog/Storefront/OrderTaxContextResource.cs b/Mozu.Api/Resources/Commerce/Catalog/Storefront/OrderTaxContextResource.cs
old mode 100644
new mode 100755
index 3df22ee7..50265a40
--- a/Mozu.Api/Resources/Commerce/Catalog/Storefront/OrderTaxContextResource.cs
+++ b/Mozu.Api/Resources/Commerce/Catalog/Storefront/OrderTaxContextResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Catalog.Storefront
 {
 	/// <summary>
-	/// Use the Storefront Tax resource to retrieve tax information from the storefront.
+	/// 
 	/// </summary>
 	public partial class OrderTaxContextResource  	{
 		///
@@ -37,35 +38,11 @@ public OrderTaxContextResource CloneWithApiContext(Action<IApiContext> contextMo
 		}
 
 				
-		/// <summary>
-		/// Retrieves tax information applicable to the site.
-		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="taxableOrder"></param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.PricingRuntime.OrderTaxContext"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var ordertaxcontext = new OrderTaxContext();
-		///   var orderTaxContext = ordertaxcontext.EstimateTaxes( taxableOrder,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.PricingRuntime.OrderTaxContext EstimateTaxes(Mozu.Api.Contracts.PricingRuntime.TaxableOrder taxableOrder, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.PricingRuntime.OrderTaxContext> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Storefront.OrderTaxContextClient.EstimateTaxesClient( taxableOrder,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves tax information applicable to the site.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="taxableOrder"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.PricingRuntime.OrderTaxContext"/>
@@ -76,12 +53,12 @@ public virtual Mozu.Api.Contracts.PricingRuntime.OrderTaxContext EstimateTaxes(M
 		///   var orderTaxContext = await ordertaxcontext.EstimateTaxesAsync( taxableOrder,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.PricingRuntime.OrderTaxContext> EstimateTaxesAsync(Mozu.Api.Contracts.PricingRuntime.TaxableOrder taxableOrder, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.PricingRuntime.OrderTaxContext> EstimateTaxesAsync(Mozu.Api.Contracts.PricingRuntime.TaxableOrder taxableOrder, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.PricingRuntime.OrderTaxContext> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Storefront.OrderTaxContextClient.EstimateTaxesClient( taxableOrder,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
diff --git a/Mozu.Api/Resources/Commerce/Catalog/Storefront/PriceListResource.cs b/Mozu.Api/Resources/Commerce/Catalog/Storefront/PriceListResource.cs
old mode 100644
new mode 100755
index f51cda16..f887b992
--- a/Mozu.Api/Resources/Commerce/Catalog/Storefront/PriceListResource.cs
+++ b/Mozu.Api/Resources/Commerce/Catalog/Storefront/PriceListResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Catalog.Storefront
 {
 	/// <summary>
-	/// Retrieves the details of a price list. The details may contain a hierarchy of ancestor and/or descendant price lists dependening on your configuration.
+	/// 
 	/// </summary>
 	public partial class PriceListResource  	{
 		///
@@ -37,36 +38,12 @@ public PriceListResource CloneWithApiContext(Action<IApiContext> contextModifica
 		}
 
 				
-		/// <summary>
-		/// Retrieves the details of the specified price list.
-		/// </summary>
-		/// <param name="priceListCode">The unique code of the price list for which you want to retrieve the details.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductRuntime.PriceList"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var pricelist = new PriceList();
-		///   var priceList = pricelist.GetPriceList( priceListCode,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductRuntime.PriceList GetPriceList(string priceListCode, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductRuntime.PriceList> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Storefront.PriceListClient.GetPriceListClient( priceListCode,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of the specified price list.
+		/// 
 		/// </summary>
-		/// <param name="priceListCode">The unique code of the price list for which you want to retrieve the details.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="priceListCode"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductRuntime.PriceList"/>
 		/// </returns>
@@ -76,46 +53,22 @@ public virtual Mozu.Api.Contracts.ProductRuntime.PriceList GetPriceList(string p
 		///   var priceList = await pricelist.GetPriceListAsync( priceListCode,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductRuntime.PriceList> GetPriceListAsync(string priceListCode, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductRuntime.PriceList> GetPriceListAsync(string priceListCode, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductRuntime.PriceList> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Storefront.PriceListClient.GetPriceListClient( priceListCode,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the details of a price list to which the specified customer resolves. This is primarly used when creating an offline order for a shopper.You can use this operation alongside custom Arc.js actions to alter the price list to which a shopper resolves.
-		/// </summary>
-		/// <param name="customerAccountId">The unique identifier of the customer account for which to retrieve wish lists.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductRuntime.ResolvedPriceList"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var pricelist = new PriceList();
-		///   var resolvedPriceList = pricelist.GetResolvedPriceList( customerAccountId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductRuntime.ResolvedPriceList GetResolvedPriceList(int? customerAccountId =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductRuntime.ResolvedPriceList> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Storefront.PriceListClient.GetResolvedPriceListClient( customerAccountId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of a price list to which the specified customer resolves. This is primarly used when creating an offline order for a shopper.You can use this operation alongside custom Arc.js actions to alter the price list to which a shopper resolves.
+		/// 
 		/// </summary>
-		/// <param name="customerAccountId">The unique identifier of the customer account for which to retrieve wish lists.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="customerAccountId"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductRuntime.ResolvedPriceList"/>
 		/// </returns>
@@ -125,12 +78,12 @@ public virtual Mozu.Api.Contracts.ProductRuntime.ResolvedPriceList GetResolvedPr
 		///   var resolvedPriceList = await pricelist.GetResolvedPriceListAsync( customerAccountId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductRuntime.ResolvedPriceList> GetResolvedPriceListAsync(int? customerAccountId =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductRuntime.ResolvedPriceList> GetResolvedPriceListAsync(int? customerAccountId =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductRuntime.ResolvedPriceList> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Storefront.PriceListClient.GetResolvedPriceListClient( customerAccountId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
diff --git a/Mozu.Api/Resources/Commerce/Catalog/Storefront/ProductResource.cs b/Mozu.Api/Resources/Commerce/Catalog/Storefront/ProductResource.cs
old mode 100644
new mode 100755
index c4b57b4b..4b55ef93
--- a/Mozu.Api/Resources/Commerce/Catalog/Storefront/ProductResource.cs
+++ b/Mozu.Api/Resources/Commerce/Catalog/Storefront/ProductResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Catalog.Storefront
 {
 	/// <summary>
-	/// Use the Storefront Products resource to manage the shopper product selection process during a visit to the web storefront. You can update product options as shoppers pick and choose their product choices. A shopper cannot add a product to a cart until all of its required options have been selected.
+	/// Use the Storefront Products  resource to manage the shopper product selection process during a visit to the web storefront. You can update product options as shoppers pick and choose their product choices. A shopper cannot add a product to a cart until all of its required options have been selected.
 	/// </summary>
 	public partial class ProductResource  	{
 		///
@@ -44,44 +45,15 @@ public ProductResource(IApiContext apiContext, DataViewMode dataViewMode)
 			_dataViewMode = dataViewMode;
 		}
 				
-		/// <summary>
-		/// Retrieves a list of products that appear on the web storefront according to any specified filter criteria and sort options.
-		/// </summary>
-		/// <param name="cursorMark">In your first deep paged request, set this parameter to . Then, in all subsequent requests, set this parameter to the subsequent values of  that's returned in each response to continue paging through the results. Continue this pattern until  is null, which signifies the end of the paged results.</param>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="responseOptions">Options you can specify for the response. This parameter is null by default.You can primarily use this parameter to return volume price band information in product details, which you can then display on category pages and search results depanding on your theme configuration. To return volume price band information, set this parameter to .</param>
-		/// <param name="sortBy"></param>
-		/// <param name="startIndex"></param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductRuntime.ProductCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var product = new Product();
-		///   var productCollection = product.GetProducts(_dataViewMode,  filter,  startIndex,  pageSize,  sortBy,  responseOptions,  cursorMark,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductRuntime.ProductCollection GetProducts(string filter =  null, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string responseOptions =  null, string cursorMark =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductRuntime.ProductCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Storefront.ProductClient.GetProductsClient(_dataViewMode,  filter,  startIndex,  pageSize,  sortBy,  responseOptions,  cursorMark,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of products that appear on the web storefront according to any specified filter criteria and sort options.
+		/// 
 		/// </summary>
-		/// <param name="cursorMark">In your first deep paged request, set this parameter to . Then, in all subsequent requests, set this parameter to the subsequent values of  that's returned in each response to continue paging through the results. Continue this pattern until  is null, which signifies the end of the paged results.</param>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="responseOptions">Options you can specify for the response. This parameter is null by default.You can primarily use this parameter to return volume price band information in product details, which you can then display on category pages and search results depanding on your theme configuration. To return volume price band information, set this parameter to .</param>
+		/// <param name="cursorMark"></param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize">Used to page results from a query. Indicates the maximum number of entities to return from a single query. Default value: 20. Maximum value: 200.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="responseOptions"></param>
 		/// <param name="sortBy"></param>
 		/// <param name="startIndex"></param>
 		/// <returns>
@@ -93,48 +65,23 @@ public virtual Mozu.Api.Contracts.ProductRuntime.ProductCollection GetProducts(s
 		///   var productCollection = await product.GetProductsAsync(_dataViewMode,  filter,  startIndex,  pageSize,  sortBy,  responseOptions,  cursorMark,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductRuntime.ProductCollection> GetProductsAsync(string filter =  null, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string responseOptions =  null, string cursorMark =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductRuntime.ProductCollection> GetProductsAsync(string filter =  null, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string responseOptions =  null, string cursorMark =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductRuntime.ProductCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Storefront.ProductClient.GetProductsClient(_dataViewMode,  filter,  startIndex,  pageSize,  sortBy,  responseOptions,  cursorMark,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the active inventory level information associated with the product or location specified in the request.
-		/// </summary>
-		/// <param name="locationCodes">Array of location codes for which to retrieve product inventory information.</param>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductRuntime.LocationInventoryCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var product = new Product();
-		///   var locationInventoryCollection = product.GetProductInventory(_dataViewMode,  productCode,  locationCodes,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductRuntime.LocationInventoryCollection GetProductInventory(string productCode, string locationCodes =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductRuntime.LocationInventoryCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Storefront.ProductClient.GetProductInventoryClient(_dataViewMode,  productCode,  locationCodes,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the active inventory level information associated with the product or location specified in the request.
+		/// 
 		/// </summary>
 		/// <param name="locationCodes">Array of location codes for which to retrieve product inventory information.</param>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductRuntime.LocationInventoryCollection"/>
 		/// </returns>
@@ -144,57 +91,28 @@ public virtual Mozu.Api.Contracts.ProductRuntime.LocationInventoryCollection Get
 		///   var locationInventoryCollection = await product.GetProductInventoryAsync(_dataViewMode,  productCode,  locationCodes,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductRuntime.LocationInventoryCollection> GetProductInventoryAsync(string productCode, string locationCodes =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductRuntime.LocationInventoryCollection> GetProductInventoryAsync(string productCode, string locationCodes =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductRuntime.LocationInventoryCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Storefront.ProductClient.GetProductInventoryClient(_dataViewMode,  productCode,  locationCodes,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves information about a single product given its product code.
-		/// </summary>
-		/// <param name="acceptVariantProductCode">Specifies whether to accept a product variant's code as the .When you set this parameter to , you can pass in a product variant's code in the GetProduct call to retrieve the product variant details that are associated with the base product.</param>
-		/// <param name="allowInactive">If true, allow inactive categories to be retrieved in the category list response. If false, the categories retrieved will not include ones marked inactive.</param>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="quantity">The number of cart items in the shopper's active cart.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="skipInventoryCheck">If true, skip the process to validate inventory when creating this product reservation.</param>
-		/// <param name="supressOutOfStock404">Specifies whether to supress the 404 error when the product is out of stock.</param>
-		/// <param name="variationProductCode">Merchant-created code associated with a specific product variation. Variation product codes maintain an association with the base product code.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductRuntime.Product"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var product = new Product();
-		///   var product = product.GetProduct(_dataViewMode,  productCode,  variationProductCode,  allowInactive,  skipInventoryCheck,  supressOutOfStock404,  quantity,  acceptVariantProductCode,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductRuntime.Product GetProduct(string productCode, string variationProductCode =  null, bool? allowInactive =  null, bool? skipInventoryCheck =  null, bool? supressOutOfStock404 =  null, int? quantity =  null, bool? acceptVariantProductCode =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductRuntime.Product> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Storefront.ProductClient.GetProductClient(_dataViewMode,  productCode,  variationProductCode,  allowInactive,  skipInventoryCheck,  supressOutOfStock404,  quantity,  acceptVariantProductCode,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves information about a single product given its product code.
+		/// 
 		/// </summary>
-		/// <param name="acceptVariantProductCode">Specifies whether to accept a product variant's code as the .When you set this parameter to , you can pass in a product variant's code in the GetProduct call to retrieve the product variant details that are associated with the base product.</param>
-		/// <param name="allowInactive">If true, allow inactive categories to be retrieved in the category list response. If false, the categories retrieved will not include ones marked inactive.</param>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="quantity">The number of cart items in the shopper's active cart.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="skipInventoryCheck">If true, skip the process to validate inventory when creating this product reservation.</param>
-		/// <param name="supressOutOfStock404">Specifies whether to supress the 404 error when the product is out of stock.</param>
+		/// <param name="acceptVariantProductCode"></param>
+		/// <param name="allowInactive">If true, returns an inactive product as part of the query.</param>
+		/// <param name="productCode"></param>
+		/// <param name="purchaseLocation"></param>
+		/// <param name="quantity"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="skipInventoryCheck">If true, skip the inventory validation process for the specified product.</param>
+		/// <param name="supressOutOfStock404"></param>
 		/// <param name="variationProductCode">Merchant-created code associated with a specific product variation. Variation product codes maintain an association with the base product code.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductRuntime.Product"/>
@@ -202,53 +120,27 @@ public virtual Mozu.Api.Contracts.ProductRuntime.Product GetProduct(string produ
 		/// <example>
 		/// <code>
 		///   var product = new Product();
-		///   var product = await product.GetProductAsync(_dataViewMode,  productCode,  variationProductCode,  allowInactive,  skipInventoryCheck,  supressOutOfStock404,  quantity,  acceptVariantProductCode,  responseFields);
+		///   var product = await product.GetProductAsync(_dataViewMode,  productCode,  variationProductCode,  allowInactive,  skipInventoryCheck,  supressOutOfStock404,  quantity,  acceptVariantProductCode,  purchaseLocation,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductRuntime.Product> GetProductAsync(string productCode, string variationProductCode =  null, bool? allowInactive =  null, bool? skipInventoryCheck =  null, bool? supressOutOfStock404 =  null, int? quantity =  null, bool? acceptVariantProductCode =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductRuntime.Product> GetProductAsync(string productCode, string variationProductCode =  null, bool? allowInactive =  null, bool? skipInventoryCheck =  null, bool? supressOutOfStock404 =  null, int? quantity =  null, bool? acceptVariantProductCode =  null, string purchaseLocation =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductRuntime.Product> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Storefront.ProductClient.GetProductClient(_dataViewMode,  productCode,  variationProductCode,  allowInactive,  skipInventoryCheck,  supressOutOfStock404,  quantity,  acceptVariantProductCode,  responseFields);
+			var client = Mozu.Api.Clients.Commerce.Catalog.Storefront.ProductClient.GetProductClient(_dataViewMode,  productCode,  variationProductCode,  allowInactive,  skipInventoryCheck,  supressOutOfStock404,  quantity,  acceptVariantProductCode,  purchaseLocation,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves information about a single product given its product code for  to index in the search engine
-		/// </summary>
-		/// <param name="lastModifiedDate">The date when the product was last updated.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="productVersion">The product version.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductRuntime.Product"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var product = new Product();
-		///   var product = product.GetProductForIndexing(_dataViewMode,  productCode,  productVersion,  lastModifiedDate,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductRuntime.Product GetProductForIndexing(string productCode, long? productVersion =  null, DateTime? lastModifiedDate =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductRuntime.Product> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Storefront.ProductClient.GetProductForIndexingClient(_dataViewMode,  productCode,  productVersion,  lastModifiedDate,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves information about a single product given its product code for  to index in the search engine
+		/// 
 		/// </summary>
-		/// <param name="lastModifiedDate">The date when the product was last updated.</param>
-		/// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-		/// <param name="productVersion">The product version.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="lastModifiedDate"></param>
+		/// <param name="productCode"></param>
+		/// <param name="productVersion"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductRuntime.Product"/>
 		/// </returns>
@@ -258,53 +150,26 @@ public virtual Mozu.Api.Contracts.ProductRuntime.Product GetProductForIndexing(s
 		///   var product = await product.GetProductForIndexingAsync(_dataViewMode,  productCode,  productVersion,  lastModifiedDate,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductRuntime.Product> GetProductForIndexingAsync(string productCode, long? productVersion =  null, DateTime? lastModifiedDate =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductRuntime.Product> GetProductForIndexingAsync(string productCode, long? productVersion =  null, DateTime? lastModifiedDate =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductRuntime.Product> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Storefront.ProductClient.GetProductForIndexingClient(_dataViewMode,  productCode,  productVersion,  lastModifiedDate,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Creates a new product configuration each time a shopper selects a product option value. After the shopper defines values for all required product options, the shopper can add the product configuration to a cart.
-		/// </summary>
-		/// <param name="includeOptionDetails">If true, the response returns details about the product. If false, returns a product summary such as the product name, price, and sale price.</param>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="quantity">The number of cart items in the shopper's active cart.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="skipInventoryCheck">If true, skip the process to validate inventory when creating this product reservation.</param>
-		/// <param name="productOptionSelections">For a product with shopper-configurable options, the properties of the product options selected by the shopper.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductRuntime.ConfiguredProduct"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var product = new Product();
-		///   var configuredProduct = product.ConfiguredProduct( productOptionSelections,  productCode,  includeOptionDetails,  skipInventoryCheck,  quantity,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductRuntime.ConfiguredProduct ConfiguredProduct(Mozu.Api.Contracts.ProductRuntime.ProductOptionSelections productOptionSelections, string productCode, bool? includeOptionDetails =  null, bool? skipInventoryCheck =  null, int? quantity =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductRuntime.ConfiguredProduct> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Storefront.ProductClient.ConfiguredProductClient( productOptionSelections,  productCode,  includeOptionDetails,  skipInventoryCheck,  quantity,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Creates a new product configuration each time a shopper selects a product option value. After the shopper defines values for all required product options, the shopper can add the product configuration to a cart.
+		/// 
 		/// </summary>
 		/// <param name="includeOptionDetails">If true, the response returns details about the product. If false, returns a product summary such as the product name, price, and sale price.</param>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="quantity">The number of cart items in the shopper's active cart.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="skipInventoryCheck">If true, skip the process to validate inventory when creating this product reservation.</param>
+		/// <param name="productCode"></param>
+		/// <param name="purchaseLocation"></param>
+		/// <param name="quantity"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="skipInventoryCheck">If true, skip the inventory validation process for the specified product.</param>
 		/// <param name="productOptionSelections">For a product with shopper-configurable options, the properties of the product options selected by the shopper.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductRuntime.ConfiguredProduct"/>
@@ -312,56 +177,29 @@ public virtual Mozu.Api.Contracts.ProductRuntime.ConfiguredProduct ConfiguredPro
 		/// <example>
 		/// <code>
 		///   var product = new Product();
-		///   var configuredProduct = await product.ConfiguredProductAsync( productOptionSelections,  productCode,  includeOptionDetails,  skipInventoryCheck,  quantity,  responseFields);
+		///   var configuredProduct = await product.ConfiguredProductAsync( productOptionSelections,  productCode,  includeOptionDetails,  skipInventoryCheck,  quantity,  purchaseLocation,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductRuntime.ConfiguredProduct> ConfiguredProductAsync(Mozu.Api.Contracts.ProductRuntime.ProductOptionSelections productOptionSelections, string productCode, bool? includeOptionDetails =  null, bool? skipInventoryCheck =  null, int? quantity =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductRuntime.ConfiguredProduct> ConfiguredProductAsync(Mozu.Api.Contracts.ProductRuntime.ProductOptionSelections productOptionSelections, string productCode, bool? includeOptionDetails =  null, bool? skipInventoryCheck =  null, int? quantity =  null, string purchaseLocation =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductRuntime.ConfiguredProduct> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Storefront.ProductClient.ConfiguredProductClient( productOptionSelections,  productCode,  includeOptionDetails,  skipInventoryCheck,  quantity,  responseFields);
+			var client = Mozu.Api.Clients.Commerce.Catalog.Storefront.ProductClient.ConfiguredProductClient( productOptionSelections,  productCode,  includeOptionDetails,  skipInventoryCheck,  quantity,  purchaseLocation,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Validate the final state of shopper-selected options.
-		/// </summary>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="quantity">The number of cart items in the shopper's active cart.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="skipDefaults">Normally, product validation applies default extras to products that do not have options specified. If , product validation does not apply default extras to products.</param>
-		/// <param name="skipInventoryCheck">If true, skip the process to validate inventory when creating this product reservation.</param>
-		/// <param name="productOptionSelections">For a product with shopper-configurable options, the properties of the product options selected by the shopper.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductRuntime.ProductValidationSummary"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var product = new Product();
-		///   var productValidationSummary = product.ValidateProduct( productOptionSelections,  productCode,  skipInventoryCheck,  quantity,  skipDefaults,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductRuntime.ProductValidationSummary ValidateProduct(Mozu.Api.Contracts.ProductRuntime.ProductOptionSelections productOptionSelections, string productCode, bool? skipInventoryCheck =  null, int? quantity =  null, bool? skipDefaults =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductRuntime.ProductValidationSummary> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Storefront.ProductClient.ValidateProductClient( productOptionSelections,  productCode,  skipInventoryCheck,  quantity,  skipDefaults,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Validate the final state of shopper-selected options.
+		/// 
 		/// </summary>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="quantity">The number of cart items in the shopper's active cart.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="skipDefaults">Normally, product validation applies default extras to products that do not have options specified. If , product validation does not apply default extras to products.</param>
-		/// <param name="skipInventoryCheck">If true, skip the process to validate inventory when creating this product reservation.</param>
+		/// <param name="productCode"></param>
+		/// <param name="purchaseLocation"></param>
+		/// <param name="quantity"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="skipDefaults"></param>
+		/// <param name="skipInventoryCheck">If true, skip the inventory validation process for the specified product.</param>
 		/// <param name="productOptionSelections">For a product with shopper-configurable options, the properties of the product options selected by the shopper.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductRuntime.ProductValidationSummary"/>
@@ -369,59 +207,30 @@ public virtual Mozu.Api.Contracts.ProductRuntime.ProductValidationSummary Valida
 		/// <example>
 		/// <code>
 		///   var product = new Product();
-		///   var productValidationSummary = await product.ValidateProductAsync( productOptionSelections,  productCode,  skipInventoryCheck,  quantity,  skipDefaults,  responseFields);
+		///   var productValidationSummary = await product.ValidateProductAsync( productOptionSelections,  productCode,  skipInventoryCheck,  quantity,  skipDefaults,  purchaseLocation,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductRuntime.ProductValidationSummary> ValidateProductAsync(Mozu.Api.Contracts.ProductRuntime.ProductOptionSelections productOptionSelections, string productCode, bool? skipInventoryCheck =  null, int? quantity =  null, bool? skipDefaults =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductRuntime.ProductValidationSummary> ValidateProductAsync(Mozu.Api.Contracts.ProductRuntime.ProductOptionSelections productOptionSelections, string productCode, bool? skipInventoryCheck =  null, int? quantity =  null, bool? skipDefaults =  null, string purchaseLocation =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductRuntime.ProductValidationSummary> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Storefront.ProductClient.ValidateProductClient( productOptionSelections,  productCode,  skipInventoryCheck,  quantity,  skipDefaults,  responseFields);
+			var client = Mozu.Api.Clients.Commerce.Catalog.Storefront.ProductClient.ValidateProductClient( productOptionSelections,  productCode,  skipInventoryCheck,  quantity,  skipDefaults,  purchaseLocation,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Evaluates whether a collection of discounts specified in the request can be redeemed for the supplied product code.
-		/// </summary>
-		/// <param name="allowInactive">If true, allow inactive categories to be retrieved in the category list response. If false, the categories retrieved will not include ones marked inactive.</param>
-		/// <param name="customerAccountId">The unique identifier of the customer account for which to retrieve wish lists.</param>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="skipInventoryCheck">If true, skip the process to validate inventory when creating this product reservation.</param>
-		/// <param name="variationProductCode">Merchant-created code associated with a specific product variation. Variation product codes maintain an association with the base product code.</param>
-		/// <param name="discountSelections">The discounts to evaluate for a specified product code at the time of purchase.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductRuntime.DiscountValidationSummary"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var product = new Product();
-		///   var discountValidationSummary = product.ValidateDiscounts( discountSelections,  productCode,  variationProductCode,  customerAccountId,  allowInactive,  skipInventoryCheck,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductRuntime.DiscountValidationSummary ValidateDiscounts(Mozu.Api.Contracts.ProductRuntime.DiscountSelections discountSelections, string productCode, string variationProductCode =  null, int? customerAccountId =  null, bool? allowInactive =  null, bool? skipInventoryCheck =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductRuntime.DiscountValidationSummary> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Storefront.ProductClient.ValidateDiscountsClient( discountSelections,  productCode,  variationProductCode,  customerAccountId,  allowInactive,  skipInventoryCheck,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Evaluates whether a collection of discounts specified in the request can be redeemed for the supplied product code.
+		/// 
 		/// </summary>
-		/// <param name="allowInactive">If true, allow inactive categories to be retrieved in the category list response. If false, the categories retrieved will not include ones marked inactive.</param>
-		/// <param name="customerAccountId">The unique identifier of the customer account for which to retrieve wish lists.</param>
-		/// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="skipInventoryCheck">If true, skip the process to validate inventory when creating this product reservation.</param>
+		/// <param name="allowInactive">If true, this operation returns inactive product discounts as part of the POST.</param>
+		/// <param name="customerAccountId">Unique ID of the customer account associated with the shopper requesting the discount.</param>
+		/// <param name="productCode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="skipInventoryCheck">If true, do not validate the product inventory when evaluating the list of discounts.</param>
 		/// <param name="variationProductCode">Merchant-created code associated with a specific product variation. Variation product codes maintain an association with the base product code.</param>
-		/// <param name="discountSelections">The discounts to evaluate for a specified product code at the time of purchase.</param>
+		/// <param name="discountSelections">List of discount IDs to evaluate for the specified product.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductRuntime.DiscountValidationSummary"/>
 		/// </returns>
@@ -431,46 +240,22 @@ public virtual Mozu.Api.Contracts.ProductRuntime.DiscountValidationSummary Valid
 		///   var discountValidationSummary = await product.ValidateDiscountsAsync( discountSelections,  productCode,  variationProductCode,  customerAccountId,  allowInactive,  skipInventoryCheck,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductRuntime.DiscountValidationSummary> ValidateDiscountsAsync(Mozu.Api.Contracts.ProductRuntime.DiscountSelections discountSelections, string productCode, string variationProductCode =  null, int? customerAccountId =  null, bool? allowInactive =  null, bool? skipInventoryCheck =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductRuntime.DiscountValidationSummary> ValidateDiscountsAsync(Mozu.Api.Contracts.ProductRuntime.DiscountSelections discountSelections, string productCode, string variationProductCode =  null, int? customerAccountId =  null, bool? allowInactive =  null, bool? skipInventoryCheck =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductRuntime.DiscountValidationSummary> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Storefront.ProductClient.ValidateDiscountsClient( discountSelections,  productCode,  variationProductCode,  customerAccountId,  allowInactive,  skipInventoryCheck,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the product cost based on a list of product codes. The product cost is the amount the merchant pays for the product—it is not the price that the shopper sees on the storefront (which is usually higher).
-		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="query">Properties for the product location inventory provided for queries to locate products by their location.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductRuntime.ProductCostCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var product = new Product();
-		///   var productCostCollection = product.GetProductCosts(_dataViewMode,  query,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductRuntime.ProductCostCollection GetProductCosts(Mozu.Api.Contracts.ProductRuntime.ProductCostQuery query, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductRuntime.ProductCostCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Storefront.ProductClient.GetProductCostsClient(_dataViewMode,  query,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the product cost based on a list of product codes. The product cost is the amount the merchant pays for the product—it is not the price that the shopper sees on the storefront (which is usually higher).
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="query">Properties for the product location inventory provided for queries to locate products by their location.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="query"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductRuntime.ProductCostCollection"/>
 		/// </returns>
@@ -480,46 +265,22 @@ public virtual Mozu.Api.Contracts.ProductRuntime.ProductCostCollection GetProduc
 		///   var productCostCollection = await product.GetProductCostsAsync(_dataViewMode,  query,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductRuntime.ProductCostCollection> GetProductCostsAsync(Mozu.Api.Contracts.ProductRuntime.ProductCostQuery query, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductRuntime.ProductCostCollection> GetProductCostsAsync(Mozu.Api.Contracts.ProductRuntime.ProductCostQuery query, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductRuntime.ProductCostCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Storefront.ProductClient.GetProductCostsClient(_dataViewMode,  query,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves product inventories for the storefront displayed products.
-		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="query">Properties for the product location inventory provided for queries to locate products by their location.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductRuntime.LocationInventoryCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var product = new Product();
-		///   var locationInventoryCollection = product.GetProductInventories(_dataViewMode,  query,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductRuntime.LocationInventoryCollection GetProductInventories(Mozu.Api.Contracts.ProductRuntime.LocationInventoryQuery query, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductRuntime.LocationInventoryCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Storefront.ProductClient.GetProductInventoriesClient(_dataViewMode,  query,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves product inventories for the storefront displayed products.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="query">Properties for the product location inventory provided for queries to locate products by their location.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="query"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductRuntime.LocationInventoryCollection"/>
 		/// </returns>
@@ -529,12 +290,12 @@ public virtual Mozu.Api.Contracts.ProductRuntime.LocationInventoryCollection Get
 		///   var locationInventoryCollection = await product.GetProductInventoriesAsync(_dataViewMode,  query,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductRuntime.LocationInventoryCollection> GetProductInventoriesAsync(Mozu.Api.Contracts.ProductRuntime.LocationInventoryQuery query, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductRuntime.LocationInventoryCollection> GetProductInventoriesAsync(Mozu.Api.Contracts.ProductRuntime.LocationInventoryQuery query, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductRuntime.LocationInventoryCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Storefront.ProductClient.GetProductInventoriesClient(_dataViewMode,  query,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
diff --git a/Mozu.Api/Resources/Commerce/Catalog/Storefront/ProductSearchResultResource.cs b/Mozu.Api/Resources/Commerce/Catalog/Storefront/ProductSearchResultResource.cs
old mode 100644
new mode 100755
index c45c6701..0d2a56b5
--- a/Mozu.Api/Resources/Commerce/Catalog/Storefront/ProductSearchResultResource.cs
+++ b/Mozu.Api/Resources/Commerce/Catalog/Storefront/ProductSearchResultResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Catalog.Storefront
 {
@@ -37,40 +38,14 @@ public ProductSearchResultResource CloneWithApiContext(Action<IApiContext> conte
 		}
 
 				
-		/// <summary>
-		/// Random access paging computes a set of , which can each then be provided to the  operation in the  resource or the  operation in the  resource. You can provide the computed groups in any order to the operations, and can therefore parallelize calls to retrieve products more quickly. To generate the set of , call this () operation, in which you can optionally provide query and/or filter parameters to limit the products matched by the cursor. After executing this operation, pass one of the returned  to the  parameter of the  or  operations.
-		/// </summary>
-		/// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="query">Properties for the product location inventory provided for queries to locate products by their location.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductRuntime.ProductSearchRandomAccessCursor"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var productsearchresult = new ProductSearchResult();
-		///   var productSearchRandomAccessCursor = productsearchresult.GetRandomAccessCursor( query,  filter,  pageSize,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductRuntime.ProductSearchRandomAccessCursor GetRandomAccessCursor(string query =  null, string filter =  null, int? pageSize =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductRuntime.ProductSearchRandomAccessCursor> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Storefront.ProductSearchResultClient.GetRandomAccessCursorClient( query,  filter,  pageSize,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Random access paging computes a set of , which can each then be provided to the  operation in the  resource or the  operation in the  resource. You can provide the computed groups in any order to the operations, and can therefore parallelize calls to retrieve products more quickly. To generate the set of , call this () operation, in which you can optionally provide query and/or filter parameters to limit the products matched by the cursor. After executing this operation, pass one of the returned  to the  parameter of the  or  operations.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="query">Properties for the product location inventory provided for queries to locate products by their location.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="query"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductRuntime.ProductSearchRandomAccessCursor"/>
 		/// </returns>
@@ -80,93 +55,45 @@ public virtual Mozu.Api.Contracts.ProductRuntime.ProductSearchRandomAccessCursor
 		///   var productSearchRandomAccessCursor = await productsearchresult.GetRandomAccessCursorAsync( query,  filter,  pageSize,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductRuntime.ProductSearchRandomAccessCursor> GetRandomAccessCursorAsync(string query =  null, string filter =  null, int? pageSize =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductRuntime.ProductSearchRandomAccessCursor> GetRandomAccessCursorAsync(string query =  null, string filter =  null, int? pageSize =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductRuntime.ProductSearchRandomAccessCursor> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Storefront.ProductSearchResultClient.GetRandomAccessCursorClient( query,  filter,  pageSize,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Searches the categories displayed on the web storefront for products or product options that the shopper types in a search query.
-		/// </summary>
-		/// <param name="cursorMark">In your first deep paged request, set this parameter to . Then, in all subsequent requests, set this parameter to the subsequent values of  that's returned in each response to continue paging through the results. Continue this pattern until  is null, which signifies the end of the paged results.</param>
-		/// <param name="enableSearchTuningRules">Enables search tuning rules on your site.</param>
-		/// <param name="facet">Individually list the facet fields you want to display in a web storefront product search.</param>
-		/// <param name="facetFieldRangeQuery">Display a range facet not specified in a template in a web storefront product search by listing the facet field and the range to display.</param>
-		/// <param name="facetHierDepth">If filtering using category facets in a hierarchy, the number of category hierarchy levels to return for the facet. This option is only available for category facets.</param>
-		/// <param name="facetHierPrefix">If filtering using category facets in a hierarchy, the parent categories you want to skip in the storefront product search. This parameter is only available for category facets.</param>
-		/// <param name="facetHierValue">If filtering using category facets in a hierarchy, the category in the hierarchy to begin faceting on. This parameter is only available for category facets.</param>
-		/// <param name="facetPageSize">The number of facet values to return for one or more facets.</param>
-		/// <param name="facetPrefix">Use this parameter to filter facet values that are returned by an associated search result by a prefix.For example, to filter on colors that start with b, such as blue, black, or brown you can specify the following:</param>
-		/// <param name="facetSettings">Settings reserved for future facet search functionality on a web storefront product search.</param>
-		/// <param name="facetStartIndex">When paging through multiple facets, the startIndex value for each facet.</param>
-		/// <param name="facetTemplate">The facet template to use on the storefront. A template displays all facets associated with the template on the web storefront product search. Currently, only category-level facet templates are available.</param>
-		/// <param name="facetTemplateExclude">A comma-separated list of the facets to exclude from the facetTemplate.        </param>
-		/// <param name="facetTemplateSubset">Display a subset of the facets defined in the template specified in facetTemplate parameter.</param>
-		/// <param name="facetValueFilter">The facet values to apply to the filter.</param>
-		/// <param name="facetValueSort">Use this parameter to specify facet sorting outside the predefined facet definitions (which require a category). The most common options are:*  (default)—Sorts by product count (highest count first).* —Sorts by lexicographic order. In most cases, this means alphabetical order.The following code demonstrates an example of  sort:</param>
-		/// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="query">Properties for the product location inventory provided for queries to locate products by their location.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="responseOptions">Options you can specify for the response. This parameter is null by default.You can primarily use this parameter to return volume price band information in product details, which you can then display on category pages and search results depanding on your theme configuration. To return volume price band information, set this parameter to .</param>
-		/// <param name="searchSettings">The settings to control product search and indexing behavior.</param>
-		/// <param name="searchTuningRuleCode">The unique identifier of the search tuning rule.</param>
-		/// <param name="searchTuningRuleContext">The category ID that the search tuning rule applies to.</param>
-		/// <param name="sortBy"></param>
-		/// <param name="startIndex"></param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductRuntime.ProductSearchResult"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var productsearchresult = new ProductSearchResult();
-		///   var productSearchResult = productsearchresult.Search( query,  filter,  facetTemplate,  facetTemplateSubset,  facet,  facetFieldRangeQuery,  facetHierPrefix,  facetHierValue,  facetHierDepth,  facetStartIndex,  facetPageSize,  facetSettings,  facetValueFilter,  sortBy,  pageSize,  startIndex,  searchSettings,  enableSearchTuningRules,  searchTuningRuleContext,  searchTuningRuleCode,  facetTemplateExclude,  facetPrefix,  responseOptions,  cursorMark,  facetValueSort,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductRuntime.ProductSearchResult Search(string query =  null, string filter =  null, string facetTemplate =  null, string facetTemplateSubset =  null, string facet =  null, string facetFieldRangeQuery =  null, string facetHierPrefix =  null, string facetHierValue =  null, string facetHierDepth =  null, string facetStartIndex =  null, string facetPageSize =  null, string facetSettings =  null, string facetValueFilter =  null, string sortBy =  null, int? pageSize =  null, int? startIndex =  null, string searchSettings =  null, bool? enableSearchTuningRules =  null, string searchTuningRuleContext =  null, string searchTuningRuleCode =  null, string facetTemplateExclude =  null, string facetPrefix =  null, string responseOptions =  null, string cursorMark =  null, string facetValueSort =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductRuntime.ProductSearchResult> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Storefront.ProductSearchResultClient.SearchClient( query,  filter,  facetTemplate,  facetTemplateSubset,  facet,  facetFieldRangeQuery,  facetHierPrefix,  facetHierValue,  facetHierDepth,  facetStartIndex,  facetPageSize,  facetSettings,  facetValueFilter,  sortBy,  pageSize,  startIndex,  searchSettings,  enableSearchTuningRules,  searchTuningRuleContext,  searchTuningRuleCode,  facetTemplateExclude,  facetPrefix,  responseOptions,  cursorMark,  facetValueSort,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Searches the categories displayed on the web storefront for products or product options that the shopper types in a search query.
+		/// 
 		/// </summary>
-		/// <param name="cursorMark">In your first deep paged request, set this parameter to . Then, in all subsequent requests, set this parameter to the subsequent values of  that's returned in each response to continue paging through the results. Continue this pattern until  is null, which signifies the end of the paged results.</param>
-		/// <param name="enableSearchTuningRules">Enables search tuning rules on your site.</param>
+		/// <param name="cursorMark"></param>
+		/// <param name="enableSearchTuningRules"></param>
 		/// <param name="facet">Individually list the facet fields you want to display in a web storefront product search.</param>
 		/// <param name="facetFieldRangeQuery">Display a range facet not specified in a template in a web storefront product search by listing the facet field and the range to display.</param>
 		/// <param name="facetHierDepth">If filtering using category facets in a hierarchy, the number of category hierarchy levels to return for the facet. This option is only available for category facets.</param>
 		/// <param name="facetHierPrefix">If filtering using category facets in a hierarchy, the parent categories you want to skip in the storefront product search. This parameter is only available for category facets.</param>
 		/// <param name="facetHierValue">If filtering using category facets in a hierarchy, the category in the hierarchy to begin faceting on. This parameter is only available for category facets.</param>
 		/// <param name="facetPageSize">The number of facet values to return for one or more facets.</param>
-		/// <param name="facetPrefix">Use this parameter to filter facet values that are returned by an associated search result by a prefix.For example, to filter on colors that start with b, such as blue, black, or brown you can specify the following:</param>
+		/// <param name="facetPrefix"></param>
 		/// <param name="facetSettings">Settings reserved for future facet search functionality on a web storefront product search.</param>
 		/// <param name="facetStartIndex">When paging through multiple facets, the startIndex value for each facet.</param>
 		/// <param name="facetTemplate">The facet template to use on the storefront. A template displays all facets associated with the template on the web storefront product search. Currently, only category-level facet templates are available.</param>
-		/// <param name="facetTemplateExclude">A comma-separated list of the facets to exclude from the facetTemplate.        </param>
+		/// <param name="facetTemplateExclude"></param>
 		/// <param name="facetTemplateSubset">Display a subset of the facets defined in the template specified in facetTemplate parameter.</param>
 		/// <param name="facetValueFilter">The facet values to apply to the filter.</param>
-		/// <param name="facetValueSort">Use this parameter to specify facet sorting outside the predefined facet definitions (which require a category). The most common options are:*  (default)—Sorts by product count (highest count first).* —Sorts by lexicographic order. In most cases, this means alphabetical order.The following code demonstrates an example of  sort:</param>
-		/// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="query">Properties for the product location inventory provided for queries to locate products by their location.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="responseOptions">Options you can specify for the response. This parameter is null by default.You can primarily use this parameter to return volume price band information in product details, which you can then display on category pages and search results depanding on your theme configuration. To return volume price band information, set this parameter to .</param>
-		/// <param name="searchSettings">The settings to control product search and indexing behavior.</param>
-		/// <param name="searchTuningRuleCode">The unique identifier of the search tuning rule.</param>
-		/// <param name="searchTuningRuleContext">The category ID that the search tuning rule applies to.</param>
-		/// <param name="sortBy"></param>
+		/// <param name="facetValueSort"></param>
+		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. You can filter product search results by any of its properties, including product code, type, category, and name. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=categoryId+eq+12"</param>
+		/// <param name="pageSize">Used to page results from a query. Indicates the maximum number of entities to return from a query. Default value: 12. Max value is 200.</param>
+		/// <param name="query">The terms to search on.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="responseOptions"></param>
+		/// <param name="searchSettings"></param>
+		/// <param name="searchTuningRuleCode"></param>
+		/// <param name="searchTuningRuleContext"></param>
+		/// <param name="sortBy">The element to sort the results by and the order in which the results appear. Either ascending order (a-z) which accepts 'asc' or 'asc' or descending order (z-a) which accepts 'desc' or 'desc'. The sortBy parameter follows an available property.</param>
 		/// <param name="startIndex"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductRuntime.ProductSearchResult"/>
@@ -177,50 +104,24 @@ public virtual Mozu.Api.Contracts.ProductRuntime.ProductSearchResult Search(stri
 		///   var productSearchResult = await productsearchresult.SearchAsync( query,  filter,  facetTemplate,  facetTemplateSubset,  facet,  facetFieldRangeQuery,  facetHierPrefix,  facetHierValue,  facetHierDepth,  facetStartIndex,  facetPageSize,  facetSettings,  facetValueFilter,  sortBy,  pageSize,  startIndex,  searchSettings,  enableSearchTuningRules,  searchTuningRuleContext,  searchTuningRuleCode,  facetTemplateExclude,  facetPrefix,  responseOptions,  cursorMark,  facetValueSort,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductRuntime.ProductSearchResult> SearchAsync(string query =  null, string filter =  null, string facetTemplate =  null, string facetTemplateSubset =  null, string facet =  null, string facetFieldRangeQuery =  null, string facetHierPrefix =  null, string facetHierValue =  null, string facetHierDepth =  null, string facetStartIndex =  null, string facetPageSize =  null, string facetSettings =  null, string facetValueFilter =  null, string sortBy =  null, int? pageSize =  null, int? startIndex =  null, string searchSettings =  null, bool? enableSearchTuningRules =  null, string searchTuningRuleContext =  null, string searchTuningRuleCode =  null, string facetTemplateExclude =  null, string facetPrefix =  null, string responseOptions =  null, string cursorMark =  null, string facetValueSort =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductRuntime.ProductSearchResult> SearchAsync(string query =  null, string filter =  null, string facetTemplate =  null, string facetTemplateSubset =  null, string facet =  null, string facetFieldRangeQuery =  null, string facetHierPrefix =  null, string facetHierValue =  null, string facetHierDepth =  null, string facetStartIndex =  null, string facetPageSize =  null, string facetSettings =  null, string facetValueFilter =  null, string sortBy =  null, int? pageSize =  null, int? startIndex =  null, string searchSettings =  null, bool? enableSearchTuningRules =  null, string searchTuningRuleContext =  null, string searchTuningRuleCode =  null, string facetTemplateExclude =  null, string facetPrefix =  null, string responseOptions =  null, string cursorMark =  null, string facetValueSort =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductRuntime.ProductSearchResult> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Storefront.ProductSearchResultClient.SearchClient( query,  filter,  facetTemplate,  facetTemplateSubset,  facet,  facetFieldRangeQuery,  facetHierPrefix,  facetHierValue,  facetHierDepth,  facetStartIndex,  facetPageSize,  facetSettings,  facetValueFilter,  sortBy,  pageSize,  startIndex,  searchSettings,  enableSearchTuningRules,  searchTuningRuleContext,  searchTuningRuleCode,  facetTemplateExclude,  facetPrefix,  responseOptions,  cursorMark,  facetValueSort,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Suggests possible search terms as the shopper enters search text.
-		/// </summary>
-		/// <param name="groups">Specifies the group that you want this operation to return in the response. This parameter accepts one or more values, separated by comma.For example, if you set this parameter to , then this operation returns a  object that contains suggestions for products that match the user entered characters in the search field.The valid values for this parameter are the following:*  — Indicates that products should be matched against and returned in the response. The search  value is compared against product name and code. The response contains a  with a name of  and a collection of . Each collection item has a  of Product and contains a  equal to a complete product object.*  — Indicates that categories should be matched against and returned in the response. The search  value is compared to category name.  The response contains a  with a name of  and a collection of . Each collection item has a  of Category and contains a  equal to a complete category object.*  — Indicates that previously used search terms (keywords) should be matched against and returned in the response, sorted by frequency of use. Keep in mind that it is not currently possible to edit or remove search terms that may be considered undesirable via the  API. The response contains a  with a name of  and a collection of . Each collection item has a  of Term and contains a  equal to a string value of the matched search term.The default value is ; however, the  Core Theme only integrates  and ignores the  group.This operation only returns data that is then made available to your theme. If you set this paramter to multiple values,  returns multiple  in the response. Depending on your requirements, you can then customize your theme to display the groups together or as separate lists in the displayed search suggestions.</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="query">Properties for the product location inventory provided for queries to locate products by their location.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ProductRuntime.SearchSuggestionResult"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var productsearchresult = new ProductSearchResult();
-		///   var searchSuggestionResult = productsearchresult.Suggest( query,  groups,  pageSize,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ProductRuntime.SearchSuggestionResult Suggest(string query =  null, string groups =  null, int? pageSize =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ProductRuntime.SearchSuggestionResult> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Storefront.ProductSearchResultClient.SuggestClient( query,  groups,  pageSize,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Suggests possible search terms as the shopper enters search text.
+		/// 
 		/// </summary>
-		/// <param name="groups">Specifies the group that you want this operation to return in the response. This parameter accepts one or more values, separated by comma.For example, if you set this parameter to , then this operation returns a  object that contains suggestions for products that match the user entered characters in the search field.The valid values for this parameter are the following:*  — Indicates that products should be matched against and returned in the response. The search  value is compared against product name and code. The response contains a  with a name of  and a collection of . Each collection item has a  of Product and contains a  equal to a complete product object.*  — Indicates that categories should be matched against and returned in the response. The search  value is compared to category name.  The response contains a  with a name of  and a collection of . Each collection item has a  of Category and contains a  equal to a complete category object.*  — Indicates that previously used search terms (keywords) should be matched against and returned in the response, sorted by frequency of use. Keep in mind that it is not currently possible to edit or remove search terms that may be considered undesirable via the  API. The response contains a  with a name of  and a collection of . Each collection item has a  of Term and contains a  equal to a string value of the matched search term.The default value is ; however, the  Core Theme only integrates  and ignores the  group.This operation only returns data that is then made available to your theme. If you set this paramter to multiple values,  returns multiple  in the response. Depending on your requirements, you can then customize your theme to display the groups together or as separate lists in the displayed search suggestions.</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="query">Properties for the product location inventory provided for queries to locate products by their location.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="groups"></param>
+		/// <param name="pageSize">Indicates the maximum number of entities to return from a query. Default value: 10. Max value: 200.</param>
+		/// <param name="query"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ProductRuntime.SearchSuggestionResult"/>
 		/// </returns>
@@ -230,12 +131,12 @@ public virtual Mozu.Api.Contracts.ProductRuntime.SearchSuggestionResult Suggest(
 		///   var searchSuggestionResult = await productsearchresult.SuggestAsync( query,  groups,  pageSize,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ProductRuntime.SearchSuggestionResult> SuggestAsync(string query =  null, string groups =  null, int? pageSize =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ProductRuntime.SearchSuggestionResult> SuggestAsync(string query =  null, string groups =  null, int? pageSize =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ProductRuntime.SearchSuggestionResult> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Storefront.ProductSearchResultClient.SuggestClient( query,  groups,  pageSize,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
diff --git a/Mozu.Api/Resources/Commerce/Catalog/Storefront/ShippingResource.cs b/Mozu.Api/Resources/Commerce/Catalog/Storefront/ShippingResource.cs
old mode 100644
new mode 100755
index 2bad2939..c65e33ef
--- a/Mozu.Api/Resources/Commerce/Catalog/Storefront/ShippingResource.cs
+++ b/Mozu.Api/Resources/Commerce/Catalog/Storefront/ShippingResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Catalog.Storefront
 {
@@ -37,38 +38,38 @@ public ShippingResource CloneWithApiContext(Action<IApiContext> contextModificat
 		}
 
 				
+
 		/// <summary>
-		/// Retrieves the shipping rates applicable for the site.
+		/// 
 		/// </summary>
-		/// <param name="includeRawResponse">Set this parameter to  to retrieve the full raw JSON response from a shipping carrier (instead of just the shipping rate).</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="rateRequest">Properties required to request a shipping rate calculation.</param>
+		/// <param name="includeRawResponse"></param>
+		/// <param name="rateRequestGroupList"></param>
 		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ShippingRuntime.RatesResponse"/>
+		/// List{<see cref="Mozu.Api.Contracts.ShippingRuntime.RatesResponseGroup"/>}
 		/// </returns>
 		/// <example>
 		/// <code>
 		///   var shipping = new Shipping();
-		///   var ratesResponse = shipping.GetRates( rateRequest,  includeRawResponse,  responseFields);
+		///   var ratesResponseGroup = await shipping.GetMultiRatesAsync( rateRequestGroupList,  includeRawResponse);
 		/// </code>
 		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ShippingRuntime.RatesResponse GetRates(Mozu.Api.Contracts.ShippingRuntime.RateRequest rateRequest, bool? includeRawResponse =  null, string responseFields =  null)
+		public virtual async Task<List<Mozu.Api.Contracts.ShippingRuntime.RatesResponseGroup>> GetMultiRatesAsync(List<Mozu.Api.Contracts.ShippingRuntime.RateRequestGroup> rateRequestGroupList, bool? includeRawResponse =  null, CancellationToken ct = default(CancellationToken))
 		{
-			MozuClient<Mozu.Api.Contracts.ShippingRuntime.RatesResponse> response;
-			var client = Mozu.Api.Clients.Commerce.Catalog.Storefront.ShippingClient.GetRatesClient( rateRequest,  includeRawResponse,  responseFields);
+			MozuClient<List<Mozu.Api.Contracts.ShippingRuntime.RatesResponseGroup>> response;
+			var client = Mozu.Api.Clients.Commerce.Catalog.Storefront.ShippingClient.GetMultiRatesClient( rateRequestGroupList,  includeRawResponse);
 			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+			return await response.ResultAsync();
 
 		}
 
+
 		/// <summary>
-		/// Retrieves the shipping rates applicable for the site.
+		/// 
 		/// </summary>
-		/// <param name="includeRawResponse">Set this parameter to  to retrieve the full raw JSON response from a shipping carrier (instead of just the shipping rate).</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="rateRequest">Properties required to request a shipping rate calculation.</param>
+		/// <param name="includeRawResponse"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="rateRequest">Properties of the shipping rate request sent on behalf of the storefront website.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ShippingRuntime.RatesResponse"/>
 		/// </returns>
@@ -78,12 +79,12 @@ public virtual Mozu.Api.Contracts.ShippingRuntime.RatesResponse GetRates(Mozu.Ap
 		///   var ratesResponse = await shipping.GetRatesAsync( rateRequest,  includeRawResponse,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ShippingRuntime.RatesResponse> GetRatesAsync(Mozu.Api.Contracts.ShippingRuntime.RateRequest rateRequest, bool? includeRawResponse =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ShippingRuntime.RatesResponse> GetRatesAsync(Mozu.Api.Contracts.ShippingRuntime.RateRequest rateRequest, bool? includeRawResponse =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ShippingRuntime.RatesResponse> response;
 			var client = Mozu.Api.Clients.Commerce.Catalog.Storefront.ShippingClient.GetRatesClient( rateRequest,  includeRawResponse,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
diff --git a/Mozu.Api/Resources/Commerce/ChannelGroupResource.cs b/Mozu.Api/Resources/Commerce/ChannelGroupResource.cs
old mode 100644
new mode 100755
index 3def0d27..3e296c75
--- a/Mozu.Api/Resources/Commerce/ChannelGroupResource.cs
+++ b/Mozu.Api/Resources/Commerce/ChannelGroupResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce
 {
@@ -37,42 +38,15 @@ public ChannelGroupResource CloneWithApiContext(Action<IApiContext> contextModif
 		}
 
 				
-		/// <summary>
-		/// Retrieves a list of defined channel groups according to any filter and sort criteria specified in the request.
-		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelGroupCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var channelgroup = new ChannelGroup();
-		///   var channelGroupCollection = channelgroup.GetChannelGroups( startIndex,  pageSize,  sortBy,  filter,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelGroupCollection GetChannelGroups(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelGroupCollection> response;
-			var client = Mozu.Api.Clients.Commerce.ChannelGroupClient.GetChannelGroupsClient( startIndex,  pageSize,  sortBy,  filter,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of defined channel groups according to any filter and sort criteria specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelGroupCollection"/>
 		/// </returns>
@@ -82,46 +56,22 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelGroupCollectio
 		///   var channelGroupCollection = await channelgroup.GetChannelGroupsAsync( startIndex,  pageSize,  sortBy,  filter,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelGroupCollection> GetChannelGroupsAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelGroupCollection> GetChannelGroupsAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelGroupCollection> response;
 			var client = Mozu.Api.Clients.Commerce.ChannelGroupClient.GetChannelGroupsClient( startIndex,  pageSize,  sortBy,  filter,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the details of a defined channel group.
-		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelGroup"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var channelgroup = new ChannelGroup();
-		///   var channelGroup = channelgroup.GetChannelGroup( code,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelGroup GetChannelGroup(string code, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelGroup> response;
-			var client = Mozu.Api.Clients.Commerce.ChannelGroupClient.GetChannelGroupClient( code,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of a defined channel group.
+		/// 
 		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="code">The code that uniquely identifies the channel group.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelGroup"/>
 		/// </returns>
@@ -131,46 +81,22 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelGroup GetChann
 		///   var channelGroup = await channelgroup.GetChannelGroupAsync( code,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelGroup> GetChannelGroupAsync(string code, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelGroup> GetChannelGroupAsync(string code, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelGroup> response;
 			var client = Mozu.Api.Clients.Commerce.ChannelGroupClient.GetChannelGroupClient( code,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Creates a new group of channels with common information.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="channelGroup">Properties of a group of channels that share common information.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelGroup"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var channelgroup = new ChannelGroup();
-		///   var channelGroup = channelgroup.CreateChannelGroup( channelGroup,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelGroup CreateChannelGroup(Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelGroup channelGroup, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelGroup> response;
-			var client = Mozu.Api.Clients.Commerce.ChannelGroupClient.CreateChannelGroupClient( channelGroup,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Creates a new group of channels with common information.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="channelGroup">Properties of a group of channels that share common information.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="channelGroup">Properties of the channel group to create.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelGroup"/>
 		/// </returns>
@@ -180,48 +106,23 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelGroup CreateCh
 		///   var channelGroup = await channelgroup.CreateChannelGroupAsync( channelGroup,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelGroup> CreateChannelGroupAsync(Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelGroup channelGroup, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelGroup> CreateChannelGroupAsync(Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelGroup channelGroup, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelGroup> response;
 			var client = Mozu.Api.Clients.Commerce.ChannelGroupClient.CreateChannelGroupClient( channelGroup,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates one or more properties of a defined channel group.
-		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="channelGroup">Properties of a group of channels that share common information.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelGroup"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var channelgroup = new ChannelGroup();
-		///   var channelGroup = channelgroup.UpdateChannelGroup( channelGroup,  code,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelGroup UpdateChannelGroup(Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelGroup channelGroup, string code, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelGroup> response;
-			var client = Mozu.Api.Clients.Commerce.ChannelGroupClient.UpdateChannelGroupClient( channelGroup,  code,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates one or more properties of a defined channel group.
+		/// 
 		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="channelGroup">Properties of a group of channels that share common information.</param>
+		/// <param name="code">Code that identifies the channel group.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="channelGroup">Properties of the channel group to update.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelGroup"/>
 		/// </returns>
@@ -231,41 +132,19 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelGroup UpdateCh
 		///   var channelGroup = await channelgroup.UpdateChannelGroupAsync( channelGroup,  code,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelGroup> UpdateChannelGroupAsync(Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelGroup channelGroup, string code, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelGroup> UpdateChannelGroupAsync(Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelGroup channelGroup, string code, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelGroup> response;
 			var client = Mozu.Api.Clients.Commerce.ChannelGroupClient.UpdateChannelGroupClient( channelGroup,  code,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Deletes a defined group of channels, which removes the group association with each channel in the group but does not delete the channel definitions themselves.
-		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var channelgroup = new ChannelGroup();
-		///   channelgroup.DeleteChannelGroup( code);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteChannelGroup(string code)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.ChannelGroupClient.DeleteChannelGroupClient( code);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes a defined group of channels, which removes the group association with each channel in the group but does not delete the channel definitions themselves.
+		/// 
 		/// </summary>
 		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
 		/// <returns>
@@ -277,12 +156,12 @@ public virtual void DeleteChannelGroup(string code)
 		///   await channelgroup.DeleteChannelGroupAsync( code);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteChannelGroupAsync(string code)
+		public virtual async Task DeleteChannelGroupAsync(string code, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.ChannelGroupClient.DeleteChannelGroupClient( code);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/ChannelResource.cs b/Mozu.Api/Resources/Commerce/ChannelResource.cs
old mode 100644
new mode 100755
index b359514e..a5a97c5a
--- a/Mozu.Api/Resources/Commerce/ChannelResource.cs
+++ b/Mozu.Api/Resources/Commerce/ChannelResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce
 {
@@ -37,42 +38,15 @@ public ChannelResource CloneWithApiContext(Action<IApiContext> contextModificati
 		}
 
 				
-		/// <summary>
-		/// Retrieves a list of channels defined for a tenant according to any filter or sort criteria specified in the request.
-		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var channel = new Channel();
-		///   var channelCollection = channel.GetChannels( startIndex,  pageSize,  sortBy,  filter,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelCollection GetChannels(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelCollection> response;
-			var client = Mozu.Api.Clients.Commerce.ChannelClient.GetChannelsClient( startIndex,  pageSize,  sortBy,  filter,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of channels defined for a tenant according to any filter or sort criteria specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelCollection"/>
 		/// </returns>
@@ -82,46 +56,22 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelCollection Get
 		///   var channelCollection = await channel.GetChannelsAsync( startIndex,  pageSize,  sortBy,  filter,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelCollection> GetChannelsAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelCollection> GetChannelsAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Channels.ChannelCollection> response;
 			var client = Mozu.Api.Clients.Commerce.ChannelClient.GetChannelsClient( startIndex,  pageSize,  sortBy,  filter,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the details of the channel specified in the request.
-		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Channels.Channel"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var channel = new Channel();
-		///   var channel = channel.GetChannel( code,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Channels.Channel GetChannel(string code, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Channels.Channel> response;
-			var client = Mozu.Api.Clients.Commerce.ChannelClient.GetChannelClient( code,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of the channel specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="code">User-defined code that identifies the channel to retrieve.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Channels.Channel"/>
 		/// </returns>
@@ -131,46 +81,22 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Channels.Channel GetChannel(st
 		///   var channel = await channel.GetChannelAsync( code,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Channels.Channel> GetChannelAsync(string code, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Channels.Channel> GetChannelAsync(string code, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Channels.Channel> response;
 			var client = Mozu.Api.Clients.Commerce.ChannelClient.GetChannelClient( code,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Creates a new channel that defines a new logical business division to use for financial reporting.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="channel">Properties of a channel used to divide a company into logical business divisions, such as "US Retail," "US Online," or "Amazon." All sites and orders are associated with a channel.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Channels.Channel"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var channel = new Channel();
-		///   var channel = channel.CreateChannel( channel,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Channels.Channel CreateChannel(Mozu.Api.Contracts.CommerceRuntime.Channels.Channel channel, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Channels.Channel> response;
-			var client = Mozu.Api.Clients.Commerce.ChannelClient.CreateChannelClient( channel,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Creates a new channel that defines a new logical business division to use for financial reporting.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="channel">Properties of a channel used to divide a company into logical business divisions, such as "US Retail," "US Online," or "Amazon." All sites and orders are associated with a channel.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="channel">Properties of the channel to create.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Channels.Channel"/>
 		/// </returns>
@@ -180,48 +106,23 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Channels.Channel CreateChannel
 		///   var channel = await channel.CreateChannelAsync( channel,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Channels.Channel> CreateChannelAsync(Mozu.Api.Contracts.CommerceRuntime.Channels.Channel channel, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Channels.Channel> CreateChannelAsync(Mozu.Api.Contracts.CommerceRuntime.Channels.Channel channel, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Channels.Channel> response;
 			var client = Mozu.Api.Clients.Commerce.ChannelClient.CreateChannelClient( channel,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates one or more details of a defined channel, including the associated sites.
-		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="channel">Properties of a channel used to divide a company into logical business divisions, such as "US Retail," "US Online," or "Amazon." All sites and orders are associated with a channel.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Channels.Channel"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var channel = new Channel();
-		///   var channel = channel.UpdateChannel( channel,  code,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Channels.Channel UpdateChannel(Mozu.Api.Contracts.CommerceRuntime.Channels.Channel channel, string code, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Channels.Channel> response;
-			var client = Mozu.Api.Clients.Commerce.ChannelClient.UpdateChannelClient( channel,  code,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates one or more details of a defined channel, including the associated sites.
+		/// 
 		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="channel">Properties of a channel used to divide a company into logical business divisions, such as "US Retail," "US Online," or "Amazon." All sites and orders are associated with a channel.</param>
+		/// <param name="code">User-defined code that identifies the channel to update.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="channel">Properties of a the channel to update.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Channels.Channel"/>
 		/// </returns>
@@ -231,43 +132,21 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Channels.Channel UpdateChannel
 		///   var channel = await channel.UpdateChannelAsync( channel,  code,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Channels.Channel> UpdateChannelAsync(Mozu.Api.Contracts.CommerceRuntime.Channels.Channel channel, string code, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Channels.Channel> UpdateChannelAsync(Mozu.Api.Contracts.CommerceRuntime.Channels.Channel channel, string code, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Channels.Channel> response;
 			var client = Mozu.Api.Clients.Commerce.ChannelClient.UpdateChannelClient( channel,  code,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Deletes a defined channel for the tenant and removes the defined site associations. After deleting this channel, assign its associated sites to another channel.
-		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var channel = new Channel();
-		///   channel.DeleteChannel( code);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteChannel(string code)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.ChannelClient.DeleteChannelClient( code);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes a defined channel for the tenant and removes the defined site associations. After deleting this channel, assign its associated sites to another channel.
+		/// 
 		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
+		/// <param name="code">User-defined code that identifies the channel to delete.</param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -277,12 +156,12 @@ public virtual void DeleteChannel(string code)
 		///   await channel.DeleteChannelAsync( code);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteChannelAsync(string code)
+		public virtual async Task DeleteChannelAsync(string code, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.ChannelClient.DeleteChannelClient( code);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/CheckoutResource.cs b/Mozu.Api/Resources/Commerce/CheckoutResource.cs
new file mode 100755
index 00000000..96e79b78
--- /dev/null
+++ b/Mozu.Api/Resources/Commerce/CheckoutResource.cs
@@ -0,0 +1,328 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using Mozu.Api.Security;
+using System.Threading.Tasks;
+using Newtonsoft.Json.Linq;
+using System.Threading;
+
+namespace Mozu.Api.Resources.Commerce
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	public partial class CheckoutResource  	{
+		///
+		/// <see cref="Mozu.Api.ApiContext"/>
+		///
+		private readonly IApiContext _apiContext;
+
+		
+		public CheckoutResource(IApiContext apiContext) 
+		{
+			_apiContext = apiContext;
+		}
+
+		public CheckoutResource CloneWithApiContext(Action<IApiContext> contextModification) 
+		{
+			return new CheckoutResource(_apiContext.CloneWith(contextModification));
+		}
+
+				
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="q"></param>
+		/// <param name="qLimit"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
+		/// <returns>
+		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Checkouts.CheckoutCollection"/>
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var checkout = new Checkout();
+		///   var checkoutCollection = await checkout.GetCheckoutsAsync( startIndex,  pageSize,  sortBy,  filter,  q,  qLimit,  responseFields);
+		/// </code>
+		/// </example>
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Checkouts.CheckoutCollection> GetCheckoutsAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string q =  null, int? qLimit =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
+		{
+			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Checkouts.CheckoutCollection> response;
+			var client = Mozu.Api.Clients.Commerce.CheckoutClient.GetCheckoutsClient( startIndex,  pageSize,  sortBy,  filter,  q,  qLimit,  responseFields);
+			client.WithContext(_apiContext);
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+			return await response.ResultAsync();
+
+		}
+
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="checkoutId"></param>
+		/// <returns>
+		/// List{string}
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var checkout = new Checkout();
+		///   var string = await checkout.GetAvailableActionsAsync( checkoutId);
+		/// </code>
+		/// </example>
+		public virtual async Task<List<string>> GetAvailableActionsAsync(string checkoutId, CancellationToken ct = default(CancellationToken))
+		{
+			MozuClient<List<string>> response;
+			var client = Mozu.Api.Clients.Commerce.CheckoutClient.GetAvailableActionsClient( checkoutId);
+			client.WithContext(_apiContext);
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+			return await response.ResultAsync();
+
+		}
+
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="checkoutId"></param>
+		/// <returns>
+		/// List{<see cref="Mozu.Api.Contracts.CommerceRuntime.Checkouts.CheckoutGroupRates"/>}
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var checkout = new Checkout();
+		///   var checkoutGroupRates = await checkout.GetAvailableShippingMethodsAsync( checkoutId);
+		/// </code>
+		/// </example>
+		public virtual async Task<List<Mozu.Api.Contracts.CommerceRuntime.Checkouts.CheckoutGroupRates>> GetAvailableShippingMethodsAsync(string checkoutId, CancellationToken ct = default(CancellationToken))
+		{
+			MozuClient<List<Mozu.Api.Contracts.CommerceRuntime.Checkouts.CheckoutGroupRates>> response;
+			var client = Mozu.Api.Clients.Commerce.CheckoutClient.GetAvailableShippingMethodsClient( checkoutId);
+			client.WithContext(_apiContext);
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+			return await response.ResultAsync();
+
+		}
+
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="checkoutId"></param>
+		/// <param name="responseFields"></param>
+		/// <returns>
+		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout"/>
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var checkout = new Checkout();
+		///   var checkout = await checkout.GetCheckoutAsync( checkoutId,  responseFields);
+		/// </code>
+		/// </example>
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout> GetCheckoutAsync(string checkoutId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
+		{
+			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout> response;
+			var client = Mozu.Api.Clients.Commerce.CheckoutClient.GetCheckoutClient( checkoutId,  responseFields);
+			client.WithContext(_apiContext);
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+			return await response.ResultAsync();
+
+		}
+
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="cartId"></param>
+		/// <param name="responseFields"></param>
+		/// <returns>
+		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout"/>
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var checkout = new Checkout();
+		///   var checkout = await checkout.CreateCheckoutFromCartAsync( cartId,  responseFields);
+		/// </code>
+		/// </example>
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout> CreateCheckoutFromCartAsync(string cartId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
+		{
+			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout> response;
+			var client = Mozu.Api.Clients.Commerce.CheckoutClient.CreateCheckoutFromCartClient( cartId,  responseFields);
+			client.WithContext(_apiContext);
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+			return await response.ResultAsync();
+
+		}
+
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="checkoutId"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="action"></param>
+		/// <returns>
+		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout"/>
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var checkout = new Checkout();
+		///   var checkout = await checkout.PerformCheckoutActionAsync( action,  checkoutId,  responseFields);
+		/// </code>
+		/// </example>
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout> PerformCheckoutActionAsync(Mozu.Api.Contracts.CommerceRuntime.Checkouts.CheckoutAction action, string checkoutId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
+		{
+			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout> response;
+			var client = Mozu.Api.Clients.Commerce.CheckoutClient.PerformCheckoutActionClient( action,  checkoutId,  responseFields);
+			client.WithContext(_apiContext);
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+			return await response.ResultAsync();
+
+		}
+
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="checkoutId"></param>
+		/// <returns>
+		/// 
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var checkout = new Checkout();
+		///   await checkout.ResendCheckoutConfirmationEmailAsync( checkoutId);
+		/// </code>
+		/// </example>
+		public virtual async Task ResendCheckoutConfirmationEmailAsync(string checkoutId, CancellationToken ct = default(CancellationToken))
+		{
+			MozuClient response;
+			var client = Mozu.Api.Clients.Commerce.CheckoutClient.ResendCheckoutConfirmationEmailClient( checkoutId);
+			client.WithContext(_apiContext);
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+
+		}
+
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="checkoutId"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="groupShippingMethods"></param>
+		/// <returns>
+		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout"/>
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var checkout = new Checkout();
+		///   var checkout = await checkout.SetShippingMethodsAsync( groupShippingMethods,  checkoutId,  responseFields);
+		/// </code>
+		/// </example>
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout> SetShippingMethodsAsync(List<Mozu.Api.Contracts.CommerceRuntime.Checkouts.CheckoutGroupShippingMethod> groupShippingMethods, string checkoutId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
+		{
+			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout> response;
+			var client = Mozu.Api.Clients.Commerce.CheckoutClient.SetShippingMethodsClient( groupShippingMethods,  checkoutId,  responseFields);
+			client.WithContext(_apiContext);
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+			return await response.ResultAsync();
+
+		}
+
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="checkoutId"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="checkout"></param>
+		/// <returns>
+		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout"/>
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var checkout = new Checkout();
+		///   var checkout = await checkout.UpdateCheckoutAsync( checkout,  checkoutId,  responseFields);
+		/// </code>
+		/// </example>
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout> UpdateCheckoutAsync(Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout checkout, string checkoutId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
+		{
+			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout> response;
+			var client = Mozu.Api.Clients.Commerce.CheckoutClient.UpdateCheckoutClient( checkout,  checkoutId,  responseFields);
+			client.WithContext(_apiContext);
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+			return await response.ResultAsync();
+
+		}
+
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="checkoutId"></param>
+		/// <param name="digitalWalletType"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="digitalWallet"></param>
+		/// <returns>
+		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout"/>
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var checkout = new Checkout();
+		///   var checkout = await checkout.ProcessDigitalWalletAsync( digitalWallet,  checkoutId,  digitalWalletType,  responseFields);
+		/// </code>
+		/// </example>
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout> ProcessDigitalWalletAsync(Mozu.Api.Contracts.CommerceRuntime.Orders.DigitalWallet digitalWallet, string checkoutId, string digitalWalletType, string responseFields =  null, CancellationToken ct = default(CancellationToken))
+		{
+			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout> response;
+			var client = Mozu.Api.Clients.Commerce.CheckoutClient.ProcessDigitalWalletClient( digitalWallet,  checkoutId,  digitalWalletType,  responseFields);
+			client.WithContext(_apiContext);
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+			return await response.ResultAsync();
+
+		}
+
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="checkoutId"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="priceListCode"></param>
+		/// <returns>
+		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout"/>
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var checkout = new Checkout();
+		///   var checkout = await checkout.ChangeCheckoutPriceListAsync( priceListCode,  checkoutId,  responseFields);
+		/// </code>
+		/// </example>
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout> ChangeCheckoutPriceListAsync(string priceListCode, string checkoutId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
+		{
+			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout> response;
+			var client = Mozu.Api.Clients.Commerce.CheckoutClient.ChangeCheckoutPriceListClient( priceListCode,  checkoutId,  responseFields);
+			client.WithContext(_apiContext);
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+			return await response.ResultAsync();
+
+		}
+
+
+	}
+
+}
+
+
diff --git a/Mozu.Api/Resources/Commerce/Checkouts/AppliedDiscountResource.cs b/Mozu.Api/Resources/Commerce/Checkouts/AppliedDiscountResource.cs
new file mode 100755
index 00000000..30d7ab77
--- /dev/null
+++ b/Mozu.Api/Resources/Commerce/Checkouts/AppliedDiscountResource.cs
@@ -0,0 +1,121 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using Mozu.Api.Security;
+using System.Threading.Tasks;
+using Newtonsoft.Json.Linq;
+using System.Threading;
+
+namespace Mozu.Api.Resources.Commerce.Checkouts
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	public partial class AppliedDiscountResource  	{
+		///
+		/// <see cref="Mozu.Api.ApiContext"/>
+		///
+		private readonly IApiContext _apiContext;
+
+		
+		public AppliedDiscountResource(IApiContext apiContext) 
+		{
+			_apiContext = apiContext;
+		}
+
+		public AppliedDiscountResource CloneWithApiContext(Action<IApiContext> contextModification) 
+		{
+			return new AppliedDiscountResource(_apiContext.CloneWith(contextModification));
+		}
+
+				
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="checkoutId"></param>
+		/// <param name="couponCode"></param>
+		/// <param name="responseFields"></param>
+		/// <returns>
+		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout"/>
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var applieddiscount = new AppliedDiscount();
+		///   var checkout = await applieddiscount.ApplyCouponAsync( checkoutId,  couponCode,  responseFields);
+		/// </code>
+		/// </example>
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout> ApplyCouponAsync(string checkoutId, string couponCode, string responseFields =  null, CancellationToken ct = default(CancellationToken))
+		{
+			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout> response;
+			var client = Mozu.Api.Clients.Commerce.Checkouts.AppliedDiscountClient.ApplyCouponClient( checkoutId,  couponCode,  responseFields);
+			client.WithContext(_apiContext);
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+			return await response.ResultAsync();
+
+		}
+
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="checkoutId"></param>
+		/// <returns>
+		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout"/>
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var applieddiscount = new AppliedDiscount();
+		///   var checkout = await applieddiscount.RemoveCouponsAsync( checkoutId);
+		/// </code>
+		/// </example>
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout> RemoveCouponsAsync(string checkoutId, CancellationToken ct = default(CancellationToken))
+		{
+			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout> response;
+			var client = Mozu.Api.Clients.Commerce.Checkouts.AppliedDiscountClient.RemoveCouponsClient( checkoutId);
+			client.WithContext(_apiContext);
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+			return await response.ResultAsync();
+
+		}
+
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="checkoutId"></param>
+		/// <param name="couponCode"></param>
+		/// <returns>
+		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout"/>
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var applieddiscount = new AppliedDiscount();
+		///   var checkout = await applieddiscount.RemoveCouponAsync( checkoutId,  couponCode);
+		/// </code>
+		/// </example>
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout> RemoveCouponAsync(string checkoutId, string couponCode, CancellationToken ct = default(CancellationToken))
+		{
+			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout> response;
+			var client = Mozu.Api.Clients.Commerce.Checkouts.AppliedDiscountClient.RemoveCouponClient( checkoutId,  couponCode);
+			client.WithContext(_apiContext);
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+			return await response.ResultAsync();
+
+		}
+
+
+	}
+
+}
+
+
diff --git a/Mozu.Api/Resources/Commerce/Checkouts/DestinationResource.cs b/Mozu.Api/Resources/Commerce/Checkouts/DestinationResource.cs
new file mode 100755
index 00000000..e01ddd1a
--- /dev/null
+++ b/Mozu.Api/Resources/Commerce/Checkouts/DestinationResource.cs
@@ -0,0 +1,173 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using Mozu.Api.Security;
+using System.Threading.Tasks;
+using Newtonsoft.Json.Linq;
+using System.Threading;
+
+namespace Mozu.Api.Resources.Commerce.Checkouts
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	public partial class DestinationResource  	{
+		///
+		/// <see cref="Mozu.Api.ApiContext"/>
+		///
+		private readonly IApiContext _apiContext;
+
+		
+		public DestinationResource(IApiContext apiContext) 
+		{
+			_apiContext = apiContext;
+		}
+
+		public DestinationResource CloneWithApiContext(Action<IApiContext> contextModification) 
+		{
+			return new DestinationResource(_apiContext.CloneWith(contextModification));
+		}
+
+				
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="checkoutId"></param>
+		/// <returns>
+		/// List{<see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Destination"/>}
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var destination = new Destination();
+		///   var destination = await destination.GetDestinationsAsync( checkoutId);
+		/// </code>
+		/// </example>
+		public virtual async Task<List<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Destination>> GetDestinationsAsync(string checkoutId, CancellationToken ct = default(CancellationToken))
+		{
+			MozuClient<List<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Destination>> response;
+			var client = Mozu.Api.Clients.Commerce.Checkouts.DestinationClient.GetDestinationsClient( checkoutId);
+			client.WithContext(_apiContext);
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+			return await response.ResultAsync();
+
+		}
+
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="checkoutId"></param>
+		/// <param name="destinationId"></param>
+		/// <param name="responseFields"></param>
+		/// <returns>
+		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Destination"/>
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var destination = new Destination();
+		///   var destination = await destination.GetDestinationAsync( checkoutId,  destinationId,  responseFields);
+		/// </code>
+		/// </example>
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Destination> GetDestinationAsync(string checkoutId, string destinationId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
+		{
+			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Destination> response;
+			var client = Mozu.Api.Clients.Commerce.Checkouts.DestinationClient.GetDestinationClient( checkoutId,  destinationId,  responseFields);
+			client.WithContext(_apiContext);
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+			return await response.ResultAsync();
+
+		}
+
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="checkoutId"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="destination"></param>
+		/// <returns>
+		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Destination"/>
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var destination = new Destination();
+		///   var destination = await destination.AddDestinationAsync( destination,  checkoutId,  responseFields);
+		/// </code>
+		/// </example>
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Destination> AddDestinationAsync(Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Destination destination, string checkoutId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
+		{
+			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Destination> response;
+			var client = Mozu.Api.Clients.Commerce.Checkouts.DestinationClient.AddDestinationClient( destination,  checkoutId,  responseFields);
+			client.WithContext(_apiContext);
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+			return await response.ResultAsync();
+
+		}
+
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="checkoutId"></param>
+		/// <param name="destinationId"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="destination"></param>
+		/// <returns>
+		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Destination"/>
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var destination = new Destination();
+		///   var destination = await destination.UpdateDestinationAsync( destination,  checkoutId,  destinationId,  responseFields);
+		/// </code>
+		/// </example>
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Destination> UpdateDestinationAsync(Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Destination destination, string checkoutId, string destinationId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
+		{
+			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Destination> response;
+			var client = Mozu.Api.Clients.Commerce.Checkouts.DestinationClient.UpdateDestinationClient( destination,  checkoutId,  destinationId,  responseFields);
+			client.WithContext(_apiContext);
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+			return await response.ResultAsync();
+
+		}
+
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="checkoutId"></param>
+		/// <param name="destinationId"></param>
+		/// <returns>
+		/// 
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var destination = new Destination();
+		///   await destination.RemoveDestinationAsync( checkoutId,  destinationId);
+		/// </code>
+		/// </example>
+		public virtual async Task RemoveDestinationAsync(string checkoutId, string destinationId, CancellationToken ct = default(CancellationToken))
+		{
+			MozuClient response;
+			var client = Mozu.Api.Clients.Commerce.Checkouts.DestinationClient.RemoveDestinationClient( checkoutId,  destinationId);
+			client.WithContext(_apiContext);
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+
+		}
+
+
+	}
+
+}
+
+
diff --git a/Mozu.Api/Resources/Commerce/Checkouts/OrderAttributeResource.cs b/Mozu.Api/Resources/Commerce/Checkouts/OrderAttributeResource.cs
new file mode 100755
index 00000000..253a8992
--- /dev/null
+++ b/Mozu.Api/Resources/Commerce/Checkouts/OrderAttributeResource.cs
@@ -0,0 +1,121 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using Mozu.Api.Security;
+using System.Threading.Tasks;
+using Newtonsoft.Json.Linq;
+using System.Threading;
+
+namespace Mozu.Api.Resources.Commerce.Checkouts
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	public partial class OrderAttributeResource  	{
+		///
+		/// <see cref="Mozu.Api.ApiContext"/>
+		///
+		private readonly IApiContext _apiContext;
+
+		
+		public OrderAttributeResource(IApiContext apiContext) 
+		{
+			_apiContext = apiContext;
+		}
+
+		public OrderAttributeResource CloneWithApiContext(Action<IApiContext> contextModification) 
+		{
+			return new OrderAttributeResource(_apiContext.CloneWith(contextModification));
+		}
+
+				
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="checkoutId"></param>
+		/// <returns>
+		/// List{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAttribute"/>}
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var orderattribute = new OrderAttribute();
+		///   var orderAttribute = await orderattribute.GetCheckoutAttributesAsync( checkoutId);
+		/// </code>
+		/// </example>
+		public virtual async Task<List<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAttribute>> GetCheckoutAttributesAsync(string checkoutId, CancellationToken ct = default(CancellationToken))
+		{
+			MozuClient<List<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAttribute>> response;
+			var client = Mozu.Api.Clients.Commerce.Checkouts.OrderAttributeClient.GetCheckoutAttributesClient( checkoutId);
+			client.WithContext(_apiContext);
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+			return await response.ResultAsync();
+
+		}
+
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="checkoutId"></param>
+		/// <param name="checkoutAttributes"></param>
+		/// <returns>
+		/// List{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAttribute"/>}
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var orderattribute = new OrderAttribute();
+		///   var orderAttribute = await orderattribute.CreateCheckoutAttributesAsync( checkoutAttributes,  checkoutId);
+		/// </code>
+		/// </example>
+		public virtual async Task<List<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAttribute>> CreateCheckoutAttributesAsync(List<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAttribute> checkoutAttributes, string checkoutId, CancellationToken ct = default(CancellationToken))
+		{
+			MozuClient<List<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAttribute>> response;
+			var client = Mozu.Api.Clients.Commerce.Checkouts.OrderAttributeClient.CreateCheckoutAttributesClient( checkoutAttributes,  checkoutId);
+			client.WithContext(_apiContext);
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+			return await response.ResultAsync();
+
+		}
+
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="checkoutId"></param>
+		/// <param name="removeMissing"></param>
+		/// <param name="checkoutAttributes"></param>
+		/// <returns>
+		/// List{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAttribute"/>}
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var orderattribute = new OrderAttribute();
+		///   var orderAttribute = await orderattribute.UpdateCheckoutAttributeAsync( checkoutAttributes,  checkoutId,  removeMissing);
+		/// </code>
+		/// </example>
+		public virtual async Task<List<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAttribute>> UpdateCheckoutAttributeAsync(List<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAttribute> checkoutAttributes, string checkoutId, bool? removeMissing =  null, CancellationToken ct = default(CancellationToken))
+		{
+			MozuClient<List<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAttribute>> response;
+			var client = Mozu.Api.Clients.Commerce.Checkouts.OrderAttributeClient.UpdateCheckoutAttributeClient( checkoutAttributes,  checkoutId,  removeMissing);
+			client.WithContext(_apiContext);
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+			return await response.ResultAsync();
+
+		}
+
+
+	}
+
+}
+
+
diff --git a/Mozu.Api/Resources/Commerce/Checkouts/OrderItemResource.cs b/Mozu.Api/Resources/Commerce/Checkouts/OrderItemResource.cs
new file mode 100755
index 00000000..270e4faf
--- /dev/null
+++ b/Mozu.Api/Resources/Commerce/Checkouts/OrderItemResource.cs
@@ -0,0 +1,126 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using Mozu.Api.Security;
+using System.Threading.Tasks;
+using Newtonsoft.Json.Linq;
+using System.Threading;
+
+namespace Mozu.Api.Resources.Commerce.Checkouts
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	public partial class OrderItemResource  	{
+		///
+		/// <see cref="Mozu.Api.ApiContext"/>
+		///
+		private readonly IApiContext _apiContext;
+
+		
+		public OrderItemResource(IApiContext apiContext) 
+		{
+			_apiContext = apiContext;
+		}
+
+		public OrderItemResource CloneWithApiContext(Action<IApiContext> contextModification) 
+		{
+			return new OrderItemResource(_apiContext.CloneWith(contextModification));
+		}
+
+				
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="checkoutId"></param>
+		/// <param name="itemId"></param>
+		/// <param name="quantity"></param>
+		/// <param name="responseFields"></param>
+		/// <returns>
+		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout"/>
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var orderitem = new OrderItem();
+		///   var checkout = await orderitem.SplitItemAsync( checkoutId,  itemId,  quantity,  responseFields);
+		/// </code>
+		/// </example>
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout> SplitItemAsync(string checkoutId, string itemId, int? quantity =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
+		{
+			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout> response;
+			var client = Mozu.Api.Clients.Commerce.Checkouts.OrderItemClient.SplitItemClient( checkoutId,  itemId,  quantity,  responseFields);
+			client.WithContext(_apiContext);
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+			return await response.ResultAsync();
+
+		}
+
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="checkoutId"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="itemsForDestination"></param>
+		/// <returns>
+		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout"/>
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var orderitem = new OrderItem();
+		///   var checkout = await orderitem.BulkUpdateItemDestinationsAsync( itemsForDestination,  checkoutId,  responseFields);
+		/// </code>
+		/// </example>
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout> BulkUpdateItemDestinationsAsync(List<Mozu.Api.Contracts.CommerceRuntime.Checkouts.ItemsForDestination> itemsForDestination, string checkoutId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
+		{
+			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout> response;
+			var client = Mozu.Api.Clients.Commerce.Checkouts.OrderItemClient.BulkUpdateItemDestinationsClient( itemsForDestination,  checkoutId,  responseFields);
+			client.WithContext(_apiContext);
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+			return await response.ResultAsync();
+
+		}
+
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="checkoutId"></param>
+		/// <param name="destinationId"></param>
+		/// <param name="itemId"></param>
+		/// <param name="responseFields"></param>
+		/// <returns>
+		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout"/>
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var orderitem = new OrderItem();
+		///   var checkout = await orderitem.UpdateItemDestinationAsync( checkoutId,  itemId,  destinationId,  responseFields);
+		/// </code>
+		/// </example>
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout> UpdateItemDestinationAsync(string checkoutId, string itemId, string destinationId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
+		{
+			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout> response;
+			var client = Mozu.Api.Clients.Commerce.Checkouts.OrderItemClient.UpdateItemDestinationClient( checkoutId,  itemId,  destinationId,  responseFields);
+			client.WithContext(_apiContext);
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+			return await response.ResultAsync();
+
+		}
+
+
+	}
+
+}
+
+
diff --git a/Mozu.Api/Resources/Commerce/Checkouts/PaymentResource.cs b/Mozu.Api/Resources/Commerce/Checkouts/PaymentResource.cs
new file mode 100755
index 00000000..eb79c99d
--- /dev/null
+++ b/Mozu.Api/Resources/Commerce/Checkouts/PaymentResource.cs
@@ -0,0 +1,99 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using Mozu.Api.Security;
+using System.Threading.Tasks;
+using Newtonsoft.Json.Linq;
+using System.Threading;
+
+namespace Mozu.Api.Resources.Commerce.Checkouts
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	public partial class PaymentResource  	{
+		///
+		/// <see cref="Mozu.Api.ApiContext"/>
+		///
+		private readonly IApiContext _apiContext;
+
+		
+		public PaymentResource(IApiContext apiContext) 
+		{
+			_apiContext = apiContext;
+		}
+
+		public PaymentResource CloneWithApiContext(Action<IApiContext> contextModification) 
+		{
+			return new PaymentResource(_apiContext.CloneWith(contextModification));
+		}
+
+				
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="checkoutId"></param>
+		/// <param name="paymentId"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="action"></param>
+		/// <returns>
+		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout"/>
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var payment = new Payment();
+		///   var checkout = await payment.PerformPaymentActionAsync( action,  checkoutId,  paymentId,  responseFields);
+		/// </code>
+		/// </example>
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout> PerformPaymentActionAsync(Mozu.Api.Contracts.CommerceRuntime.Payments.PaymentAction action, string checkoutId, string paymentId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
+		{
+			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout> response;
+			var client = Mozu.Api.Clients.Commerce.Checkouts.PaymentClient.PerformPaymentActionClient( action,  checkoutId,  paymentId,  responseFields);
+			client.WithContext(_apiContext);
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+			return await response.ResultAsync();
+
+		}
+
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="checkoutId"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="action"></param>
+		/// <returns>
+		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout"/>
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var payment = new Payment();
+		///   var checkout = await payment.CreatePaymentActionAsync( action,  checkoutId,  responseFields);
+		/// </code>
+		/// </example>
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout> CreatePaymentActionAsync(Mozu.Api.Contracts.CommerceRuntime.Payments.PaymentAction action, string checkoutId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
+		{
+			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Checkouts.Checkout> response;
+			var client = Mozu.Api.Clients.Commerce.Checkouts.PaymentClient.CreatePaymentActionClient( action,  checkoutId,  responseFields);
+			client.WithContext(_apiContext);
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+			return await response.ResultAsync();
+
+		}
+
+
+	}
+
+}
+
+
diff --git a/Mozu.Api/Resources/Commerce/Customer/Accounts/CardResource.cs b/Mozu.Api/Resources/Commerce/Customer/Accounts/CardResource.cs
old mode 100644
new mode 100755
index a74dd3a9..9412a0e8
--- a/Mozu.Api/Resources/Commerce/Customer/Accounts/CardResource.cs
+++ b/Mozu.Api/Resources/Commerce/Customer/Accounts/CardResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Customer.Accounts
 {
 	/// <summary>
-	/// Use the Cards subresource to manage stored credit cards for customer accounts.  stores limited card data in the Customer service for expedited ordering purposes; however, the complete card data is stored in the Payment service.
+	/// Use the Cards subresource to manage stored credit cards for customer accounts. Mozu stores limited card data in the Customer service for expedited ordering purposes; however, the complete card data is stored in the Payment service.
 	/// </summary>
 	public partial class CardResource  	{
 		///
@@ -37,38 +38,13 @@ public CardResource CloneWithApiContext(Action<IApiContext> contextModification)
 		}
 
 				
-		/// <summary>
-		/// Retrieves the details of a credit card stored with a customer account billing contact.
-		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="cardId">Unique identifier of the card associated with the customer account billing contact.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.Card"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var card = new Card();
-		///   var card = card.GetAccountCard( accountId,  cardId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.Card GetAccountCard(int accountId, string cardId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.Card> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.CardClient.GetAccountCardClient( accountId,  cardId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of a credit card stored with a customer account billing contact.
+		/// 
 		/// </summary>
 		/// <param name="accountId">Unique identifier of the customer account.</param>
 		/// <param name="cardId">Unique identifier of the card associated with the customer account billing contact.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Customer.Card"/>
 		/// </returns>
@@ -78,46 +54,22 @@ public virtual Mozu.Api.Contracts.Customer.Card GetAccountCard(int accountId, st
 		///   var card = await card.GetAccountCardAsync( accountId,  cardId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.Card> GetAccountCardAsync(int accountId, string cardId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.Card> GetAccountCardAsync(int accountId, string cardId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.Card> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.CardClient.GetAccountCardClient( accountId,  cardId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves all stored credit cards for the customer account.
-		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.CardCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var card = new Card();
-		///   var cardCollection = card.GetAccountCards( accountId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.CardCollection GetAccountCards(int accountId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.CardCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.CardClient.GetAccountCardsClient( accountId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves all stored credit cards for the customer account.
+		/// 
 		/// </summary>
 		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Customer.CardCollection"/>
 		/// </returns>
@@ -127,48 +79,23 @@ public virtual Mozu.Api.Contracts.Customer.CardCollection GetAccountCards(int ac
 		///   var cardCollection = await card.GetAccountCardsAsync( accountId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.CardCollection> GetAccountCardsAsync(int accountId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.CardCollection> GetAccountCardsAsync(int accountId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.CardCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.CardClient.GetAccountCardsClient( accountId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Creates a new credit card record and stores it for the customer account.
-		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="card">Properties of a credit card used to submit payment for an order.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.Card"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var card = new Card();
-		///   var card = card.AddAccountCard( card,  accountId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.Card AddAccountCard(Mozu.Api.Contracts.Customer.Card card, int accountId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.Card> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.CardClient.AddAccountCardClient( card,  accountId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Creates a new credit card record and stores it for the customer account.
+		/// 
 		/// </summary>
 		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="card">Properties of a credit card used to submit payment for an order.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="card">Properties of the customer credit card to add to the account.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Customer.Card"/>
 		/// </returns>
@@ -178,50 +105,24 @@ public virtual Mozu.Api.Contracts.Customer.Card AddAccountCard(Mozu.Api.Contract
 		///   var card = await card.AddAccountCardAsync( card,  accountId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.Card> AddAccountCardAsync(Mozu.Api.Contracts.Customer.Card card, int accountId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.Card> AddAccountCardAsync(Mozu.Api.Contracts.Customer.Card card, int accountId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.Card> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.CardClient.AddAccountCardClient( card,  accountId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Update one or more properties of a credit card defined for a customer account.
-		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="cardId">Unique identifier of the card associated with the customer account billing contact.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="card">Properties of a credit card used to submit payment for an order.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.Card"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var card = new Card();
-		///   var card = card.UpdateAccountCard( card,  accountId,  cardId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.Card UpdateAccountCard(Mozu.Api.Contracts.Customer.Card card, int accountId, string cardId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.Card> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.CardClient.UpdateAccountCardClient( card,  accountId,  cardId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Update one or more properties of a credit card defined for a customer account.
+		/// 
 		/// </summary>
 		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="cardId">Unique identifier of the card associated with the customer account billing contact.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="card">Properties of a credit card used to submit payment for an order.</param>
+		/// <param name="cardId">Unique identifier of the credit card.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="card">Properties of the customer account credit card to update.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Customer.Card"/>
 		/// </returns>
@@ -231,45 +132,22 @@ public virtual Mozu.Api.Contracts.Customer.Card UpdateAccountCard(Mozu.Api.Contr
 		///   var card = await card.UpdateAccountCardAsync( card,  accountId,  cardId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.Card> UpdateAccountCardAsync(Mozu.Api.Contracts.Customer.Card card, int accountId, string cardId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.Card> UpdateAccountCardAsync(Mozu.Api.Contracts.Customer.Card card, int accountId, string cardId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.Card> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.CardClient.UpdateAccountCardClient( card,  accountId,  cardId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Removes a stored credit card from a customer account.
-		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="cardId">Unique identifier of the card associated with the customer account billing contact.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var card = new Card();
-		///   card.DeleteAccountCard( accountId,  cardId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteAccountCard(int accountId, string cardId)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.CardClient.DeleteAccountCardClient( accountId,  cardId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Removes a stored credit card from a customer account.
+		/// 
 		/// </summary>
 		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="cardId">Unique identifier of the card associated with the customer account billing contact.</param>
+		/// <param name="cardId">Unique identifier of the credit card to delete.</param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -279,12 +157,12 @@ public virtual void DeleteAccountCard(int accountId, string cardId)
 		///   await card.DeleteAccountCardAsync( accountId,  cardId);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteAccountCardAsync(int accountId, string cardId)
+		public virtual async Task DeleteAccountCardAsync(int accountId, string cardId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.CardClient.DeleteAccountCardClient( accountId,  cardId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/Customer/Accounts/CustomerAttributeResource.cs b/Mozu.Api/Resources/Commerce/Customer/Accounts/CustomerAttributeResource.cs
old mode 100644
new mode 100755
index 37515536..48e7d561
--- a/Mozu.Api/Resources/Commerce/Customer/Accounts/CustomerAttributeResource.cs
+++ b/Mozu.Api/Resources/Commerce/Customer/Accounts/CustomerAttributeResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Customer.Accounts
 {
@@ -37,38 +38,13 @@ public CustomerAttributeResource CloneWithApiContext(Action<IApiContext> context
 		}
 
 				
-		/// <summary>
-		/// Retrieves the contents of an attribute associated with the specified customer account.
-		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.CustomerAttribute"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var customerattribute = new CustomerAttribute();
-		///   var customerAttribute = customerattribute.GetAccountAttribute( accountId,  attributeFQN,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.CustomerAttribute GetAccountAttribute(int accountId, string attributeFQN, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.CustomerAttribute> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.CustomerAttributeClient.GetAccountAttributeClient( accountId,  attributeFQN,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the contents of an attribute associated with the specified customer account.
+		/// 
 		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="accountId">Identifier of the customer account associated with the attribute to retrieve.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Customer.CustomerAttribute"/>
 		/// </returns>
@@ -78,52 +54,24 @@ public virtual Mozu.Api.Contracts.Customer.CustomerAttribute GetAccountAttribute
 		///   var customerAttribute = await customerattribute.GetAccountAttributeAsync( accountId,  attributeFQN,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerAttribute> GetAccountAttributeAsync(int accountId, string attributeFQN, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerAttribute> GetAccountAttributeAsync(int accountId, string attributeFQN, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.CustomerAttribute> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.CustomerAttributeClient.GetAccountAttributeClient( accountId,  attributeFQN,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the list of customer account attributes.
-		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="filter"></param>
-		/// <param name="pageSize"></param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy"></param>
-		/// <param name="startIndex"></param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.CustomerAttributeCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var customerattribute = new CustomerAttribute();
-		///   var customerAttributeCollection = customerattribute.GetAccountAttributes( accountId,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.CustomerAttributeCollection GetAccountAttributes(int accountId, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.CustomerAttributeCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.CustomerAttributeClient.GetAccountAttributesClient( accountId,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the list of customer account attributes.
+		/// 
 		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
+		/// <param name="accountId">Identifier of the customer account associated with the attributes to retrieve.</param>
 		/// <param name="filter"></param>
 		/// <param name="pageSize"></param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="sortBy"></param>
 		/// <param name="startIndex"></param>
 		/// <returns>
@@ -135,48 +83,23 @@ public virtual Mozu.Api.Contracts.Customer.CustomerAttributeCollection GetAccoun
 		///   var customerAttributeCollection = await customerattribute.GetAccountAttributesAsync( accountId,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerAttributeCollection> GetAccountAttributesAsync(int accountId, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerAttributeCollection> GetAccountAttributesAsync(int accountId, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.CustomerAttributeCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.CustomerAttributeClient.GetAccountAttributesClient( accountId,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Applies a defined attribute to the customer account specified in the request and assigns a value to the customer attribute.
-		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="attribute">Properties of an attribute associated with a customer account.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.CustomerAttribute"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var customerattribute = new CustomerAttribute();
-		///   var customerAttribute = customerattribute.AddAccountAttribute( attribute,  accountId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.CustomerAttribute AddAccountAttribute(Mozu.Api.Contracts.Customer.CustomerAttribute attribute, int accountId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.CustomerAttribute> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.CustomerAttributeClient.AddAccountAttributeClient( attribute,  accountId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Applies a defined attribute to the customer account specified in the request and assigns a value to the customer attribute.
+		/// 
 		/// </summary>
 		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="attribute">Properties of an attribute associated with a customer account.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="attribute">The attribute to add to the customer account.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Customer.CustomerAttribute"/>
 		/// </returns>
@@ -186,50 +109,24 @@ public virtual Mozu.Api.Contracts.Customer.CustomerAttribute AddAccountAttribute
 		///   var customerAttribute = await customerattribute.AddAccountAttributeAsync( attribute,  accountId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerAttribute> AddAccountAttributeAsync(Mozu.Api.Contracts.Customer.CustomerAttribute attribute, int accountId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerAttribute> AddAccountAttributeAsync(Mozu.Api.Contracts.Customer.CustomerAttribute attribute, int accountId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.CustomerAttribute> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.CustomerAttributeClient.AddAccountAttributeClient( attribute,  accountId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates one or more details of a customer account attribute.
-		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="attribute">Properties of an attribute associated with a customer account.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.CustomerAttribute"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var customerattribute = new CustomerAttribute();
-		///   var customerAttribute = customerattribute.UpdateAccountAttribute( attribute,  accountId,  attributeFQN,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.CustomerAttribute UpdateAccountAttribute(Mozu.Api.Contracts.Customer.CustomerAttribute attribute, int accountId, string attributeFQN, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.CustomerAttribute> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.CustomerAttributeClient.UpdateAccountAttributeClient( attribute,  accountId,  attributeFQN,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates one or more details of a customer account attribute.
+		/// 
 		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="attribute">Properties of an attribute associated with a customer account.</param>
+		/// <param name="accountId">Identifier of the customer account associated with the attribute.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="attribute">Properties of the customer account attribute to update.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Customer.CustomerAttribute"/>
 		/// </returns>
@@ -239,45 +136,22 @@ public virtual Mozu.Api.Contracts.Customer.CustomerAttribute UpdateAccountAttrib
 		///   var customerAttribute = await customerattribute.UpdateAccountAttributeAsync( attribute,  accountId,  attributeFQN,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerAttribute> UpdateAccountAttributeAsync(Mozu.Api.Contracts.Customer.CustomerAttribute attribute, int accountId, string attributeFQN, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerAttribute> UpdateAccountAttributeAsync(Mozu.Api.Contracts.Customer.CustomerAttribute attribute, int accountId, string attributeFQN, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.CustomerAttribute> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.CustomerAttributeClient.UpdateAccountAttributeClient( attribute,  accountId,  attributeFQN,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Removes the attribute specified in the request from the customer account.
-		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var customerattribute = new CustomerAttribute();
-		///   customerattribute.DeleteAccountAttribute( accountId,  attributeFQN);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteAccountAttribute(int accountId, string attributeFQN)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.CustomerAttributeClient.DeleteAccountAttributeClient( accountId,  attributeFQN);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Removes the attribute specified in the request from the customer account.
+		/// 
 		/// </summary>
 		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
+		/// <param name="attributeFQN"></param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -287,12 +161,12 @@ public virtual void DeleteAccountAttribute(int accountId, string attributeFQN)
 		///   await customerattribute.DeleteAccountAttributeAsync( accountId,  attributeFQN);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteAccountAttributeAsync(int accountId, string attributeFQN)
+		public virtual async Task DeleteAccountAttributeAsync(int accountId, string attributeFQN, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.CustomerAttributeClient.DeleteAccountAttributeClient( accountId,  attributeFQN);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/Customer/Accounts/CustomerAuditEntryResource.cs b/Mozu.Api/Resources/Commerce/Customer/Accounts/CustomerAuditEntryResource.cs
old mode 100644
new mode 100755
index 911e0ac9..0b3dc0c8
--- a/Mozu.Api/Resources/Commerce/Customer/Accounts/CustomerAuditEntryResource.cs
+++ b/Mozu.Api/Resources/Commerce/Customer/Accounts/CustomerAuditEntryResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Customer.Accounts
 {
 	/// <summary>
-	/// Use the Audit Log resource to retrieve audit logs for customer accounts.
+	/// 
 	/// </summary>
 	public partial class CustomerAuditEntryResource  	{
 		///
@@ -37,44 +38,16 @@ public CustomerAuditEntryResource CloneWithApiContext(Action<IApiContext> contex
 		}
 
 				
-		/// <summary>
-		/// Retrieves audit log entries for the specified customer account.
-		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.CustomerAuditEntryCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var customerauditentry = new CustomerAuditEntry();
-		///   var customerAuditEntryCollection = customerauditentry.GetAccountAuditLog( accountId,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.CustomerAuditEntryCollection GetAccountAuditLog(int accountId, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.CustomerAuditEntryCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.CustomerAuditEntryClient.GetAccountAuditLogClient( accountId,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves audit log entries for the specified customer account.
+		/// 
 		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
+		/// <param name="accountId"></param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Customer.CustomerAuditEntryCollection"/>
 		/// </returns>
@@ -84,12 +57,12 @@ public virtual Mozu.Api.Contracts.Customer.CustomerAuditEntryCollection GetAccou
 		///   var customerAuditEntryCollection = await customerauditentry.GetAccountAuditLogAsync( accountId,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerAuditEntryCollection> GetAccountAuditLogAsync(int accountId, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerAuditEntryCollection> GetAccountAuditLogAsync(int accountId, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.CustomerAuditEntryCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.CustomerAuditEntryClient.GetAccountAuditLogClient( accountId,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
diff --git a/Mozu.Api/Resources/Commerce/Customer/Accounts/CustomerContactResource.cs b/Mozu.Api/Resources/Commerce/Customer/Accounts/CustomerContactResource.cs
old mode 100644
new mode 100755
index c419665b..9efa1fb7
--- a/Mozu.Api/Resources/Commerce/Customer/Accounts/CustomerContactResource.cs
+++ b/Mozu.Api/Resources/Commerce/Customer/Accounts/CustomerContactResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Customer.Accounts
 {
@@ -37,38 +38,13 @@ public CustomerContactResource CloneWithApiContext(Action<IApiContext> contextMo
 		}
 
 				
-		/// <summary>
-		/// Retrieves the specified contact for a customer account such as a billing or shipping contact.
-		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="contactId">Unique identifer of the customer account contact being updated.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.CustomerContact"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var customercontact = new CustomerContact();
-		///   var customerContact = customercontact.GetAccountContact( accountId,  contactId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.CustomerContact GetAccountContact(int accountId, int contactId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.CustomerContact> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.CustomerContactClient.GetAccountContactClient( accountId,  contactId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the specified contact for a customer account such as a billing or shipping contact.
+		/// 
 		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="contactId">Unique identifer of the customer account contact being updated.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="accountId">Unique identifier of the customer account whose contact information is being retrieved.</param>
+		/// <param name="contactId">Unique identifier of the customer account contact to retrieve.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Customer.CustomerContact"/>
 		/// </returns>
@@ -78,52 +54,24 @@ public virtual Mozu.Api.Contracts.Customer.CustomerContact GetAccountContact(int
 		///   var customerContact = await customercontact.GetAccountContactAsync( accountId,  contactId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerContact> GetAccountContactAsync(int accountId, int contactId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerContact> GetAccountContactAsync(int accountId, int contactId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.CustomerContact> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.CustomerContactClient.GetAccountContactClient( accountId,  contactId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves a list of contacts for a customer according to any specified filter criteria and sort options.
-		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy"></param>
-		/// <param name="startIndex"></param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.CustomerContactCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var customercontact = new CustomerContact();
-		///   var customerContactCollection = customercontact.GetAccountContacts( accountId,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.CustomerContactCollection GetAccountContacts(int accountId, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.CustomerContactCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.CustomerContactClient.GetAccountContactsClient( accountId,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of contacts for a customer according to any specified filter criteria and sort options.
+		/// 
 		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="accountId">Unique identifier of the customer account associated with the contact information to retrieve.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
 		/// <param name="sortBy"></param>
 		/// <param name="startIndex"></param>
 		/// <returns>
@@ -135,48 +83,23 @@ public virtual Mozu.Api.Contracts.Customer.CustomerContactCollection GetAccountC
 		///   var customerContactCollection = await customercontact.GetAccountContactsAsync( accountId,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerContactCollection> GetAccountContactsAsync(int accountId, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerContactCollection> GetAccountContactsAsync(int accountId, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.CustomerContactCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.CustomerContactClient.GetAccountContactsClient( accountId,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Creates a new contact for a customer account such as a new shipping address.
-		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="contact">Contact information, including the contact's name, address, phone numbers, email addresses, and company (if supplied). Also indicates whether this is a billing, shipping, or billing and shipping contact.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.CustomerContact"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var customercontact = new CustomerContact();
-		///   var customerContact = customercontact.AddAccountContact( contact,  accountId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.CustomerContact AddAccountContact(Mozu.Api.Contracts.Customer.CustomerContact contact, int accountId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.CustomerContact> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.CustomerContactClient.AddAccountContactClient( contact,  accountId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Creates a new contact for a customer account such as a new shipping address.
+		/// 
 		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="contact">Contact information, including the contact's name, address, phone numbers, email addresses, and company (if supplied). Also indicates whether this is a billing, shipping, or billing and shipping contact.</param>
+		/// <param name="accountId">Unique identifier of the customer account containing the new contact.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="contact">Properties of the new contact. Required properties: Contact.Email, ContactType.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Customer.CustomerContact"/>
 		/// </returns>
@@ -186,50 +109,24 @@ public virtual Mozu.Api.Contracts.Customer.CustomerContact AddAccountContact(Moz
 		///   var customerContact = await customercontact.AddAccountContactAsync( contact,  accountId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerContact> AddAccountContactAsync(Mozu.Api.Contracts.Customer.CustomerContact contact, int accountId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerContact> AddAccountContactAsync(Mozu.Api.Contracts.Customer.CustomerContact contact, int accountId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.CustomerContact> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.CustomerContactClient.AddAccountContactClient( contact,  accountId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates a contact for a specified customer account such as to update addresses or change which contact is the primary contact for billing.
-		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="contactId">Unique identifer of the customer account contact being updated.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="contact">Contact information, including the contact's name, address, phone numbers, email addresses, and company (if supplied). Also indicates whether this is a billing, shipping, or billing and shipping contact.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.CustomerContact"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var customercontact = new CustomerContact();
-		///   var customerContact = customercontact.UpdateAccountContact( contact,  accountId,  contactId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.CustomerContact UpdateAccountContact(Mozu.Api.Contracts.Customer.CustomerContact contact, int accountId, int contactId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.CustomerContact> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.CustomerContactClient.UpdateAccountContactClient( contact,  accountId,  contactId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates a contact for a specified customer account such as to update addresses or change which contact is the primary contact for billing.
+		/// 
 		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
+		/// <param name="accountId">Unique identifier of the customer account whose contact information is being updated.</param>
 		/// <param name="contactId">Unique identifer of the customer account contact being updated.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="contact">Contact information, including the contact's name, address, phone numbers, email addresses, and company (if supplied). Also indicates whether this is a billing, shipping, or billing and shipping contact.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="contact">All properties the updated contact will have. Required properties: Name and email address.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Customer.CustomerContact"/>
 		/// </returns>
@@ -239,45 +136,48 @@ public virtual Mozu.Api.Contracts.Customer.CustomerContact UpdateAccountContact(
 		///   var customerContact = await customercontact.UpdateAccountContactAsync( contact,  accountId,  contactId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerContact> UpdateAccountContactAsync(Mozu.Api.Contracts.Customer.CustomerContact contact, int accountId, int contactId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerContact> UpdateAccountContactAsync(Mozu.Api.Contracts.Customer.CustomerContact contact, int accountId, int contactId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.CustomerContact> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.CustomerContactClient.UpdateAccountContactClient( contact,  accountId,  contactId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
+
 		/// <summary>
-		/// Deletes a contact for the specified customer account.
+		/// 
 		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="contactId">Unique identifer of the customer account contact being updated.</param>
+		/// <param name="accountId"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="contactList"></param>
 		/// <returns>
-		/// 
+		/// <see cref="Mozu.Api.Contracts.Customer.CustomerContactCollection"/>
 		/// </returns>
 		/// <example>
 		/// <code>
 		///   var customercontact = new CustomerContact();
-		///   customercontact.DeleteAccountContact( accountId,  contactId);
+		///   var customerContactCollection = await customercontact.AddAccountContactListAsync( contactList,  accountId,  responseFields);
 		/// </code>
 		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteAccountContact(int accountId, int contactId)
+		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerContactCollection> AddAccountContactListAsync(List<Mozu.Api.Contracts.Customer.CustomerContact> contactList, int accountId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.CustomerContactClient.DeleteAccountContactClient( accountId,  contactId);
+			MozuClient<Mozu.Api.Contracts.Customer.CustomerContactCollection> response;
+			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.CustomerContactClient.AddAccountContactListClient( contactList,  accountId,  responseFields);
 			client.WithContext(_apiContext);
-			response = client.Execute();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+			return await response.ResultAsync();
 
 		}
 
+
 		/// <summary>
-		/// Deletes a contact for the specified customer account.
+		/// 
 		/// </summary>
 		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="contactId">Unique identifer of the customer account contact being updated.</param>
+		/// <param name="contactId">Unique identifier of the customer account contact to delete.</param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -287,12 +187,12 @@ public virtual void DeleteAccountContact(int accountId, int contactId)
 		///   await customercontact.DeleteAccountContactAsync( accountId,  contactId);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteAccountContactAsync(int accountId, int contactId)
+		public virtual async Task DeleteAccountContactAsync(int accountId, int contactId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.CustomerContactClient.DeleteAccountContactClient( accountId,  contactId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/Customer/Accounts/CustomerNoteResource.cs b/Mozu.Api/Resources/Commerce/Customer/Accounts/CustomerNoteResource.cs
old mode 100644
new mode 100755
index 57a4699a..584d90f2
--- a/Mozu.Api/Resources/Commerce/Customer/Accounts/CustomerNoteResource.cs
+++ b/Mozu.Api/Resources/Commerce/Customer/Accounts/CustomerNoteResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Customer.Accounts
 {
 	/// <summary>
-	/// This resources manages notes for a customer account. For example, a client can track a shopper's interests or complaints. Only clients can add and view notes. Shoppers cannot view these notes from the My Account page.
+	/// Tenant administrators can add and view internal notes for a customer account. For example, a client can track a shopper's interests or complaints. Only clients can add and view notes. Shoppers cannot view these notes from the My Account page.
 	/// </summary>
 	public partial class CustomerNoteResource  	{
 		///
@@ -37,38 +38,13 @@ public CustomerNoteResource CloneWithApiContext(Action<IApiContext> contextModif
 		}
 
 				
-		/// <summary>
-		/// Retrieves the contents of a particular note attached to a specified customer account.
-		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="noteId">Unique identifier of a particular note to retrieve.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.CustomerNote"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var customernote = new CustomerNote();
-		///   var customerNote = customernote.GetAccountNote( accountId,  noteId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.CustomerNote GetAccountNote(int accountId, int noteId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.CustomerNote> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.CustomerNoteClient.GetAccountNoteClient( accountId,  noteId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the contents of a particular note attached to a specified customer account.
+		/// 
 		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
+		/// <param name="accountId">Unique identifier of the customer account that contains the note being retrieved.</param>
 		/// <param name="noteId">Unique identifier of a particular note to retrieve.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Customer.CustomerNote"/>
 		/// </returns>
@@ -78,54 +54,26 @@ public virtual Mozu.Api.Contracts.Customer.CustomerNote GetAccountNote(int accou
 		///   var customerNote = await customernote.GetAccountNoteAsync( accountId,  noteId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerNote> GetAccountNoteAsync(int accountId, int noteId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerNote> GetAccountNoteAsync(int accountId, int noteId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.CustomerNote> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.CustomerNoteClient.GetAccountNoteClient( accountId,  noteId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves a list of notes added to a customer account according to any specified filter criteria and sort options.
-		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.CustomerNoteCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var customernote = new CustomerNote();
-		///   var customerNoteCollection = customernote.GetAccountNotes( accountId,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.CustomerNoteCollection GetAccountNotes(int accountId, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.CustomerNoteCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.CustomerNoteClient.GetAccountNotesClient( accountId,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of notes added to a customer account according to any specified filter criteria and sort options.
+		/// 
 		/// </summary>
 		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Customer.CustomerNoteCollection"/>
 		/// </returns>
@@ -135,48 +83,23 @@ public virtual Mozu.Api.Contracts.Customer.CustomerNoteCollection GetAccountNote
 		///   var customerNoteCollection = await customernote.GetAccountNotesAsync( accountId,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerNoteCollection> GetAccountNotesAsync(int accountId, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerNoteCollection> GetAccountNotesAsync(int accountId, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.CustomerNoteCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.CustomerNoteClient.GetAccountNotesClient( accountId,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Adds a new note to the specified customer account.
-		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="note">Properties of a note configured for a customer account.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.CustomerNote"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var customernote = new CustomerNote();
-		///   var customerNote = customernote.AddAccountNote( note,  accountId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.CustomerNote AddAccountNote(Mozu.Api.Contracts.Customer.CustomerNote note, int accountId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.CustomerNote> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.CustomerNoteClient.AddAccountNoteClient( note,  accountId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Adds a new note to the specified customer account.
+		/// 
 		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="note">Properties of a note configured for a customer account.</param>
+		/// <param name="accountId">Unique identifier of the customer account for which to create the note.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="note">Properties of the customer account note to create.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Customer.CustomerNote"/>
 		/// </returns>
@@ -186,50 +109,24 @@ public virtual Mozu.Api.Contracts.Customer.CustomerNote AddAccountNote(Mozu.Api.
 		///   var customerNote = await customernote.AddAccountNoteAsync( note,  accountId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerNote> AddAccountNoteAsync(Mozu.Api.Contracts.Customer.CustomerNote note, int accountId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerNote> AddAccountNoteAsync(Mozu.Api.Contracts.Customer.CustomerNote note, int accountId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.CustomerNote> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.CustomerNoteClient.AddAccountNoteClient( note,  accountId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Modifies an existing note for a customer account.
-		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="noteId">Unique identifier of a particular note to retrieve.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="note">Properties of a note configured for a customer account.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.CustomerNote"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var customernote = new CustomerNote();
-		///   var customerNote = customernote.UpdateAccountNote( note,  accountId,  noteId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.CustomerNote UpdateAccountNote(Mozu.Api.Contracts.Customer.CustomerNote note, int accountId, int noteId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.CustomerNote> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.CustomerNoteClient.UpdateAccountNoteClient( note,  accountId,  noteId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Modifies an existing note for a customer account.
+		/// 
 		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="noteId">Unique identifier of a particular note to retrieve.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="note">Properties of a note configured for a customer account.</param>
+		/// <param name="accountId">Unique identifier of the customer account note to modify.</param>
+		/// <param name="noteId">Unique identifier of the note to update.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="note">The new content to replace the existing note.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Customer.CustomerNote"/>
 		/// </returns>
@@ -239,45 +136,22 @@ public virtual Mozu.Api.Contracts.Customer.CustomerNote UpdateAccountNote(Mozu.A
 		///   var customerNote = await customernote.UpdateAccountNoteAsync( note,  accountId,  noteId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerNote> UpdateAccountNoteAsync(Mozu.Api.Contracts.Customer.CustomerNote note, int accountId, int noteId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerNote> UpdateAccountNoteAsync(Mozu.Api.Contracts.Customer.CustomerNote note, int accountId, int noteId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.CustomerNote> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.CustomerNoteClient.UpdateAccountNoteClient( note,  accountId,  noteId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Removes a note from the specified customer account.
-		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="noteId">Unique identifier of a particular note to retrieve.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var customernote = new CustomerNote();
-		///   customernote.DeleteAccountNote( accountId,  noteId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteAccountNote(int accountId, int noteId)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.CustomerNoteClient.DeleteAccountNoteClient( accountId,  noteId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Removes a note from the specified customer account.
+		/// 
 		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="noteId">Unique identifier of a particular note to retrieve.</param>
+		/// <param name="accountId">Unique identifier of the customer account that contains the note being deleted.</param>
+		/// <param name="noteId">Unique identifier of the customer account note being deleted.</param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -287,12 +161,12 @@ public virtual void DeleteAccountNote(int accountId, int noteId)
 		///   await customernote.DeleteAccountNoteAsync( accountId,  noteId);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteAccountNoteAsync(int accountId, int noteId)
+		public virtual async Task DeleteAccountNoteAsync(int accountId, int noteId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.CustomerNoteClient.DeleteAccountNoteClient( accountId,  noteId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/Customer/Accounts/CustomerPurchaseOrderAccountResource.cs b/Mozu.Api/Resources/Commerce/Customer/Accounts/CustomerPurchaseOrderAccountResource.cs
old mode 100644
new mode 100755
index 4a04b1ef..9a519674
--- a/Mozu.Api/Resources/Commerce/Customer/Accounts/CustomerPurchaseOrderAccountResource.cs
+++ b/Mozu.Api/Resources/Commerce/Customer/Accounts/CustomerPurchaseOrderAccountResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Customer.Accounts
 {
 	/// <summary>
-	/// Use the Customer Account Purchase Order resource to manage purchase order details for specific customer acocunts.
+	/// 
 	/// </summary>
 	public partial class CustomerPurchaseOrderAccountResource  	{
 		///
@@ -37,36 +38,12 @@ public CustomerPurchaseOrderAccountResource CloneWithApiContext(Action<IApiConte
 		}
 
 				
-		/// <summary>
-		/// Retrieves the details of the specified customer purchase order account.
-		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.CustomerPurchaseOrderAccount"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var customerpurchaseorderaccount = new CustomerPurchaseOrderAccount();
-		///   var customerPurchaseOrderAccount = customerpurchaseorderaccount.GetCustomerPurchaseOrderAccount( accountId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.CustomerPurchaseOrderAccount GetCustomerPurchaseOrderAccount(int accountId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.CustomerPurchaseOrderAccount> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.CustomerPurchaseOrderAccountClient.GetCustomerPurchaseOrderAccountClient( accountId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of the specified customer purchase order account.
+		/// 
 		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="accountId"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Customer.CustomerPurchaseOrderAccount"/>
 		/// </returns>
@@ -76,54 +53,26 @@ public virtual Mozu.Api.Contracts.Customer.CustomerPurchaseOrderAccount GetCusto
 		///   var customerPurchaseOrderAccount = await customerpurchaseorderaccount.GetCustomerPurchaseOrderAccountAsync( accountId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerPurchaseOrderAccount> GetCustomerPurchaseOrderAccountAsync(int accountId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerPurchaseOrderAccount> GetCustomerPurchaseOrderAccountAsync(int accountId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.CustomerPurchaseOrderAccount> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.CustomerPurchaseOrderAccountClient.GetCustomerPurchaseOrderAccountClient( accountId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves a list of purchase order transactions for the specified customer account according to any specified sort options.
-		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.PurchaseOrderTransactionCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var customerpurchaseorderaccount = new CustomerPurchaseOrderAccount();
-		///   var purchaseOrderTransactionCollection = customerpurchaseorderaccount.GetCustomerPurchaseOrderTransactions( accountId,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.PurchaseOrderTransactionCollection GetCustomerPurchaseOrderTransactions(int accountId, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.PurchaseOrderTransactionCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.CustomerPurchaseOrderAccountClient.GetCustomerPurchaseOrderTransactionsClient( accountId,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of purchase order transactions for the specified customer account according to any specified sort options.
+		/// 
 		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
+		/// <param name="accountId"></param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Customer.PurchaseOrderTransactionCollection"/>
 		/// </returns>
@@ -133,48 +82,23 @@ public virtual Mozu.Api.Contracts.Customer.PurchaseOrderTransactionCollection Ge
 		///   var purchaseOrderTransactionCollection = await customerpurchaseorderaccount.GetCustomerPurchaseOrderTransactionsAsync( accountId,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.PurchaseOrderTransactionCollection> GetCustomerPurchaseOrderTransactionsAsync(int accountId, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.PurchaseOrderTransactionCollection> GetCustomerPurchaseOrderTransactionsAsync(int accountId, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.PurchaseOrderTransactionCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.CustomerPurchaseOrderAccountClient.GetCustomerPurchaseOrderTransactionsClient( accountId,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Adds a purchase order account to the specified customer account.This adds the ability for the specified customer account to use the purchase order payment method.
-		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="customerPurchaseOrderAccount">Unique identifier of the customer purchase order account.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.CustomerPurchaseOrderAccount"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var customerpurchaseorderaccount = new CustomerPurchaseOrderAccount();
-		///   var customerPurchaseOrderAccount = customerpurchaseorderaccount.CreateCustomerPurchaseOrderAccount( customerPurchaseOrderAccount,  accountId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.CustomerPurchaseOrderAccount CreateCustomerPurchaseOrderAccount(Mozu.Api.Contracts.Customer.CustomerPurchaseOrderAccount customerPurchaseOrderAccount, int accountId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.CustomerPurchaseOrderAccount> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.CustomerPurchaseOrderAccountClient.CreateCustomerPurchaseOrderAccountClient( customerPurchaseOrderAccount,  accountId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Adds a purchase order account to the specified customer account.This adds the ability for the specified customer account to use the purchase order payment method.
+		/// 
 		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="customerPurchaseOrderAccount">Unique identifier of the customer purchase order account.</param>
+		/// <param name="accountId"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="customerPurchaseOrderAccount"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Customer.CustomerPurchaseOrderAccount"/>
 		/// </returns>
@@ -184,48 +108,23 @@ public virtual Mozu.Api.Contracts.Customer.CustomerPurchaseOrderAccount CreateCu
 		///   var customerPurchaseOrderAccount = await customerpurchaseorderaccount.CreateCustomerPurchaseOrderAccountAsync( customerPurchaseOrderAccount,  accountId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerPurchaseOrderAccount> CreateCustomerPurchaseOrderAccountAsync(Mozu.Api.Contracts.Customer.CustomerPurchaseOrderAccount customerPurchaseOrderAccount, int accountId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerPurchaseOrderAccount> CreateCustomerPurchaseOrderAccountAsync(Mozu.Api.Contracts.Customer.CustomerPurchaseOrderAccount customerPurchaseOrderAccount, int accountId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.CustomerPurchaseOrderAccount> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.CustomerPurchaseOrderAccountClient.CreateCustomerPurchaseOrderAccountClient( customerPurchaseOrderAccount,  accountId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Creates a purchase order transaction on the specified customer purchase order account.
-		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="purchaseOrderTransaction">The purchase order transaction type to add to the specified customer account.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.PurchaseOrderTransaction"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var customerpurchaseorderaccount = new CustomerPurchaseOrderAccount();
-		///   var purchaseOrderTransaction = customerpurchaseorderaccount.CreatePurchaseOrderTransaction( purchaseOrderTransaction,  accountId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.PurchaseOrderTransaction CreatePurchaseOrderTransaction(Mozu.Api.Contracts.Customer.PurchaseOrderTransaction purchaseOrderTransaction, int accountId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.PurchaseOrderTransaction> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.CustomerPurchaseOrderAccountClient.CreatePurchaseOrderTransactionClient( purchaseOrderTransaction,  accountId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Creates a purchase order transaction on the specified customer purchase order account.
+		/// 
 		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="purchaseOrderTransaction">The purchase order transaction type to add to the specified customer account.</param>
+		/// <param name="accountId"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="purchaseOrderTransaction"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Customer.PurchaseOrderTransaction"/>
 		/// </returns>
@@ -235,48 +134,23 @@ public virtual Mozu.Api.Contracts.Customer.PurchaseOrderTransaction CreatePurcha
 		///   var purchaseOrderTransaction = await customerpurchaseorderaccount.CreatePurchaseOrderTransactionAsync( purchaseOrderTransaction,  accountId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.PurchaseOrderTransaction> CreatePurchaseOrderTransactionAsync(Mozu.Api.Contracts.Customer.PurchaseOrderTransaction purchaseOrderTransaction, int accountId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.PurchaseOrderTransaction> CreatePurchaseOrderTransactionAsync(Mozu.Api.Contracts.Customer.PurchaseOrderTransaction purchaseOrderTransaction, int accountId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.PurchaseOrderTransaction> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.CustomerPurchaseOrderAccountClient.CreatePurchaseOrderTransactionClient( purchaseOrderTransaction,  accountId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates the details of the purchase order account for the specified customer account.
-		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="customerPurchaseOrderAccount">Unique identifier of the customer purchase order account.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.CustomerPurchaseOrderAccount"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var customerpurchaseorderaccount = new CustomerPurchaseOrderAccount();
-		///   var customerPurchaseOrderAccount = customerpurchaseorderaccount.UpdateCustomerPurchaseOrderAccount( customerPurchaseOrderAccount,  accountId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.CustomerPurchaseOrderAccount UpdateCustomerPurchaseOrderAccount(Mozu.Api.Contracts.Customer.CustomerPurchaseOrderAccount customerPurchaseOrderAccount, int accountId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.CustomerPurchaseOrderAccount> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.CustomerPurchaseOrderAccountClient.UpdateCustomerPurchaseOrderAccountClient( customerPurchaseOrderAccount,  accountId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates the details of the purchase order account for the specified customer account.
+		/// 
 		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="customerPurchaseOrderAccount">Unique identifier of the customer purchase order account.</param>
+		/// <param name="accountId"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="customerPurchaseOrderAccount"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Customer.CustomerPurchaseOrderAccount"/>
 		/// </returns>
@@ -286,43 +160,21 @@ public virtual Mozu.Api.Contracts.Customer.CustomerPurchaseOrderAccount UpdateCu
 		///   var customerPurchaseOrderAccount = await customerpurchaseorderaccount.UpdateCustomerPurchaseOrderAccountAsync( customerPurchaseOrderAccount,  accountId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerPurchaseOrderAccount> UpdateCustomerPurchaseOrderAccountAsync(Mozu.Api.Contracts.Customer.CustomerPurchaseOrderAccount customerPurchaseOrderAccount, int accountId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerPurchaseOrderAccount> UpdateCustomerPurchaseOrderAccountAsync(Mozu.Api.Contracts.Customer.CustomerPurchaseOrderAccount customerPurchaseOrderAccount, int accountId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.CustomerPurchaseOrderAccount> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.CustomerPurchaseOrderAccountClient.UpdateCustomerPurchaseOrderAccountClient( customerPurchaseOrderAccount,  accountId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Deletes the specified customer purchase order account.This removes the ability for the specified customer account to use the purchase order payment method.
-		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var customerpurchaseorderaccount = new CustomerPurchaseOrderAccount();
-		///   customerpurchaseorderaccount.DeleteCustomerPurchaseOrderAccount( accountId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteCustomerPurchaseOrderAccount(int accountId)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.CustomerPurchaseOrderAccountClient.DeleteCustomerPurchaseOrderAccountClient( accountId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes the specified customer purchase order account.This removes the ability for the specified customer account to use the purchase order payment method.
+		/// 
 		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
+		/// <param name="accountId"></param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -332,12 +184,12 @@ public virtual void DeleteCustomerPurchaseOrderAccount(int accountId)
 		///   await customerpurchaseorderaccount.DeleteCustomerPurchaseOrderAccountAsync( accountId);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteCustomerPurchaseOrderAccountAsync(int accountId)
+		public virtual async Task DeleteCustomerPurchaseOrderAccountAsync(int accountId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.CustomerPurchaseOrderAccountClient.DeleteCustomerPurchaseOrderAccountClient( accountId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/Customer/Accounts/CustomerSegmentResource.cs b/Mozu.Api/Resources/Commerce/Customer/Accounts/CustomerSegmentResource.cs
old mode 100644
new mode 100755
index 7a961e45..e99722d4
--- a/Mozu.Api/Resources/Commerce/Customer/Accounts/CustomerSegmentResource.cs
+++ b/Mozu.Api/Resources/Commerce/Customer/Accounts/CustomerSegmentResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Customer.Accounts
 {
@@ -37,44 +38,16 @@ public CustomerSegmentResource CloneWithApiContext(Action<IApiContext> contextMo
 		}
 
 				
-		/// <summary>
-		/// Retrieves the list of segments associated with a customer account.
-		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.CustomerSegmentCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var customersegment = new CustomerSegment();
-		///   var customerSegmentCollection = customersegment.GetAccountSegments( accountId,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.CustomerSegmentCollection GetAccountSegments(int accountId, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.CustomerSegmentCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.CustomerSegmentClient.GetAccountSegmentsClient( accountId,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the list of segments associated with a customer account.
+		/// 
 		/// </summary>
 		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Customer.CustomerSegmentCollection"/>
 		/// </returns>
@@ -84,12 +57,12 @@ public virtual Mozu.Api.Contracts.Customer.CustomerSegmentCollection GetAccountS
 		///   var customerSegmentCollection = await customersegment.GetAccountSegmentsAsync( accountId,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerSegmentCollection> GetAccountSegmentsAsync(int accountId, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerSegmentCollection> GetAccountSegmentsAsync(int accountId, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.CustomerSegmentCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.CustomerSegmentClient.GetAccountSegmentsClient( accountId,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
diff --git a/Mozu.Api/Resources/Commerce/Customer/Accounts/TransactionResource.cs b/Mozu.Api/Resources/Commerce/Customer/Accounts/TransactionResource.cs
old mode 100644
new mode 100755
index a4632440..6512740f
--- a/Mozu.Api/Resources/Commerce/Customer/Accounts/TransactionResource.cs
+++ b/Mozu.Api/Resources/Commerce/Customer/Accounts/TransactionResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Customer.Accounts
 {
@@ -37,34 +38,11 @@ public TransactionResource CloneWithApiContext(Action<IApiContext> contextModifi
 		}
 
 				
-		/// <summary>
-		/// Retrieves a list of transactions associated with the customer account specified in the request.
-		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <returns>
-		/// List{<see cref="Mozu.Api.Contracts.Customer.Transaction"/>}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var transaction = new Transaction();
-		///   var transaction = transaction.GetTransactions( accountId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<Mozu.Api.Contracts.Customer.Transaction> GetTransactions(int accountId)
-		{
-			MozuClient<List<Mozu.Api.Contracts.Customer.Transaction>> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.TransactionClient.GetTransactionsClient( accountId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of transactions associated with the customer account specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
+		/// <param name="accountId">Unique identifier of the customer account for which to retrieve transactions.</param>
 		/// <returns>
 		/// List{<see cref="Mozu.Api.Contracts.Customer.Transaction"/>}
 		/// </returns>
@@ -74,48 +52,23 @@ public TransactionResource CloneWithApiContext(Action<IApiContext> contextModifi
 		///   var transaction = await transaction.GetTransactionsAsync( accountId);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<Mozu.Api.Contracts.Customer.Transaction>> GetTransactionsAsync(int accountId)
+		public virtual async Task<List<Mozu.Api.Contracts.Customer.Transaction>> GetTransactionsAsync(int accountId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<Mozu.Api.Contracts.Customer.Transaction>> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.TransactionClient.GetTransactionsClient( accountId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Creates a new transaction for the customer account specified in the request.
-		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="transaction">Properties of a transaction performed by a customer account. The system creates a transaction each time the customer submits an order, returns an item, picks up items for an order, or manages items on a wish list.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.Transaction"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var transaction = new Transaction();
-		///   var transaction = transaction.AddTransaction( transaction,  accountId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.Transaction AddTransaction(Mozu.Api.Contracts.Customer.Transaction transaction, int accountId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.Transaction> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.TransactionClient.AddTransactionClient( transaction,  accountId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Creates a new transaction for the customer account specified in the request.
+		/// 
 		/// </summary>
 		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="transaction">Properties of a transaction performed by a customer account. The system creates a transaction each time the customer submits an order, returns an item, picks up items for an order, or manages items on a wish list.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="transaction">Properties of the transaction to create for the customer account.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Customer.Transaction"/>
 		/// </returns>
@@ -125,44 +78,21 @@ public virtual Mozu.Api.Contracts.Customer.Transaction AddTransaction(Mozu.Api.C
 		///   var transaction = await transaction.AddTransactionAsync( transaction,  accountId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.Transaction> AddTransactionAsync(Mozu.Api.Contracts.Customer.Transaction transaction, int accountId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.Transaction> AddTransactionAsync(Mozu.Api.Contracts.Customer.Transaction transaction, int accountId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.Transaction> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.TransactionClient.AddTransactionClient( transaction,  accountId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Deletes a transaction from the customer account specified in the request.
-		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="transactionId">Unique identifier of the transaction to delete.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var transaction = new Transaction();
-		///   transaction.RemoveTransaction( accountId,  transactionId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void RemoveTransaction(int accountId, string transactionId)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.TransactionClient.RemoveTransactionClient( accountId,  transactionId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes a transaction from the customer account specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
+		/// <param name="accountId">Unique identifier of the customer account from which to delete the transaction.</param>
 		/// <param name="transactionId">Unique identifier of the transaction to delete.</param>
 		/// <returns>
 		/// 
@@ -173,12 +103,12 @@ public virtual void RemoveTransaction(int accountId, string transactionId)
 		///   await transaction.RemoveTransactionAsync( accountId,  transactionId);
 		/// </code>
 		/// </example>
-		public virtual async Task RemoveTransactionAsync(int accountId, string transactionId)
+		public virtual async Task RemoveTransactionAsync(int accountId, string transactionId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Customer.Accounts.TransactionClient.RemoveTransactionClient( accountId,  transactionId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/Customer/AddressValidationRequestResource.cs b/Mozu.Api/Resources/Commerce/Customer/AddressValidationRequestResource.cs
old mode 100644
new mode 100755
index 27a73692..2d9b7bc4
--- a/Mozu.Api/Resources/Commerce/Customer/AddressValidationRequestResource.cs
+++ b/Mozu.Api/Resources/Commerce/Customer/AddressValidationRequestResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Customer
 {
@@ -37,36 +38,12 @@ public AddressValidationRequestResource CloneWithApiContext(Action<IApiContext>
 		}
 
 				
-		/// <summary>
-		/// Validates the customer address supplied in the request.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="addressValidationRequest">Properties of the address used for validation of the account's full address. This content may include multiple lines of an address, city, state/province, zip/postal code, and country.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.AddressValidationResponse"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var addressvalidationrequest = new AddressValidationRequest();
-		///   var addressValidationResponse = addressvalidationrequest.ValidateAddress( addressValidationRequest,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.AddressValidationResponse ValidateAddress(Mozu.Api.Contracts.Customer.AddressValidationRequest addressValidationRequest, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.AddressValidationResponse> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.AddressValidationRequestClient.ValidateAddressClient( addressValidationRequest,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Validates the customer address supplied in the request.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="addressValidationRequest">Properties of the address used for validation of the account's full address. This content may include multiple lines of an address, city, state/province, zip/postal code, and country.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="addressValidationRequest">Properties of the address to validate.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Customer.AddressValidationResponse"/>
 		/// </returns>
@@ -76,12 +53,12 @@ public virtual Mozu.Api.Contracts.Customer.AddressValidationResponse ValidateAdd
 		///   var addressValidationResponse = await addressvalidationrequest.ValidateAddressAsync( addressValidationRequest,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.AddressValidationResponse> ValidateAddressAsync(Mozu.Api.Contracts.Customer.AddressValidationRequest addressValidationRequest, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.AddressValidationResponse> ValidateAddressAsync(Mozu.Api.Contracts.Customer.AddressValidationRequest addressValidationRequest, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.AddressValidationResponse> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.AddressValidationRequestClient.ValidateAddressClient( addressValidationRequest,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
diff --git a/Mozu.Api/Resources/Commerce/Customer/Attributedefinition/AttributeResource.cs b/Mozu.Api/Resources/Commerce/Customer/Attributedefinition/AttributeResource.cs
old mode 100644
new mode 100755
index 33bf7cf6..74ebae44
--- a/Mozu.Api/Resources/Commerce/Customer/Attributedefinition/AttributeResource.cs
+++ b/Mozu.Api/Resources/Commerce/Customer/Attributedefinition/AttributeResource.cs
@@ -13,13 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Customer.Attributedefinition
 {
 	/// <summary>
-	/// Attributes are used to add custom definitions and characteristics to the following objects:
-
-
+	/// Use the Customer Attribute Definition resource to manage the attributes to define for your shoppers.
 	/// </summary>
 	public partial class AttributeResource  	{
 		///
@@ -39,42 +38,15 @@ public AttributeResource CloneWithApiContext(Action<IApiContext> contextModifica
 		}
 
 				
-		/// <summary>
-		/// Retrieves a paged list of attributes according to any specified filter criteria and sort options.
-		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Core.Extensible.AttributeCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var attribute = new Attribute();
-		///   var attributeCollection = attribute.GetAttributes( startIndex,  pageSize,  sortBy,  filter,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Core.Extensible.AttributeCollection GetAttributes(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Core.Extensible.AttributeCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.Attributedefinition.AttributeClient.GetAttributesClient( startIndex,  pageSize,  sortBy,  filter,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a paged list of attributes according to any specified filter criteria and sort options.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Core.Extensible.AttributeCollection"/>
 		/// </returns>
@@ -84,108 +56,112 @@ public virtual Mozu.Api.Contracts.Core.Extensible.AttributeCollection GetAttribu
 		///   var attributeCollection = await attribute.GetAttributesAsync( startIndex,  pageSize,  sortBy,  filter,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Core.Extensible.AttributeCollection> GetAttributesAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Core.Extensible.AttributeCollection> GetAttributesAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Core.Extensible.AttributeCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.Attributedefinition.AttributeClient.GetAttributesClient( startIndex,  pageSize,  sortBy,  filter,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
+
 		/// <summary>
-		/// Retrieve a list of the vocabulary values defined for the customer attribute specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
+		/// <param name="attributeFQN"></param>
 		/// <returns>
 		/// List{<see cref="Mozu.Api.Contracts.Core.Extensible.AttributeVocabularyValue"/>}
 		/// </returns>
 		/// <example>
 		/// <code>
 		///   var attribute = new Attribute();
-		///   var attributeVocabularyValue = attribute.GetAttributeVocabularyValues( attributeFQN);
+		///   var attributeVocabularyValue = await attribute.GetAttributeVocabularyValuesAsync( attributeFQN);
 		/// </code>
 		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<Mozu.Api.Contracts.Core.Extensible.AttributeVocabularyValue> GetAttributeVocabularyValues(string attributeFQN)
+		public virtual async Task<List<Mozu.Api.Contracts.Core.Extensible.AttributeVocabularyValue>> GetAttributeVocabularyValuesAsync(string attributeFQN, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<Mozu.Api.Contracts.Core.Extensible.AttributeVocabularyValue>> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.Attributedefinition.AttributeClient.GetAttributeVocabularyValuesClient( attributeFQN);
 			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+			return await response.ResultAsync();
 
 		}
 
+
 		/// <summary>
-		/// Retrieve a list of the vocabulary values defined for the customer attribute specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
-		/// List{<see cref="Mozu.Api.Contracts.Core.Extensible.AttributeVocabularyValue"/>}
+		/// <see cref="Mozu.Api.Contracts.Core.Extensible.Attribute"/>
 		/// </returns>
 		/// <example>
 		/// <code>
 		///   var attribute = new Attribute();
-		///   var attributeVocabularyValue = await attribute.GetAttributeVocabularyValuesAsync( attributeFQN);
+		///   var attribute = await attribute.GetAttributeAsync( attributeFQN,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<Mozu.Api.Contracts.Core.Extensible.AttributeVocabularyValue>> GetAttributeVocabularyValuesAsync(string attributeFQN)
+		public virtual async Task<Mozu.Api.Contracts.Core.Extensible.Attribute> GetAttributeAsync(string attributeFQN, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
-			MozuClient<List<Mozu.Api.Contracts.Core.Extensible.AttributeVocabularyValue>> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.Attributedefinition.AttributeClient.GetAttributeVocabularyValuesClient( attributeFQN);
+			MozuClient<Mozu.Api.Contracts.Core.Extensible.Attribute> response;
+			var client = Mozu.Api.Clients.Commerce.Customer.Attributedefinition.AttributeClient.GetAttributeClient( attributeFQN,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
+
 		/// <summary>
-		/// Retrieves the details of the specified product attribute.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="attribute"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Core.Extensible.Attribute"/>
 		/// </returns>
 		/// <example>
 		/// <code>
 		///   var attribute = new Attribute();
-		///   var attribute = attribute.GetAttribute( attributeFQN,  responseFields);
+		///   var attribute = await attribute.CreateAttributeAsync( attribute,  responseFields);
 		/// </code>
 		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Core.Extensible.Attribute GetAttribute(string attributeFQN, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Core.Extensible.Attribute> CreateAttributeAsync(Mozu.Api.Contracts.Core.Extensible.Attribute attribute, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Core.Extensible.Attribute> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.Attributedefinition.AttributeClient.GetAttributeClient( attributeFQN,  responseFields);
+			var client = Mozu.Api.Clients.Commerce.Customer.Attributedefinition.AttributeClient.CreateAttributeClient( attribute,  responseFields);
 			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+			return await response.ResultAsync();
 
 		}
 
+
 		/// <summary>
-		/// Retrieves the details of the specified product attribute.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="attribute"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Core.Extensible.Attribute"/>
 		/// </returns>
 		/// <example>
 		/// <code>
 		///   var attribute = new Attribute();
-		///   var attribute = await attribute.GetAttributeAsync( attributeFQN,  responseFields);
+		///   var attribute = await attribute.UpdateAttributeAsync( attribute,  attributeFQN,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Core.Extensible.Attribute> GetAttributeAsync(string attributeFQN, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Core.Extensible.Attribute> UpdateAttributeAsync(Mozu.Api.Contracts.Core.Extensible.Attribute attribute, string attributeFQN, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Core.Extensible.Attribute> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.Attributedefinition.AttributeClient.GetAttributeClient( attributeFQN,  responseFields);
+			var client = Mozu.Api.Clients.Commerce.Customer.Attributedefinition.AttributeClient.UpdateAttributeClient( attribute,  attributeFQN,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
diff --git a/Mozu.Api/Resources/Commerce/Customer/CreditResource.cs b/Mozu.Api/Resources/Commerce/Customer/CreditResource.cs
old mode 100644
new mode 100755
index 73163668..752a13a4
--- a/Mozu.Api/Resources/Commerce/Customer/CreditResource.cs
+++ b/Mozu.Api/Resources/Commerce/Customer/CreditResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Customer
 {
@@ -37,42 +38,15 @@ public CreditResource CloneWithApiContext(Action<IApiContext> contextModificatio
 		}
 
 				
-		/// <summary>
-		/// Retrieves a list of store credits applied to customer accounts, according any filter and sort criteria specified in the request.
-		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.Credit.CreditCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var credit = new Credit();
-		///   var creditCollection = credit.GetCredits( startIndex,  pageSize,  sortBy,  filter,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.Credit.CreditCollection GetCredits(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.Credit.CreditCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.CreditClient.GetCreditsClient( startIndex,  pageSize,  sortBy,  filter,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of store credits applied to customer accounts, according any filter and sort criteria specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Customer.Credit.CreditCollection"/>
 		/// </returns>
@@ -82,46 +56,22 @@ public virtual Mozu.Api.Contracts.Customer.Credit.CreditCollection GetCredits(in
 		///   var creditCollection = await credit.GetCreditsAsync( startIndex,  pageSize,  sortBy,  filter,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.Credit.CreditCollection> GetCreditsAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.Credit.CreditCollection> GetCreditsAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.Credit.CreditCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.CreditClient.GetCreditsClient( startIndex,  pageSize,  sortBy,  filter,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the details of a store credit applied to a customer account.
-		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.Credit.Credit"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var credit = new Credit();
-		///   var credit = credit.GetCredit( code,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.Credit.Credit GetCredit(string code, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.Credit.Credit> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.CreditClient.GetCreditClient( code,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of a store credit applied to a customer account.
+		/// 
 		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="code">User-defined code that identifies the store credit to retrieve.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Customer.Credit.Credit"/>
 		/// </returns>
@@ -131,46 +81,22 @@ public virtual Mozu.Api.Contracts.Customer.Credit.Credit GetCredit(string code,
 		///   var credit = await credit.GetCreditAsync( code,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.Credit.Credit> GetCreditAsync(string code, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.Credit.Credit> GetCreditAsync(string code, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.Credit.Credit> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.CreditClient.GetCreditClient( code,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Creates a new store credit for the customer account specified in the request.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="credit">Properties of the store credit of gift card applied to a customer account. At this time, gift card functionality is reserved for future use.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.Credit.Credit"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var credit = new Credit();
-		///   var credit = credit.AddCredit( credit,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.Credit.Credit AddCredit(Mozu.Api.Contracts.Customer.Credit.Credit credit, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.Credit.Credit> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.CreditClient.AddCreditClient( credit,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Creates a new store credit for the customer account specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="credit">Properties of the store credit of gift card applied to a customer account. At this time, gift card functionality is reserved for future use.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="credit">Properties of the store credit to create.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Customer.Credit.Credit"/>
 		/// </returns>
@@ -180,46 +106,22 @@ public virtual Mozu.Api.Contracts.Customer.Credit.Credit AddCredit(Mozu.Api.Cont
 		///   var credit = await credit.AddCreditAsync( credit,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.Credit.Credit> AddCreditAsync(Mozu.Api.Contracts.Customer.Credit.Credit credit, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.Credit.Credit> AddCreditAsync(Mozu.Api.Contracts.Customer.Credit.Credit credit, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.Credit.Credit> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.CreditClient.AddCreditClient( credit,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Associates an unclaimed customer credit with the shopper user authenticated in the request header.
-		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.Credit.Credit"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var credit = new Credit();
-		///   var credit = credit.AssociateCreditToShopper( code,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.Credit.Credit AssociateCreditToShopper(string code, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.Credit.Credit> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.CreditClient.AssociateCreditToShopperClient( code,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Associates an unclaimed customer credit with the shopper user authenticated in the request header.
+		/// 
 		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="code">The code that represents the credit to claim for the shopper.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Customer.Credit.Credit"/>
 		/// </returns>
@@ -229,43 +131,21 @@ public virtual Mozu.Api.Contracts.Customer.Credit.Credit AssociateCreditToShoppe
 		///   var credit = await credit.AssociateCreditToShopperAsync( code,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.Credit.Credit> AssociateCreditToShopperAsync(string code, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.Credit.Credit> AssociateCreditToShopperAsync(string code, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.Credit.Credit> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.CreditClient.AssociateCreditToShopperClient( code,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Resend the notification email that informs a shopper that a credit has been created.
-		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var credit = new Credit();
-		///   credit.ResendCreditCreatedEmail( code);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void ResendCreditCreatedEmail(string code)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Customer.CreditClient.ResendCreditCreatedEmailClient( code);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Resend the notification email that informs a shopper that a credit has been created.
+		/// 
 		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
+		/// <param name="code"></param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -275,47 +155,22 @@ public virtual void ResendCreditCreatedEmail(string code)
 		///   await credit.ResendCreditCreatedEmailAsync( code);
 		/// </code>
 		/// </example>
-		public virtual async Task ResendCreditCreatedEmailAsync(string code)
+		public virtual async Task ResendCreditCreatedEmailAsync(string code, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Customer.CreditClient.ResendCreditCreatedEmailClient( code);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
-		/// <summary>
-		/// Updates one or more properties of a defined store credit applied to a customer account.
-		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="credit">Properties of the store credit of gift card applied to a customer account. At this time, gift card functionality is reserved for future use.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.Credit.Credit"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var credit = new Credit();
-		///   var credit = credit.UpdateCredit( credit,  code,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.Credit.Credit UpdateCredit(Mozu.Api.Contracts.Customer.Credit.Credit credit, string code, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.Credit.Credit> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.CreditClient.UpdateCreditClient( credit,  code,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates one or more properties of a defined store credit applied to a customer account.
+		/// 
 		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="credit">Properties of the store credit of gift card applied to a customer account. At this time, gift card functionality is reserved for future use.</param>
+		/// <param name="code">User-defined code of the store credit to update.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="credit">Properties of the store credit to update.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Customer.Credit.Credit"/>
 		/// </returns>
@@ -325,43 +180,21 @@ public virtual Mozu.Api.Contracts.Customer.Credit.Credit UpdateCredit(Mozu.Api.C
 		///   var credit = await credit.UpdateCreditAsync( credit,  code,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.Credit.Credit> UpdateCreditAsync(Mozu.Api.Contracts.Customer.Credit.Credit credit, string code, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.Credit.Credit> UpdateCreditAsync(Mozu.Api.Contracts.Customer.Credit.Credit credit, string code, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.Credit.Credit> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.CreditClient.UpdateCreditClient( credit,  code,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Deletes a store credit previously applied to a customer account.
-		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var credit = new Credit();
-		///   credit.DeleteCredit( code);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteCredit(string code)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Customer.CreditClient.DeleteCreditClient( code);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes a store credit previously applied to a customer account.
+		/// 
 		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
+		/// <param name="code">User-defined code of the store credit to delete.</param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -371,12 +204,12 @@ public virtual void DeleteCredit(string code)
 		///   await credit.DeleteCreditAsync( code);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteCreditAsync(string code)
+		public virtual async Task DeleteCreditAsync(string code, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Customer.CreditClient.DeleteCreditClient( code);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/Customer/Credits/CreditAuditEntryResource.cs b/Mozu.Api/Resources/Commerce/Customer/Credits/CreditAuditEntryResource.cs
old mode 100644
new mode 100755
index bb1f9ff5..447cac2a
--- a/Mozu.Api/Resources/Commerce/Customer/Credits/CreditAuditEntryResource.cs
+++ b/Mozu.Api/Resources/Commerce/Customer/Credits/CreditAuditEntryResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Customer.Credits
 {
@@ -37,44 +38,16 @@ public CreditAuditEntryResource CloneWithApiContext(Action<IApiContext> contextM
 		}
 
 				
-		/// <summary>
-		/// Retrieves the list of audit entries for the credit, according to any filter or sort criteria specified in the request.
-		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.Credit.CreditAuditEntryCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var creditauditentry = new CreditAuditEntry();
-		///   var creditAuditEntryCollection = creditauditentry.GetAuditEntries( code,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.Credit.CreditAuditEntryCollection GetAuditEntries(string code, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.Credit.CreditAuditEntryCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.Credits.CreditAuditEntryClient.GetAuditEntriesClient( code,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the list of audit entries for the credit, according to any filter or sort criteria specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+		/// <param name="code">User-defined code of the credit for which to retrieve audit entries.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Customer.Credit.CreditAuditEntryCollection"/>
 		/// </returns>
@@ -84,12 +57,12 @@ public virtual Mozu.Api.Contracts.Customer.Credit.CreditAuditEntryCollection Get
 		///   var creditAuditEntryCollection = await creditauditentry.GetAuditEntriesAsync( code,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.Credit.CreditAuditEntryCollection> GetAuditEntriesAsync(string code, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.Credit.CreditAuditEntryCollection> GetAuditEntriesAsync(string code, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.Credit.CreditAuditEntryCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.Credits.CreditAuditEntryClient.GetAuditEntriesClient( code,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
diff --git a/Mozu.Api/Resources/Commerce/Customer/Credits/CreditTransactionResource.cs b/Mozu.Api/Resources/Commerce/Customer/Credits/CreditTransactionResource.cs
old mode 100644
new mode 100755
index 7250ceff..e0b280fe
--- a/Mozu.Api/Resources/Commerce/Customer/Credits/CreditTransactionResource.cs
+++ b/Mozu.Api/Resources/Commerce/Customer/Credits/CreditTransactionResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Customer.Credits
 {
@@ -37,44 +38,16 @@ public CreditTransactionResource CloneWithApiContext(Action<IApiContext> context
 		}
 
 				
-		/// <summary>
-		/// Retrieves a list of the transactions performed using a customer credit that update the balance of the credit.
-		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.Credit.CreditTransactionCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var credittransaction = new CreditTransaction();
-		///   var creditTransactionCollection = credittransaction.GetTransactions( code,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.Credit.CreditTransactionCollection GetTransactions(string code, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.Credit.CreditTransactionCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.Credits.CreditTransactionClient.GetTransactionsClient( code,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of the transactions performed using a customer credit that update the balance of the credit.
+		/// 
 		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+		/// <param name="code">User-defined code that identifies the customer credit.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Customer.Credit.CreditTransactionCollection"/>
 		/// </returns>
@@ -84,48 +57,23 @@ public virtual Mozu.Api.Contracts.Customer.Credit.CreditTransactionCollection Ge
 		///   var creditTransactionCollection = await credittransaction.GetTransactionsAsync( code,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.Credit.CreditTransactionCollection> GetTransactionsAsync(string code, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.Credit.CreditTransactionCollection> GetTransactionsAsync(string code, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.Credit.CreditTransactionCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.Credits.CreditTransactionClient.GetTransactionsClient( code,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Creates a new transaction and updates the amount of a store credit or gift card.
-		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="creditTransaction">Properties of a transaction performed for a customer credit that update the remaining balance of the credit.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.Credit.CreditTransaction"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var credittransaction = new CreditTransaction();
-		///   var creditTransaction = credittransaction.AddTransaction( creditTransaction,  code,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.Credit.CreditTransaction AddTransaction(Mozu.Api.Contracts.Customer.Credit.CreditTransaction creditTransaction, string code, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.Credit.CreditTransaction> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.Credits.CreditTransactionClient.AddTransactionClient( creditTransaction,  code,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Creates a new transaction and updates the amount of a store credit or gift card.
+		/// 
 		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="creditTransaction">Properties of a transaction performed for a customer credit that update the remaining balance of the credit.</param>
+		/// <param name="code">User-defined code that identifies the customer credit to update.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="creditTransaction">Properties of the transaction to create for the customer credit.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Customer.Credit.CreditTransaction"/>
 		/// </returns>
@@ -135,12 +83,12 @@ public virtual Mozu.Api.Contracts.Customer.Credit.CreditTransaction AddTransacti
 		///   var creditTransaction = await credittransaction.AddTransactionAsync( creditTransaction,  code,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.Credit.CreditTransaction> AddTransactionAsync(Mozu.Api.Contracts.Customer.Credit.CreditTransaction creditTransaction, string code, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.Credit.CreditTransaction> AddTransactionAsync(Mozu.Api.Contracts.Customer.Credit.CreditTransaction creditTransaction, string code, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.Credit.CreditTransaction> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.Credits.CreditTransactionClient.AddTransactionClient( creditTransaction,  code,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
diff --git a/Mozu.Api/Resources/Commerce/Customer/CustomerAccountResource.cs b/Mozu.Api/Resources/Commerce/Customer/CustomerAccountResource.cs
old mode 100644
new mode 100755
index 0738a7ca..b3a66f95
--- a/Mozu.Api/Resources/Commerce/Customer/CustomerAccountResource.cs
+++ b/Mozu.Api/Resources/Commerce/Customer/CustomerAccountResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Customer
 {
@@ -37,48 +38,17 @@ public CustomerAccountResource CloneWithApiContext(Action<IApiContext> contextMo
 		}
 
 				
-		/// <summary>
-		/// Retrieves a list of customer accounts.
-		/// </summary>
-		/// <param name="fields">The fields to include in the response.</param>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="isAnonymous">If true, retrieve anonymous shopper accounts in the response.</param>
-		/// <param name="pageSize"></param>
-		/// <param name="q">A list of order search terms (not phrases) to use in the query when searching across order number and the name or email of the billing contact. When entering, separate multiple search terms with a space character.</param>
-		/// <param name="qLimit">The maximum number of search results to return in the response. You can limit any range between 1-100.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy"></param>
-		/// <param name="startIndex"></param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.CustomerAccountCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var customeraccount = new CustomerAccount();
-		///   var customerAccountCollection = customeraccount.GetAccounts( startIndex,  pageSize,  sortBy,  filter,  fields,  q,  qLimit,  isAnonymous,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.CustomerAccountCollection GetAccounts(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string fields =  null, string q =  null, int? qLimit =  null, bool? isAnonymous =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.CustomerAccountCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.CustomerAccountClient.GetAccountsClient( startIndex,  pageSize,  sortBy,  filter,  fields,  q,  qLimit,  isAnonymous,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of customer accounts.
+		/// 
 		/// </summary>
 		/// <param name="fields">The fields to include in the response.</param>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
+		/// <param name="filter"></param>
 		/// <param name="isAnonymous">If true, retrieve anonymous shopper accounts in the response.</param>
 		/// <param name="pageSize"></param>
-		/// <param name="q">A list of order search terms (not phrases) to use in the query when searching across order number and the name or email of the billing contact. When entering, separate multiple search terms with a space character.</param>
+		/// <param name="q">A list of customer account search terms to use in the query when searching across customer name and email. Separate multiple search terms with a space character.</param>
 		/// <param name="qLimit">The maximum number of search results to return in the response. You can limit any range between 1-100.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="sortBy"></param>
 		/// <param name="startIndex"></param>
 		/// <returns>
@@ -90,46 +60,22 @@ public virtual Mozu.Api.Contracts.Customer.CustomerAccountCollection GetAccounts
 		///   var customerAccountCollection = await customeraccount.GetAccountsAsync( startIndex,  pageSize,  sortBy,  filter,  fields,  q,  qLimit,  isAnonymous,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerAccountCollection> GetAccountsAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string fields =  null, string q =  null, int? qLimit =  null, bool? isAnonymous =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerAccountCollection> GetAccountsAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string fields =  null, string q =  null, int? qLimit =  null, bool? isAnonymous =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.CustomerAccountCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.CustomerAccountClient.GetAccountsClient( startIndex,  pageSize,  sortBy,  filter,  fields,  q,  qLimit,  isAnonymous,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the current login state of the customer account specified in the request.
-		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.LoginState"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var customeraccount = new CustomerAccount();
-		///   var loginState = customeraccount.GetLoginState( accountId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.LoginState GetLoginState(int accountId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.LoginState> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.CustomerAccountClient.GetLoginStateClient( accountId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the current login state of the customer account specified in the request.
+		/// 
 		/// </summary>
 		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Customer.LoginState"/>
 		/// </returns>
@@ -139,46 +85,22 @@ public virtual Mozu.Api.Contracts.Customer.LoginState GetLoginState(int accountI
 		///   var loginState = await customeraccount.GetLoginStateAsync( accountId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.LoginState> GetLoginStateAsync(int accountId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.LoginState> GetLoginStateAsync(int accountId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.LoginState> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.CustomerAccountClient.GetLoginStateClient( accountId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieve details of a customer account.
-		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.CustomerAccount"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var customeraccount = new CustomerAccount();
-		///   var customerAccount = customeraccount.GetAccount( accountId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.CustomerAccount GetAccount(int accountId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.CustomerAccount> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.CustomerAccountClient.GetAccountClient( accountId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieve details of a customer account.
+		/// 
 		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="accountId">Unique identifier of the customer account to retrieve.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Customer.CustomerAccount"/>
 		/// </returns>
@@ -188,46 +110,22 @@ public virtual Mozu.Api.Contracts.Customer.CustomerAccount GetAccount(int accoun
 		///   var customerAccount = await customeraccount.GetAccountAsync( accountId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerAccount> GetAccountAsync(int accountId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerAccount> GetAccountAsync(int accountId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.CustomerAccount> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.CustomerAccountClient.GetAccountClient( accountId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Creates a new customer account based on the information specified in the request.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="account">Properties of the customer account.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.CustomerAccount"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var customeraccount = new CustomerAccount();
-		///   var customerAccount = customeraccount.AddAccount( account,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.CustomerAccount AddAccount(Mozu.Api.Contracts.Customer.CustomerAccount account, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.CustomerAccount> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.CustomerAccountClient.AddAccountClient( account,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Creates a new customer account based on the information specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="account">Properties of the customer account.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="account">Properties of the customer account to update.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Customer.CustomerAccount"/>
 		/// </returns>
@@ -237,47 +135,23 @@ public virtual Mozu.Api.Contracts.Customer.CustomerAccount AddAccount(Mozu.Api.C
 		///   var customerAccount = await customeraccount.AddAccountAsync( account,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerAccount> AddAccountAsync(Mozu.Api.Contracts.Customer.CustomerAccount account, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerAccount> AddAccountAsync(Mozu.Api.Contracts.Customer.CustomerAccount account, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.CustomerAccount> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.CustomerAccountClient.AddAccountClient( account,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Modifies the password associated with a customer account.
-		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="unlockAccount">Specifies whether to unlock the specified customer account.</param>
-		/// <param name="passwordInfo">The information required to modify a shopper account password.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var customeraccount = new CustomerAccount();
-		///   customeraccount.ChangePassword( passwordInfo,  accountId,  unlockAccount);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void ChangePassword(Mozu.Api.Contracts.Customer.PasswordInfo passwordInfo, int accountId, bool? unlockAccount =  null)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Customer.CustomerAccountClient.ChangePasswordClient( passwordInfo,  accountId,  unlockAccount);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Modifies the password associated with a customer account.
+		/// 
 		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="unlockAccount">Specifies whether to unlock the specified customer account.</param>
-		/// <param name="passwordInfo">The information required to modify a shopper account password.</param>
+		/// <param name="accountId">The customer account information required to change the userpassword.</param>
+		/// <param name="unlockAccount"></param>
+		/// <param name="passwordInfo">The password information required to change the user password.</param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -287,47 +161,22 @@ public virtual void ChangePassword(Mozu.Api.Contracts.Customer.PasswordInfo pass
 		///   await customeraccount.ChangePasswordAsync( passwordInfo,  accountId,  unlockAccount);
 		/// </code>
 		/// </example>
-		public virtual async Task ChangePasswordAsync(Mozu.Api.Contracts.Customer.PasswordInfo passwordInfo, int accountId, bool? unlockAccount =  null)
+		public virtual async Task ChangePasswordAsync(Mozu.Api.Contracts.Customer.PasswordInfo passwordInfo, int accountId, bool? unlockAccount =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Customer.CustomerAccountClient.ChangePasswordClient( passwordInfo,  accountId,  unlockAccount);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
-		/// <summary>
-		/// Adds a new user login to a defined customer account.
-		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="customerAuthInfo">The login information for a customer account.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.CustomerAuthTicket"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var customeraccount = new CustomerAccount();
-		///   var customerAuthTicket = customeraccount.AddLoginToExistingCustomer( customerAuthInfo,  accountId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.CustomerAuthTicket AddLoginToExistingCustomer(Mozu.Api.Contracts.Customer.CustomerLoginInfo customerAuthInfo, int accountId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.CustomerAuthTicket> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.CustomerAccountClient.AddLoginToExistingCustomerClient( customerAuthInfo,  accountId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Adds a new user login to a defined customer account.
+		/// 
 		/// </summary>
 		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="customerAuthInfo">The login information for a customer account.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="customerAuthInfo">The authentication information for the customer account.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Customer.CustomerAuthTicket"/>
 		/// </returns>
@@ -337,43 +186,21 @@ public virtual Mozu.Api.Contracts.Customer.CustomerAuthTicket AddLoginToExisting
 		///   var customerAuthTicket = await customeraccount.AddLoginToExistingCustomerAsync( customerAuthInfo,  accountId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerAuthTicket> AddLoginToExistingCustomerAsync(Mozu.Api.Contracts.Customer.CustomerLoginInfo customerAuthInfo, int accountId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerAuthTicket> AddLoginToExistingCustomerAsync(Mozu.Api.Contracts.Customer.CustomerLoginInfo customerAuthInfo, int accountId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.CustomerAuthTicket> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.CustomerAccountClient.AddLoginToExistingCustomerClient( customerAuthInfo,  accountId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates the customer lifetime value of the specified customer account in the event of an order import or a lifetime value calculation error.
-		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var customeraccount = new CustomerAccount();
-		///   customeraccount.RecomputeCustomerLifetimeValue( accountId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void RecomputeCustomerLifetimeValue(int accountId)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Customer.CustomerAccountClient.RecomputeCustomerLifetimeValueClient( accountId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Updates the customer lifetime value of the specified customer account in the event of an order import or a lifetime value calculation error.
+		/// 
 		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
+		/// <param name="accountId">The unique identifier of the customer account for which to calculate customer lifetime value.</param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -383,43 +210,20 @@ public virtual void RecomputeCustomerLifetimeValue(int accountId)
 		///   await customeraccount.RecomputeCustomerLifetimeValueAsync( accountId);
 		/// </code>
 		/// </example>
-		public virtual async Task RecomputeCustomerLifetimeValueAsync(int accountId)
+		public virtual async Task RecomputeCustomerLifetimeValueAsync(int accountId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Customer.CustomerAccountClient.RecomputeCustomerLifetimeValueClient( accountId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
-		/// <summary>
-		/// Lock or unlock a customer account.
-		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="isLocked">If true, the customer account is locked from logging in.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var customeraccount = new CustomerAccount();
-		///   customeraccount.SetLoginLocked( isLocked,  accountId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void SetLoginLocked(bool isLocked, int accountId)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Customer.CustomerAccountClient.SetLoginLockedClient( isLocked,  accountId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Lock or unlock a customer account.
+		/// 
 		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
+		/// <param name="accountId">The unique identifier of the customer account.</param>
 		/// <param name="isLocked">If true, the customer account is locked from logging in.</param>
 		/// <returns>
 		/// 
@@ -430,41 +234,18 @@ public virtual void SetLoginLocked(bool isLocked, int accountId)
 		///   await customeraccount.SetLoginLockedAsync( isLocked,  accountId);
 		/// </code>
 		/// </example>
-		public virtual async Task SetLoginLockedAsync(bool isLocked, int accountId)
+		public virtual async Task SetLoginLockedAsync(bool isLocked, int accountId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Customer.CustomerAccountClient.SetLoginLockedClient( isLocked,  accountId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
-		/// <summary>
-		/// Requires the password for the customer account to be changed.
-		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="isPasswordChangeRequired">If true, the password for the customer account must be changed.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var customeraccount = new CustomerAccount();
-		///   customeraccount.SetPasswordChangeRequired( isPasswordChangeRequired,  accountId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void SetPasswordChangeRequired(bool isPasswordChangeRequired, int accountId)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Customer.CustomerAccountClient.SetPasswordChangeRequiredClient( isPasswordChangeRequired,  accountId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Requires the password for the customer account to be changed.
+		/// 
 		/// </summary>
 		/// <param name="accountId">Unique identifier of the customer account.</param>
 		/// <param name="isPasswordChangeRequired">If true, the password for the customer account must be changed.</param>
@@ -477,45 +258,21 @@ public virtual void SetPasswordChangeRequired(bool isPasswordChangeRequired, int
 		///   await customeraccount.SetPasswordChangeRequiredAsync( isPasswordChangeRequired,  accountId);
 		/// </code>
 		/// </example>
-		public virtual async Task SetPasswordChangeRequiredAsync(bool isPasswordChangeRequired, int accountId)
+		public virtual async Task SetPasswordChangeRequiredAsync(bool isPasswordChangeRequired, int accountId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Customer.CustomerAccountClient.SetPasswordChangeRequiredClient( isPasswordChangeRequired,  accountId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
-		/// <summary>
-		/// Creates a new customer account and logs the user associated with the customer account into the site.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="accountAndAuthInfo">The authentication information associated with a customer account. The data includes the account properties such as the name, username, authorization access, and email address, the required password to match, and indicates if the account was imported from a third party resource. </param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.CustomerAuthTicket"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var customeraccount = new CustomerAccount();
-		///   var customerAuthTicket = customeraccount.AddAccountAndLogin( accountAndAuthInfo,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.CustomerAuthTicket AddAccountAndLogin(Mozu.Api.Contracts.Customer.CustomerAccountAndAuthInfo accountAndAuthInfo, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.CustomerAuthTicket> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.CustomerAccountClient.AddAccountAndLoginClient( accountAndAuthInfo,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Creates a new customer account and logs the user associated with the customer account into the site.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="accountAndAuthInfo">The authentication information associated with a customer account. The data includes the account properties such as the name, username, authorization access, and email address, the required password to match, and indicates if the account was imported from a third party resource. </param>
+		/// <param name="responseFields"></param>
+		/// <param name="accountAndAuthInfo">Properties of the customer account to create, including the user authentication information.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Customer.CustomerAuthTicket"/>
 		/// </returns>
@@ -525,46 +282,22 @@ public virtual Mozu.Api.Contracts.Customer.CustomerAuthTicket AddAccountAndLogin
 		///   var customerAuthTicket = await customeraccount.AddAccountAndLoginAsync( accountAndAuthInfo,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerAuthTicket> AddAccountAndLoginAsync(Mozu.Api.Contracts.Customer.CustomerAccountAndAuthInfo accountAndAuthInfo, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerAuthTicket> AddAccountAndLoginAsync(Mozu.Api.Contracts.Customer.CustomerAccountAndAuthInfo accountAndAuthInfo, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.CustomerAuthTicket> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.CustomerAccountClient.AddAccountAndLoginClient( accountAndAuthInfo,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Creates multiple customer accounts based on the information specified in the request.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="customers">The authentication information associated with a customer account. The data includes the account properties such as the name, username, authorization access, and email address, the required password to match, and indicates if the account was imported from a third party resource. </param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.CustomerAccountCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var customeraccount = new CustomerAccount();
-		///   var customerAccountCollection = customeraccount.AddAccounts( customers,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.CustomerAccountCollection AddAccounts(List<Mozu.Api.Contracts.Customer.CustomerAccountAndAuthInfo> customers, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.CustomerAccountCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.CustomerAccountClient.AddAccountsClient( customers,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Creates multiple customer accounts based on the information specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="customers">The authentication information associated with a customer account. The data includes the account properties such as the name, username, authorization access, and email address, the required password to match, and indicates if the account was imported from a third party resource. </param>
+		/// <param name="responseFields"></param>
+		/// <param name="customers">Properties of the customer accounts to create.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Customer.CustomerAccountCollection"/>
 		/// </returns>
@@ -574,46 +307,22 @@ public virtual Mozu.Api.Contracts.Customer.CustomerAccountCollection AddAccounts
 		///   var customerAccountCollection = await customeraccount.AddAccountsAsync( customers,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerAccountCollection> AddAccountsAsync(List<Mozu.Api.Contracts.Customer.CustomerAccountAndAuthInfo> customers, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerAccountCollection> AddAccountsAsync(List<Mozu.Api.Contracts.Customer.CustomerAccountAndAuthInfo> customers, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.CustomerAccountCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.CustomerAccountClient.AddAccountsClient( customers,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Changes a collection of customer account passwords.
-		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="accountPasswordInfos">The details of the changed customer account passwords.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.ChangePasswordResultCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var customeraccount = new CustomerAccount();
-		///   var changePasswordResultCollection = customeraccount.ChangePasswords( accountPasswordInfos,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.ChangePasswordResultCollection ChangePasswords(Mozu.Api.Contracts.Customer.AccountPasswordInfoCollection accountPasswordInfos, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.ChangePasswordResultCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.CustomerAccountClient.ChangePasswordsClient( accountPasswordInfos,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Changes a collection of customer account passwords.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="accountPasswordInfos">The details of the changed customer account passwords.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="accountPasswordInfos"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Customer.ChangePasswordResultCollection"/>
 		/// </returns>
@@ -623,48 +332,23 @@ public virtual Mozu.Api.Contracts.Customer.ChangePasswordResultCollection Change
 		///   var changePasswordResultCollection = await customeraccount.ChangePasswordsAsync( accountPasswordInfos,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.ChangePasswordResultCollection> ChangePasswordsAsync(Mozu.Api.Contracts.Customer.AccountPasswordInfoCollection accountPasswordInfos, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.ChangePasswordResultCollection> ChangePasswordsAsync(Mozu.Api.Contracts.Customer.AccountPasswordInfoCollection accountPasswordInfos, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.ChangePasswordResultCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.CustomerAccountClient.ChangePasswordsClient( accountPasswordInfos,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the current login state of a customer account by providing the customer's email address.
-		/// </summary>
-		/// <param name="customerSetCode">The unique idenfitier of the customer set.</param>
-		/// <param name="emailAddress">The email address associated with the customer account.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.LoginState"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var customeraccount = new CustomerAccount();
-		///   var loginState = customeraccount.GetLoginStateByEmailAddress( emailAddress,  customerSetCode,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.LoginState GetLoginStateByEmailAddress(string emailAddress, string customerSetCode =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.LoginState> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.CustomerAccountClient.GetLoginStateByEmailAddressClient( emailAddress,  customerSetCode,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the current login state of a customer account by providing the customer's email address.
+		/// 
 		/// </summary>
-		/// <param name="customerSetCode">The unique idenfitier of the customer set.</param>
+		/// <param name="customerSetCode"></param>
 		/// <param name="emailAddress">The email address associated with the customer account.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Customer.LoginState"/>
 		/// </returns>
@@ -674,47 +358,22 @@ public virtual Mozu.Api.Contracts.Customer.LoginState GetLoginStateByEmailAddres
 		///   var loginState = await customeraccount.GetLoginStateByEmailAddressAsync( emailAddress,  customerSetCode,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.LoginState> GetLoginStateByEmailAddressAsync(string emailAddress, string customerSetCode =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.LoginState> GetLoginStateByEmailAddressAsync(string emailAddress, string customerSetCode =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.LoginState> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.CustomerAccountClient.GetLoginStateByEmailAddressClient( emailAddress,  customerSetCode,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the current login state of a customer account by providing the user name associated with the customer account.
-		/// </summary>
-		/// <param name="customerSetCode">The unique idenfitier of the customer set.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="userName">The user name associated with the customer account.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.LoginState"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var customeraccount = new CustomerAccount();
-		///   var loginState = customeraccount.GetLoginStateByUserName( userName,  customerSetCode,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.LoginState GetLoginStateByUserName(string userName, string customerSetCode =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.LoginState> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.CustomerAccountClient.GetLoginStateByUserNameClient( userName,  customerSetCode,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the current login state of a customer account by providing the user name associated with the customer account.
+		/// 
 		/// </summary>
-		/// <param name="customerSetCode">The unique idenfitier of the customer set.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="customerSetCode"></param>
+		/// <param name="responseFields"></param>
 		/// <param name="userName">The user name associated with the customer account.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Customer.LoginState"/>
@@ -725,50 +384,24 @@ public virtual Mozu.Api.Contracts.Customer.LoginState GetLoginStateByUserName(st
 		///   var loginState = await customeraccount.GetLoginStateByUserNameAsync( userName,  customerSetCode,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.LoginState> GetLoginStateByUserNameAsync(string userName, string customerSetCode =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.LoginState> GetLoginStateByUserNameAsync(string userName, string customerSetCode =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.LoginState> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.CustomerAccountClient.GetLoginStateByUserNameClient( userName,  customerSetCode,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves a list of customer purchase order accounts according to according to any specified sort options.
-		/// </summary>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.CustomerPurchaseOrderAccountCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var customeraccount = new CustomerAccount();
-		///   var customerPurchaseOrderAccountCollection = customeraccount.GetCustomersPurchaseOrderAccounts( startIndex,  pageSize,  sortBy,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.CustomerPurchaseOrderAccountCollection GetCustomersPurchaseOrderAccounts(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.CustomerPurchaseOrderAccountCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.CustomerAccountClient.GetCustomersPurchaseOrderAccountsClient( startIndex,  pageSize,  sortBy,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of customer purchase order accounts according to according to any specified sort options.
+		/// 
 		/// </summary>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Customer.CustomerPurchaseOrderAccountCollection"/>
 		/// </returns>
@@ -778,41 +411,19 @@ public virtual Mozu.Api.Contracts.Customer.CustomerPurchaseOrderAccountCollectio
 		///   var customerPurchaseOrderAccountCollection = await customeraccount.GetCustomersPurchaseOrderAccountsAsync( startIndex,  pageSize,  sortBy,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerPurchaseOrderAccountCollection> GetCustomersPurchaseOrderAccountsAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerPurchaseOrderAccountCollection> GetCustomersPurchaseOrderAccountsAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.CustomerPurchaseOrderAccountCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.CustomerAccountClient.GetCustomersPurchaseOrderAccountsClient( startIndex,  pageSize,  sortBy,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Resets the password for a customer account.
-		/// </summary>
-		/// <param name="resetPasswordInfo">Information required to reset the password for a customer account.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var customeraccount = new CustomerAccount();
-		///   customeraccount.ResetPassword( resetPasswordInfo);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void ResetPassword(Mozu.Api.Contracts.Customer.ResetPasswordInfo resetPasswordInfo)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Customer.CustomerAccountClient.ResetPasswordClient( resetPasswordInfo);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Resets the password for a customer account.
+		/// 
 		/// </summary>
 		/// <param name="resetPasswordInfo">Information required to reset the password for a customer account.</param>
 		/// <returns>
@@ -824,47 +435,22 @@ public virtual void ResetPassword(Mozu.Api.Contracts.Customer.ResetPasswordInfo
 		///   await customeraccount.ResetPasswordAsync( resetPasswordInfo);
 		/// </code>
 		/// </example>
-		public virtual async Task ResetPasswordAsync(Mozu.Api.Contracts.Customer.ResetPasswordInfo resetPasswordInfo)
+		public virtual async Task ResetPasswordAsync(Mozu.Api.Contracts.Customer.ResetPasswordInfo resetPasswordInfo, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Customer.CustomerAccountClient.ResetPasswordClient( resetPasswordInfo);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
-		/// <summary>
-		/// Updates a customer account.
-		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="account">Properties of the customer account.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.CustomerAccount"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var customeraccount = new CustomerAccount();
-		///   var customerAccount = customeraccount.UpdateAccount( account,  accountId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.CustomerAccount UpdateAccount(Mozu.Api.Contracts.Customer.CustomerAccount account, int accountId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.CustomerAccount> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.CustomerAccountClient.UpdateAccountClient( account,  accountId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates a customer account.
+		/// 
 		/// </summary>
 		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="account">Properties of the customer account.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="account">Properties of the customer account to update.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Customer.CustomerAccount"/>
 		/// </returns>
@@ -874,43 +460,21 @@ public virtual Mozu.Api.Contracts.Customer.CustomerAccount UpdateAccount(Mozu.Ap
 		///   var customerAccount = await customeraccount.UpdateAccountAsync( account,  accountId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerAccount> UpdateAccountAsync(Mozu.Api.Contracts.Customer.CustomerAccount account, int accountId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerAccount> UpdateAccountAsync(Mozu.Api.Contracts.Customer.CustomerAccount account, int accountId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.CustomerAccount> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.CustomerAccountClient.UpdateAccountClient( account,  accountId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Deletes a customer account. A customer account cannot be deleted if any orders exist, past or present.
-		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var customeraccount = new CustomerAccount();
-		///   customeraccount.DeleteAccount( accountId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteAccount(int accountId)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Customer.CustomerAccountClient.DeleteAccountClient( accountId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes a customer account. A customer account cannot be deleted if any orders exist, past or present.
+		/// 
 		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
+		/// <param name="accountId">Unique identifier of the customer account to delete.</param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -920,12 +484,12 @@ public virtual void DeleteAccount(int accountId)
 		///   await customeraccount.DeleteAccountAsync( accountId);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteAccountAsync(int accountId)
+		public virtual async Task DeleteAccountAsync(int accountId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Customer.CustomerAccountClient.DeleteAccountClient( accountId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/Customer/CustomerAuthTicketResource.cs b/Mozu.Api/Resources/Commerce/Customer/CustomerAuthTicketResource.cs
old mode 100644
new mode 100755
index cf23ca20..b4ddc728
--- a/Mozu.Api/Resources/Commerce/Customer/CustomerAuthTicketResource.cs
+++ b/Mozu.Api/Resources/Commerce/Customer/CustomerAuthTicketResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Customer
 {
@@ -37,34 +38,11 @@ public CustomerAuthTicketResource CloneWithApiContext(Action<IApiContext> contex
 		}
 
 				
-		/// <summary>
-		/// Creates an authentication ticket for an anonymous shopper user.
-		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.CustomerAuthTicket"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var customerauthticket = new CustomerAuthTicket();
-		///   var customerAuthTicket = customerauthticket.CreateAnonymousShopperAuthTicket( responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.CustomerAuthTicket CreateAnonymousShopperAuthTicket(string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.CustomerAuthTicket> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.CustomerAuthTicketClient.CreateAnonymousShopperAuthTicketClient( responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Creates an authentication ticket for an anonymous shopper user.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Customer.CustomerAuthTicket"/>
 		/// </returns>
@@ -74,46 +52,22 @@ public virtual Mozu.Api.Contracts.Customer.CustomerAuthTicket CreateAnonymousSho
 		///   var customerAuthTicket = await customerauthticket.CreateAnonymousShopperAuthTicketAsync( responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerAuthTicket> CreateAnonymousShopperAuthTicketAsync(string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerAuthTicket> CreateAnonymousShopperAuthTicketAsync(string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.CustomerAuthTicket> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.CustomerAuthTicketClient.CreateAnonymousShopperAuthTicketClient( responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Generates a new authentication ticket for a customer account.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="userAuthInfo">The authentication information required to generate an authentication ticket for a customer account.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.CustomerAuthTicket"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var customerauthticket = new CustomerAuthTicket();
-		///   var customerAuthTicket = customerauthticket.CreateUserAuthTicket( userAuthInfo,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.CustomerAuthTicket CreateUserAuthTicket(Mozu.Api.Contracts.Customer.CustomerUserAuthInfo userAuthInfo, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.CustomerAuthTicket> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.CustomerAuthTicketClient.CreateUserAuthTicketClient( userAuthInfo,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Generates a new authentication ticket for a customer account.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="userAuthInfo">The authentication information required to generate an authentication ticket for a customer account.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="userAuthInfo">The authentication information required to generate an authetication ticket for a user, which consists of a user name and password.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Customer.CustomerAuthTicket"/>
 		/// </returns>
@@ -123,46 +77,22 @@ public virtual Mozu.Api.Contracts.Customer.CustomerAuthTicket CreateUserAuthTick
 		///   var customerAuthTicket = await customerauthticket.CreateUserAuthTicketAsync( userAuthInfo,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerAuthTicket> CreateUserAuthTicketAsync(Mozu.Api.Contracts.Customer.CustomerUserAuthInfo userAuthInfo, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerAuthTicket> CreateUserAuthTicketAsync(Mozu.Api.Contracts.Customer.CustomerUserAuthInfo userAuthInfo, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.CustomerAuthTicket> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.CustomerAuthTicketClient.CreateUserAuthTicketClient( userAuthInfo,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Refreshes an existing authentication ticket for a customer account by providing the refresh token string.
-		/// </summary>
-		/// <param name="refreshToken">Alphanumeric string used for access tokens. This token refreshes access for accounts by generating a new developer or application account authentication ticket after an access token expires.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.CustomerAuthTicket"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var customerauthticket = new CustomerAuthTicket();
-		///   var customerAuthTicket = customerauthticket.RefreshUserAuthTicket( refreshToken,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.CustomerAuthTicket RefreshUserAuthTicket(string refreshToken, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.CustomerAuthTicket> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.CustomerAuthTicketClient.RefreshUserAuthTicketClient( refreshToken,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Refreshes an existing authentication ticket for a customer account by providing the refresh token string.
+		/// 
 		/// </summary>
-		/// <param name="refreshToken">Alphanumeric string used for access tokens. This token refreshes access for accounts by generating a new developer or application account authentication ticket after an access token expires.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="refreshToken">The refresh token string required to refresh a user's authentication ticket.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Customer.CustomerAuthTicket"/>
 		/// </returns>
@@ -172,12 +102,12 @@ public virtual Mozu.Api.Contracts.Customer.CustomerAuthTicket RefreshUserAuthTic
 		///   var customerAuthTicket = await customerauthticket.RefreshUserAuthTicketAsync( refreshToken,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerAuthTicket> RefreshUserAuthTicketAsync(string refreshToken, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerAuthTicket> RefreshUserAuthTicketAsync(string refreshToken, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.CustomerAuthTicket> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.CustomerAuthTicketClient.RefreshUserAuthTicketClient( refreshToken,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
diff --git a/Mozu.Api/Resources/Commerce/Customer/CustomerSegmentResource.cs b/Mozu.Api/Resources/Commerce/Customer/CustomerSegmentResource.cs
old mode 100644
new mode 100755
index 4ca78b08..8e34754a
--- a/Mozu.Api/Resources/Commerce/Customer/CustomerSegmentResource.cs
+++ b/Mozu.Api/Resources/Commerce/Customer/CustomerSegmentResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Customer
 {
@@ -37,42 +38,15 @@ public CustomerSegmentResource CloneWithApiContext(Action<IApiContext> contextMo
 		}
 
 				
-		/// <summary>
-		/// Retrieves a list of defined customer segments according to any filter and sort criteria.
-		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.CustomerSegmentCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var customersegment = new CustomerSegment();
-		///   var customerSegmentCollection = customersegment.GetSegments( startIndex,  pageSize,  sortBy,  filter,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.CustomerSegmentCollection GetSegments(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.CustomerSegmentCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.CustomerSegmentClient.GetSegmentsClient( startIndex,  pageSize,  sortBy,  filter,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of defined customer segments according to any filter and sort criteria.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Customer.CustomerSegmentCollection"/>
 		/// </returns>
@@ -82,46 +56,22 @@ public virtual Mozu.Api.Contracts.Customer.CustomerSegmentCollection GetSegments
 		///   var customerSegmentCollection = await customersegment.GetSegmentsAsync( startIndex,  pageSize,  sortBy,  filter,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerSegmentCollection> GetSegmentsAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerSegmentCollection> GetSegmentsAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.CustomerSegmentCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.CustomerSegmentClient.GetSegmentsClient( startIndex,  pageSize,  sortBy,  filter,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the details of the customer segment specified in the request. This operation does not return a list of the customer accounts associated with the segment.
-		/// </summary>
-		/// <param name="id">Unique identifier of the customer segment to retrieve.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.CustomerSegment"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var customersegment = new CustomerSegment();
-		///   var customerSegment = customersegment.GetSegment( id,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.CustomerSegment GetSegment(int id, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.CustomerSegment> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.CustomerSegmentClient.GetSegmentClient( id,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of the customer segment specified in the request. This operation does not return a list of the customer accounts associated with the segment.
+		/// 
 		/// </summary>
 		/// <param name="id">Unique identifier of the customer segment to retrieve.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Customer.CustomerSegment"/>
 		/// </returns>
@@ -131,46 +81,22 @@ public virtual Mozu.Api.Contracts.Customer.CustomerSegment GetSegment(int id, st
 		///   var customerSegment = await customersegment.GetSegmentAsync( id,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerSegment> GetSegmentAsync(int id, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerSegment> GetSegmentAsync(int id, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.CustomerSegment> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.CustomerSegmentClient.GetSegmentClient( id,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Creates a new customer segments. New customer segments do not have any associated customer accounts.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="segment">The Customer Segment object includes properties of a defined customer segment used to group customer accounts.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.CustomerSegment"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var customersegment = new CustomerSegment();
-		///   var customerSegment = customersegment.AddSegment( segment,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.CustomerSegment AddSegment(Mozu.Api.Contracts.Customer.CustomerSegment segment, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.CustomerSegment> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.CustomerSegmentClient.AddSegmentClient( segment,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Creates a new customer segments. New customer segments do not have any associated customer accounts.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="segment">The Customer Segment object includes properties of a defined customer segment used to group customer accounts.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="segment">Properties of the customer segment to add.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Customer.CustomerSegment"/>
 		/// </returns>
@@ -180,44 +106,21 @@ public virtual Mozu.Api.Contracts.Customer.CustomerSegment AddSegment(Mozu.Api.C
 		///   var customerSegment = await customersegment.AddSegmentAsync( segment,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerSegment> AddSegmentAsync(Mozu.Api.Contracts.Customer.CustomerSegment segment, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerSegment> AddSegmentAsync(Mozu.Api.Contracts.Customer.CustomerSegment segment, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.CustomerSegment> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.CustomerSegmentClient.AddSegmentClient( segment,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Adds one or more customer accounts to a defined customer segment.
-		/// </summary>
-		/// <param name="id">Unique identifier of the customer segment to retrieve.</param>
-		/// <param name="accountIds">List of customer account IDs to add to the customer segment specified in the request.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var customersegment = new CustomerSegment();
-		///   customersegment.AddSegmentAccounts( accountIds,  id);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void AddSegmentAccounts(List<int> accountIds, int id)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Customer.CustomerSegmentClient.AddSegmentAccountsClient( accountIds,  id);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Adds one or more customer accounts to a defined customer segment.
+		/// 
 		/// </summary>
-		/// <param name="id">Unique identifier of the customer segment to retrieve.</param>
+		/// <param name="id">Unique identifier of the customer segment for which to add the associated customer accounts.</param>
 		/// <param name="accountIds">List of customer account IDs to add to the customer segment specified in the request.</param>
 		/// <returns>
 		/// 
@@ -228,47 +131,22 @@ public virtual void AddSegmentAccounts(List<int> accountIds, int id)
 		///   await customersegment.AddSegmentAccountsAsync( accountIds,  id);
 		/// </code>
 		/// </example>
-		public virtual async Task AddSegmentAccountsAsync(List<int> accountIds, int id)
+		public virtual async Task AddSegmentAccountsAsync(List<int> accountIds, int id, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Customer.CustomerSegmentClient.AddSegmentAccountsClient( accountIds,  id);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
-		/// <summary>
-		/// Updates the details of the customer segment specified in the request.
-		/// </summary>
-		/// <param name="id">Unique identifier of the customer segment to retrieve.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="segment">The Customer Segment object includes properties of a defined customer segment used to group customer accounts.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.CustomerSegment"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var customersegment = new CustomerSegment();
-		///   var customerSegment = customersegment.UpdateSegment( segment,  id,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.CustomerSegment UpdateSegment(Mozu.Api.Contracts.Customer.CustomerSegment segment, int id, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.CustomerSegment> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.CustomerSegmentClient.UpdateSegmentClient( segment,  id,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates the details of the customer segment specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="id">Unique identifier of the customer segment to retrieve.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="segment">The Customer Segment object includes properties of a defined customer segment used to group customer accounts.</param>
+		/// <param name="id">Unique identifier of the customer segment.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="segment">Properties of the customer segment to update.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Customer.CustomerSegment"/>
 		/// </returns>
@@ -278,43 +156,21 @@ public virtual Mozu.Api.Contracts.Customer.CustomerSegment UpdateSegment(Mozu.Ap
 		///   var customerSegment = await customersegment.UpdateSegmentAsync( segment,  id,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerSegment> UpdateSegmentAsync(Mozu.Api.Contracts.Customer.CustomerSegment segment, int id, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerSegment> UpdateSegmentAsync(Mozu.Api.Contracts.Customer.CustomerSegment segment, int id, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.CustomerSegment> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.CustomerSegmentClient.UpdateSegmentClient( segment,  id,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Deletes a customer segment specified by its unique identifier. Deleting a segment removes any customer account associations, but does not delete the customer account itself.
-		/// </summary>
-		/// <param name="id">Unique identifier of the customer segment to retrieve.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var customersegment = new CustomerSegment();
-		///   customersegment.DeleteSegment( id);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteSegment(int id)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Customer.CustomerSegmentClient.DeleteSegmentClient( id);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes a customer segment specified by its unique identifier. Deleting a segment removes any customer account associations, but does not delete the customer account itself.
+		/// 
 		/// </summary>
-		/// <param name="id">Unique identifier of the customer segment to retrieve.</param>
+		/// <param name="id">Unique identifier of the customer segment to delete.</param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -324,44 +180,21 @@ public virtual void DeleteSegment(int id)
 		///   await customersegment.DeleteSegmentAsync( id);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteSegmentAsync(int id)
+		public virtual async Task DeleteSegmentAsync(int id, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Customer.CustomerSegmentClient.DeleteSegmentClient( id);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
-		/// <summary>
-		/// Removes single account from a segment.
-		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="id">Unique identifier of the customer segment to retrieve.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var customersegment = new CustomerSegment();
-		///   customersegment.RemoveSegmentAccount( id,  accountId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void RemoveSegmentAccount(int id, int accountId)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Customer.CustomerSegmentClient.RemoveSegmentAccountClient( id,  accountId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Removes single account from a segment.
+		/// 
 		/// </summary>
-		/// <param name="accountId">Unique identifier of the customer account.</param>
-		/// <param name="id">Unique identifier of the customer segment to retrieve.</param>
+		/// <param name="accountId"></param>
+		/// <param name="id"></param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -371,12 +204,12 @@ public virtual void RemoveSegmentAccount(int id, int accountId)
 		///   await customersegment.RemoveSegmentAccountAsync( id,  accountId);
 		/// </code>
 		/// </example>
-		public virtual async Task RemoveSegmentAccountAsync(int id, int accountId)
+		public virtual async Task RemoveSegmentAccountAsync(int id, int accountId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Customer.CustomerSegmentClient.RemoveSegmentAccountClient( id,  accountId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/Customer/CustomerSetResource.cs b/Mozu.Api/Resources/Commerce/Customer/CustomerSetResource.cs
old mode 100644
new mode 100755
index ae0eb5a9..3f24ec65
--- a/Mozu.Api/Resources/Commerce/Customer/CustomerSetResource.cs
+++ b/Mozu.Api/Resources/Commerce/Customer/CustomerSetResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Customer
 {
 	/// <summary>
-	/// Use the Customer Sets resource to manage your customer sets. You can use customer sets to control the specific sites your customers can access using the same login credentials, as well as what customer My Account information is shared between sites.Refer to [Customer Sets](../../../guides/settings/customer-sets.htm) in the Guides section for more information.
+	/// 
 	/// </summary>
 	public partial class CustomerSetResource  	{
 		///
@@ -37,40 +38,14 @@ public CustomerSetResource CloneWithApiContext(Action<IApiContext> contextModifi
 		}
 
 				
-		/// <summary>
-		/// Retrieves a collection of customer sets according to any specified filter criteria.
-		/// </summary>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.CustomerSetCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var customerset = new CustomerSet();
-		///   var customerSetCollection = customerset.GetCustomerSets( startIndex,  pageSize,  sortBy,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.CustomerSetCollection GetCustomerSets(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.CustomerSetCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.CustomerSetClient.GetCustomerSetsClient( startIndex,  pageSize,  sortBy,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a collection of customer sets according to any specified filter criteria.
+		/// 
 		/// </summary>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Customer.CustomerSetCollection"/>
 		/// </returns>
@@ -80,46 +55,22 @@ public virtual Mozu.Api.Contracts.Customer.CustomerSetCollection GetCustomerSets
 		///   var customerSetCollection = await customerset.GetCustomerSetsAsync( startIndex,  pageSize,  sortBy,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerSetCollection> GetCustomerSetsAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerSetCollection> GetCustomerSetsAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.CustomerSetCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.CustomerSetClient.GetCustomerSetsClient( startIndex,  pageSize,  sortBy,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the details of the specified customer set.
-		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.CustomerSet"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var customerset = new CustomerSet();
-		///   var customerSet = customerset.GetCustomerSet( code,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.CustomerSet GetCustomerSet(string code, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.CustomerSet> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.CustomerSetClient.GetCustomerSetClient( code,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of the specified customer set.
+		/// 
 		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="code"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Customer.CustomerSet"/>
 		/// </returns>
@@ -129,12 +80,12 @@ public virtual Mozu.Api.Contracts.Customer.CustomerSet GetCustomerSet(string cod
 		///   var customerSet = await customerset.GetCustomerSetAsync( code,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerSet> GetCustomerSetAsync(string code, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.CustomerSet> GetCustomerSetAsync(string code, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.CustomerSet> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.CustomerSetClient.GetCustomerSetClient( code,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
diff --git a/Mozu.Api/Resources/Commerce/Customer/VisitResource.cs b/Mozu.Api/Resources/Commerce/Customer/VisitResource.cs
old mode 100644
new mode 100755
index 4bb9e3fa..26e0e987
--- a/Mozu.Api/Resources/Commerce/Customer/VisitResource.cs
+++ b/Mozu.Api/Resources/Commerce/Customer/VisitResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Customer
 {
@@ -37,42 +38,15 @@ public VisitResource CloneWithApiContext(Action<IApiContext> contextModification
 		}
 
 				
-		/// <summary>
-		/// Retrieves a list of customer visits according to any filter or sort criteria specified in the request.
-		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.VisitCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var visit = new Visit();
-		///   var visitCollection = visit.GetVisits( startIndex,  pageSize,  sortBy,  filter,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.VisitCollection GetVisits(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.VisitCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.VisitClient.GetVisitsClient( startIndex,  pageSize,  sortBy,  filter,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of customer visits according to any filter or sort criteria specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Customer.VisitCollection"/>
 		/// </returns>
@@ -82,46 +56,22 @@ public virtual Mozu.Api.Contracts.Customer.VisitCollection GetVisits(int? startI
 		///   var visitCollection = await visit.GetVisitsAsync( startIndex,  pageSize,  sortBy,  filter,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.VisitCollection> GetVisitsAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.VisitCollection> GetVisitsAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.VisitCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.VisitClient.GetVisitsClient( startIndex,  pageSize,  sortBy,  filter,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the details of the customer visit specified in the request.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="visitId">Unique identifier of the customer visit to update.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.Visit"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var visit = new Visit();
-		///   var visit = visit.GetVisit( visitId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.Visit GetVisit(string visitId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.Visit> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.VisitClient.GetVisitClient( visitId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of the customer visit specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="visitId">Unique identifier of the customer visit to update.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="visitId">Unique identifier of the customer visit to retrieve.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Customer.Visit"/>
 		/// </returns>
@@ -131,46 +81,22 @@ public virtual Mozu.Api.Contracts.Customer.Visit GetVisit(string visitId, string
 		///   var visit = await visit.GetVisitAsync( visitId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.Visit> GetVisitAsync(string visitId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.Visit> GetVisitAsync(string visitId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.Visit> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.VisitClient.GetVisitClient( visitId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Creates a new visit for the customer account specified in the request.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="visit">Properties of a customer visit to one of a company's sites.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.Visit"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var visit = new Visit();
-		///   var visit = visit.AddVisit( visit,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.Visit AddVisit(Mozu.Api.Contracts.Customer.Visit visit, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.Visit> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.VisitClient.AddVisitClient( visit,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Creates a new visit for the customer account specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="visit">Properties of a customer visit to one of a company's sites.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="visit">Properties of the visit to add to the customer account.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Customer.Visit"/>
 		/// </returns>
@@ -180,48 +106,23 @@ public virtual Mozu.Api.Contracts.Customer.Visit AddVisit(Mozu.Api.Contracts.Cus
 		///   var visit = await visit.AddVisitAsync( visit,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.Visit> AddVisitAsync(Mozu.Api.Contracts.Customer.Visit visit, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.Visit> AddVisitAsync(Mozu.Api.Contracts.Customer.Visit visit, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.Visit> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.VisitClient.AddVisitClient( visit,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates one or more properties of a defined customer visit.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="visitId">Unique identifier of the customer visit to update.</param>
-		/// <param name="visit">Properties of a customer visit to one of a company's sites.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.Visit"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var visit = new Visit();
-		///   var visit = visit.UpdateVisit( visit,  visitId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.Visit UpdateVisit(Mozu.Api.Contracts.Customer.Visit visit, string visitId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.Visit> response;
-			var client = Mozu.Api.Clients.Commerce.Customer.VisitClient.UpdateVisitClient( visit,  visitId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates one or more properties of a defined customer visit.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="visitId">Unique identifier of the customer visit to update.</param>
-		/// <param name="visit">Properties of a customer visit to one of a company's sites.</param>
+		/// <param name="visit">Properties of the customer visit to update.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Customer.Visit"/>
 		/// </returns>
@@ -231,12 +132,12 @@ public virtual Mozu.Api.Contracts.Customer.Visit UpdateVisit(Mozu.Api.Contracts.
 		///   var visit = await visit.UpdateVisitAsync( visit,  visitId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.Visit> UpdateVisitAsync(Mozu.Api.Contracts.Customer.Visit visit, string visitId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.Visit> UpdateVisitAsync(Mozu.Api.Contracts.Customer.Visit visit, string visitId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.Visit> response;
 			var client = Mozu.Api.Clients.Commerce.Customer.VisitClient.UpdateVisitClient( visit,  visitId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
diff --git a/Mozu.Api/Resources/Commerce/InStockNotificationSubscriptionResource.cs b/Mozu.Api/Resources/Commerce/InStockNotificationSubscriptionResource.cs
old mode 100644
new mode 100755
index 4417b945..b3b0cd55
--- a/Mozu.Api/Resources/Commerce/InStockNotificationSubscriptionResource.cs
+++ b/Mozu.Api/Resources/Commerce/InStockNotificationSubscriptionResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce
 {
@@ -37,42 +38,15 @@ public InStockNotificationSubscriptionResource CloneWithApiContext(Action<IApiCo
 		}
 
 				
-		/// <summary>
-		/// Retrieves a list of in-stock notification subscriptions.
-		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.InStockNotificationSubscriptionCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var instocknotificationsubscription = new InStockNotificationSubscription();
-		///   var inStockNotificationSubscriptionCollection = instocknotificationsubscription.GetInStockNotificationSubscriptions( startIndex,  pageSize,  sortBy,  filter,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.InStockNotificationSubscriptionCollection GetInStockNotificationSubscriptions(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.InStockNotificationSubscriptionCollection> response;
-			var client = Mozu.Api.Clients.Commerce.InStockNotificationSubscriptionClient.GetInStockNotificationSubscriptionsClient( startIndex,  pageSize,  sortBy,  filter,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of in-stock notification subscriptions.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Customer.InStockNotificationSubscriptionCollection"/>
 		/// </returns>
@@ -82,46 +56,22 @@ public virtual Mozu.Api.Contracts.Customer.InStockNotificationSubscriptionCollec
 		///   var inStockNotificationSubscriptionCollection = await instocknotificationsubscription.GetInStockNotificationSubscriptionsAsync( startIndex,  pageSize,  sortBy,  filter,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.InStockNotificationSubscriptionCollection> GetInStockNotificationSubscriptionsAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.InStockNotificationSubscriptionCollection> GetInStockNotificationSubscriptionsAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.InStockNotificationSubscriptionCollection> response;
 			var client = Mozu.Api.Clients.Commerce.InStockNotificationSubscriptionClient.GetInStockNotificationSubscriptionsClient( startIndex,  pageSize,  sortBy,  filter,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the details of a subscription that sends a push notification when a product is available in a site's active stock.
-		/// </summary>
-		/// <param name="id">Unique identifier of the customer segment to retrieve.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.InStockNotificationSubscription"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var instocknotificationsubscription = new InStockNotificationSubscription();
-		///   var inStockNotificationSubscription = instocknotificationsubscription.GetInStockNotificationSubscription( id,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.InStockNotificationSubscription GetInStockNotificationSubscription(int id, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.InStockNotificationSubscription> response;
-			var client = Mozu.Api.Clients.Commerce.InStockNotificationSubscriptionClient.GetInStockNotificationSubscriptionClient( id,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of a subscription that sends a push notification when a product is available in a site's active stock.
+		/// 
 		/// </summary>
-		/// <param name="id">Unique identifier of the customer segment to retrieve.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="id">Unique identifier of the in-stock notification subscription to retrieve.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Customer.InStockNotificationSubscription"/>
 		/// </returns>
@@ -131,46 +81,22 @@ public virtual Mozu.Api.Contracts.Customer.InStockNotificationSubscription GetIn
 		///   var inStockNotificationSubscription = await instocknotificationsubscription.GetInStockNotificationSubscriptionAsync( id,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.InStockNotificationSubscription> GetInStockNotificationSubscriptionAsync(int id, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.InStockNotificationSubscription> GetInStockNotificationSubscriptionAsync(int id, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.InStockNotificationSubscription> response;
 			var client = Mozu.Api.Clients.Commerce.InStockNotificationSubscriptionClient.GetInStockNotificationSubscriptionClient( id,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Creates a new subscription that notifies the customer when the product specified in the request is available in the active inventory of the defined location.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="inStockNotificationSubscription">Properties of a push notification to which the shopper subscribes. This notification sends the shopper an alert when a new product or a product previously out of stock becomes available in the specified location's active product inventory.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Customer.InStockNotificationSubscription"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var instocknotificationsubscription = new InStockNotificationSubscription();
-		///   var inStockNotificationSubscription = instocknotificationsubscription.AddInStockNotificationSubscription( inStockNotificationSubscription,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Customer.InStockNotificationSubscription AddInStockNotificationSubscription(Mozu.Api.Contracts.Customer.InStockNotificationSubscription inStockNotificationSubscription, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Customer.InStockNotificationSubscription> response;
-			var client = Mozu.Api.Clients.Commerce.InStockNotificationSubscriptionClient.AddInStockNotificationSubscriptionClient( inStockNotificationSubscription,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Creates a new subscription that notifies the customer when the product specified in the request is available in the active inventory of the defined location.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="inStockNotificationSubscription">Properties of a push notification to which the shopper subscribes. This notification sends the shopper an alert when a new product or a product previously out of stock becomes available in the specified location's active product inventory.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="inStockNotificationSubscription">Properties of a subscription that sends the customer a notification when a product is available in a site's active stock.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Customer.InStockNotificationSubscription"/>
 		/// </returns>
@@ -180,43 +106,21 @@ public virtual Mozu.Api.Contracts.Customer.InStockNotificationSubscription AddIn
 		///   var inStockNotificationSubscription = await instocknotificationsubscription.AddInStockNotificationSubscriptionAsync( inStockNotificationSubscription,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Customer.InStockNotificationSubscription> AddInStockNotificationSubscriptionAsync(Mozu.Api.Contracts.Customer.InStockNotificationSubscription inStockNotificationSubscription, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Customer.InStockNotificationSubscription> AddInStockNotificationSubscriptionAsync(Mozu.Api.Contracts.Customer.InStockNotificationSubscription inStockNotificationSubscription, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Customer.InStockNotificationSubscription> response;
 			var client = Mozu.Api.Clients.Commerce.InStockNotificationSubscriptionClient.AddInStockNotificationSubscriptionClient( inStockNotificationSubscription,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Deletes a subscription for a customer in-stock notification.
-		/// </summary>
-		/// <param name="id">Unique identifier of the customer segment to retrieve.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var instocknotificationsubscription = new InStockNotificationSubscription();
-		///   instocknotificationsubscription.DeleteInStockNotificationSubscription( id);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteInStockNotificationSubscription(int id)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.InStockNotificationSubscriptionClient.DeleteInStockNotificationSubscriptionClient( id);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes a subscription for a customer in-stock notification.
+		/// 
 		/// </summary>
-		/// <param name="id">Unique identifier of the customer segment to retrieve.</param>
+		/// <param name="id">Unique identifier of the customer in-stock notification subscription to delete.</param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -226,12 +130,12 @@ public virtual void DeleteInStockNotificationSubscription(int id)
 		///   await instocknotificationsubscription.DeleteInStockNotificationSubscriptionAsync( id);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteInStockNotificationSubscriptionAsync(int id)
+		public virtual async Task DeleteInStockNotificationSubscriptionAsync(int id, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.InStockNotificationSubscriptionClient.DeleteInStockNotificationSubscriptionClient( id);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/LocationResource.cs b/Mozu.Api/Resources/Commerce/LocationResource.cs
old mode 100644
new mode 100755
index 92443e67..5d2dece5
--- a/Mozu.Api/Resources/Commerce/LocationResource.cs
+++ b/Mozu.Api/Resources/Commerce/LocationResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce
 {
 	/// <summary>
-	/// Use the Location resource to retrieve details about a location from a  hosted storefront.
+	/// Use the Location resource to retrieve details about a location from a Mozu hosted storefront.
 	/// </summary>
 	public partial class LocationResource  	{
 		///
@@ -37,259 +38,138 @@ public LocationResource CloneWithApiContext(Action<IApiContext> contextModificat
 		}
 
 				
-		/// <summary>
-		/// Retrieves the details of the location specified in the request.
-		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Location.Location"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var location = new Location();
-		///   var location = location.GetLocation( code,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Location.Location GetLocation(string code, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Location.Location> response;
-			var client = Mozu.Api.Clients.Commerce.LocationClient.GetLocationClient( code,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of the location specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="includeAttributeDefinition"></param>
+		/// <param name="locationCode"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Location.Location"/>
 		/// </returns>
 		/// <example>
 		/// <code>
 		///   var location = new Location();
-		///   var location = await location.GetLocationAsync( code,  responseFields);
+		///   var location = await location.GetLocationAsync( locationCode,  includeAttributeDefinition,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Location.Location> GetLocationAsync(string code, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Location.Location> GetLocationAsync(string locationCode, bool? includeAttributeDefinition =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Location.Location> response;
-			var client = Mozu.Api.Clients.Commerce.LocationClient.GetLocationClient( code,  responseFields);
+			var client = Mozu.Api.Clients.Commerce.LocationClient.GetLocationClient( locationCode,  includeAttributeDefinition,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves a list of the locations configured for a specified location usage type for the specified site, according to any defined filter or sort criteria.
-		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="locationUsageType">System-defined location usage type code, which is DS for direct ship, SP for in-store pickup, or storeFinder.</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Location.LocationCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var location = new Location();
-		///   var locationCollection = location.GetLocationsInUsageType( locationUsageType,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Location.LocationCollection GetLocationsInUsageType(string locationUsageType, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Location.LocationCollection> response;
-			var client = Mozu.Api.Clients.Commerce.LocationClient.GetLocationsInUsageTypeClient( locationUsageType,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of the locations configured for a specified location usage type for the specified site, according to any defined filter or sort criteria.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
+		/// <param name="filter"></param>
+		/// <param name="includeAttributeDefinition"></param>
 		/// <param name="locationUsageType">System-defined location usage type code, which is DS for direct ship, SP for in-store pickup, or storeFinder.</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Location.LocationCollection"/>
 		/// </returns>
 		/// <example>
 		/// <code>
 		///   var location = new Location();
-		///   var locationCollection = await location.GetLocationsInUsageTypeAsync( locationUsageType,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
+		///   var locationCollection = await location.GetLocationsInUsageTypeAsync( locationUsageType,  startIndex,  pageSize,  sortBy,  filter,  includeAttributeDefinition,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Location.LocationCollection> GetLocationsInUsageTypeAsync(string locationUsageType, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Location.LocationCollection> GetLocationsInUsageTypeAsync(string locationUsageType, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, bool? includeAttributeDefinition =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Location.LocationCollection> response;
-			var client = Mozu.Api.Clients.Commerce.LocationClient.GetLocationsInUsageTypeClient( locationUsageType,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
+			var client = Mozu.Api.Clients.Commerce.LocationClient.GetLocationsInUsageTypeClient( locationUsageType,  startIndex,  pageSize,  sortBy,  filter,  includeAttributeDefinition,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the details of the location configured for the direct shipping (DS) location usage type for the site specified in the request. This location acts as an origin address from which order packages will ship, as well as the location where product reservations are created when order items are submitted with the direct ship fulfillment type (DS). If the direct ship location usage type is not configured for this site, the operation returns an error.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Location.Location"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var location = new Location();
-		///   var location = location.GetDirectShipLocation( responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Location.Location GetDirectShipLocation(string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Location.Location> response;
-			var client = Mozu.Api.Clients.Commerce.LocationClient.GetDirectShipLocationClient( responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of the location configured for the direct shipping (DS) location usage type for the site specified in the request. This location acts as an origin address from which order packages will ship, as well as the location where product reservations are created when order items are submitted with the direct ship fulfillment type (DS). If the direct ship location usage type is not configured for this site, the operation returns an error.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="includeAttributeDefinition"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Location.Location"/>
 		/// </returns>
 		/// <example>
 		/// <code>
 		///   var location = new Location();
-		///   var location = await location.GetDirectShipLocationAsync( responseFields);
+		///   var location = await location.GetDirectShipLocationAsync( includeAttributeDefinition,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Location.Location> GetDirectShipLocationAsync(string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Location.Location> GetDirectShipLocationAsync(bool? includeAttributeDefinition =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Location.Location> response;
-			var client = Mozu.Api.Clients.Commerce.LocationClient.GetDirectShipLocationClient( responseFields);
+			var client = Mozu.Api.Clients.Commerce.LocationClient.GetDirectShipLocationClient( includeAttributeDefinition,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the details of the location configured for the in-store pickup (SP) location usage type for the site specified in the request. If the location is not associated with a location type configured for the in-store pickup location usage type (SP), the operation returns an error.
-		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Location.Location"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var location = new Location();
-		///   var location = location.GetInStorePickupLocation( code,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Location.Location GetInStorePickupLocation(string code, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Location.Location> response;
-			var client = Mozu.Api.Clients.Commerce.LocationClient.GetInStorePickupLocationClient( code,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of the location configured for the in-store pickup (SP) location usage type for the site specified in the request. If the location is not associated with a location type configured for the in-store pickup location usage type (SP), the operation returns an error.
+		/// 
 		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="includeAttributeDefinition"></param>
+		/// <param name="locationCode"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Location.Location"/>
 		/// </returns>
 		/// <example>
 		/// <code>
 		///   var location = new Location();
-		///   var location = await location.GetInStorePickupLocationAsync( code,  responseFields);
+		///   var location = await location.GetInStorePickupLocationAsync( locationCode,  includeAttributeDefinition,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Location.Location> GetInStorePickupLocationAsync(string code, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Location.Location> GetInStorePickupLocationAsync(string locationCode, bool? includeAttributeDefinition =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Location.Location> response;
-			var client = Mozu.Api.Clients.Commerce.LocationClient.GetInStorePickupLocationClient( code,  responseFields);
+			var client = Mozu.Api.Clients.Commerce.LocationClient.GetInStorePickupLocationClient( locationCode,  includeAttributeDefinition,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves a list of locations valid for in-store pickup of an item in an order according to any filter and sort criteria. For example, an application could use this operation to provide a store finder feature based on the shopper's GPS coordinates. If the location types for the in-store pickup location usage type are not configured for the site, this operation returns an error.
-		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Location.LocationCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var location = new Location();
-		///   var locationCollection = location.GetInStorePickupLocations( startIndex,  pageSize,  sortBy,  filter,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Location.LocationCollection GetInStorePickupLocations(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Location.LocationCollection> response;
-			var client = Mozu.Api.Clients.Commerce.LocationClient.GetInStorePickupLocationsClient( startIndex,  pageSize,  sortBy,  filter,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of locations valid for in-store pickup of an item in an order according to any filter and sort criteria. For example, an application could use this operation to provide a store finder feature based on the shopper's GPS coordinates. If the location types for the in-store pickup location usage type are not configured for the site, this operation returns an error.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+		/// <param name="filter"></param>
+		/// <param name="includeAttributeDefinition"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Location.LocationCollection"/>
 		/// </returns>
 		/// <example>
 		/// <code>
 		///   var location = new Location();
-		///   var locationCollection = await location.GetInStorePickupLocationsAsync( startIndex,  pageSize,  sortBy,  filter,  responseFields);
+		///   var locationCollection = await location.GetInStorePickupLocationsAsync( startIndex,  pageSize,  sortBy,  filter,  includeAttributeDefinition,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Location.LocationCollection> GetInStorePickupLocationsAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Location.LocationCollection> GetInStorePickupLocationsAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, bool? includeAttributeDefinition =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Location.LocationCollection> response;
-			var client = Mozu.Api.Clients.Commerce.LocationClient.GetInStorePickupLocationsClient( startIndex,  pageSize,  sortBy,  filter,  responseFields);
+			var client = Mozu.Api.Clients.Commerce.LocationClient.GetInStorePickupLocationsClient( startIndex,  pageSize,  sortBy,  filter,  includeAttributeDefinition,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
diff --git a/Mozu.Api/Resources/Commerce/OrderResource.cs b/Mozu.Api/Resources/Commerce/OrderResource.cs
old mode 100644
new mode 100755
index a67edab9..1ccf79c8
--- a/Mozu.Api/Resources/Commerce/OrderResource.cs
+++ b/Mozu.Api/Resources/Commerce/OrderResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce
 {
@@ -37,45 +38,17 @@ public OrderResource CloneWithApiContext(Action<IApiContext> contextModification
 		}
 
 				
-		/// <summary>
-		/// Retrieves a list of orders according to any specified filter criteria and sort options.
-		/// </summary>
-		/// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="q">A list of order search terms (not phrases) to use in the query when searching across order number and the name or email of the billing contact. When entering, separate multiple search terms with a space character.</param>
-		/// <param name="qLimit">The maximum number of search results to return in the response. You can limit any range between 1-100.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy"></param>
-		/// <param name="startIndex"></param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.OrderCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var order = new Order();
-		///   var orderCollection = order.GetOrders( startIndex,  pageSize,  sortBy,  filter,  q,  qLimit,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.OrderCollection GetOrders(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string q =  null, int? qLimit =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderCollection> response;
-			var client = Mozu.Api.Clients.Commerce.OrderClient.GetOrdersClient( startIndex,  pageSize,  sortBy,  filter,  q,  qLimit,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of orders according to any specified filter criteria and sort options.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="q">A list of order search terms (not phrases) to use in the query when searching across order number and the name or email of the billing contact. When entering, separate multiple search terms with a space character.</param>
+		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. You can filter an order's search results by any of its properties, including status, contact information, or total. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=Status+eq+Submitted"</param>
+		/// <param name="includeBin"></param>
+		/// <param name="pageSize">Used to page results from a query. Indicates the maximum number of entities to return from a query. Default value: 20. Max value: 200.</param>
+		/// <param name="q">A list of order search terms to use in the query when searching across order number and the name or email of the billing contact. Separate multiple search terms with a space character.</param>
 		/// <param name="qLimit">The maximum number of search results to return in the response. You can limit any range between 1-100.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy">The element to sort the results by and the order in which the results appear. Either ascending order (a-z) which accepts 'asc' or 'asc' or descending order (z-a) which accepts 'desc' or 'desc'. The sortBy parameter follows an available property. For examp</param>
 		/// <param name="startIndex"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.OrderCollection"/>
@@ -83,47 +56,24 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.OrderCollection GetOrde
 		/// <example>
 		/// <code>
 		///   var order = new Order();
-		///   var orderCollection = await order.GetOrdersAsync( startIndex,  pageSize,  sortBy,  filter,  q,  qLimit,  responseFields);
+		///   var orderCollection = await order.GetOrdersAsync( startIndex,  pageSize,  sortBy,  filter,  q,  qLimit,  includeBin,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderCollection> GetOrdersAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string q =  null, int? qLimit =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderCollection> GetOrdersAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string q =  null, int? qLimit =  null, bool? includeBin =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderCollection> response;
-			var client = Mozu.Api.Clients.Commerce.OrderClient.GetOrdersClient( startIndex,  pageSize,  sortBy,  filter,  q,  qLimit,  responseFields);
+			var client = Mozu.Api.Clients.Commerce.OrderClient.GetOrdersClient( startIndex,  pageSize,  sortBy,  filter,  q,  qLimit,  includeBin,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the actions available to perform for an order based on its current status.
-		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <returns>
-		/// List{string}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var order = new Order();
-		///   var string = order.GetAvailableActions( orderId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<string> GetAvailableActions(string orderId)
-		{
-			MozuClient<List<string>> response;
-			var client = Mozu.Api.Clients.Commerce.OrderClient.GetAvailableActionsClient( orderId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the actions available to perform for an order based on its current status.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
+		/// <param name="orderId">Unique identifier of the available order actions to get.</param>
 		/// <returns>
 		/// List{string}
 		/// </returns>
@@ -133,44 +83,21 @@ public virtual List<string> GetAvailableActions(string orderId)
 		///   var string = await order.GetAvailableActionsAsync( orderId);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<string>> GetAvailableActionsAsync(string orderId)
+		public virtual async Task<List<string>> GetAvailableActionsAsync(string orderId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<string>> response;
 			var client = Mozu.Api.Clients.Commerce.OrderClient.GetAvailableActionsClient( orderId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves an order for the purpose of splitting it into multiple taxable orders in order to fulfill the order in multiple locations.
-		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <returns>
-		/// List{<see cref="Mozu.Api.Contracts.PricingRuntime.TaxableOrder"/>}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var order = new Order();
-		///   var taxableOrder = order.GetTaxableOrders( orderId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<Mozu.Api.Contracts.PricingRuntime.TaxableOrder> GetTaxableOrders(string orderId)
-		{
-			MozuClient<List<Mozu.Api.Contracts.PricingRuntime.TaxableOrder>> response;
-			var client = Mozu.Api.Clients.Commerce.OrderClient.GetTaxableOrdersClient( orderId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves an order for the purpose of splitting it into multiple taxable orders in order to fulfill the order in multiple locations.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
+		/// <param name="orderId">Unique identifier of the order to retrieve.</param>
 		/// <returns>
 		/// List{<see cref="Mozu.Api.Contracts.PricingRuntime.TaxableOrder"/>}
 		/// </returns>
@@ -180,97 +107,49 @@ public virtual async Task<List<string>> GetAvailableActionsAsync(string orderId)
 		///   var taxableOrder = await order.GetTaxableOrdersAsync( orderId);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<Mozu.Api.Contracts.PricingRuntime.TaxableOrder>> GetTaxableOrdersAsync(string orderId)
+		public virtual async Task<List<Mozu.Api.Contracts.PricingRuntime.TaxableOrder>> GetTaxableOrdersAsync(string orderId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<Mozu.Api.Contracts.PricingRuntime.TaxableOrder>> response;
 			var client = Mozu.Api.Clients.Commerce.OrderClient.GetTaxableOrdersClient( orderId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the details of an order specified by the order ID.
-		/// </summary>
-		/// <param name="draft">If true, retrieve the draft version of the order, which might include uncommitted changes to the order or its components.</param>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var order = new Order();
-		///   var order = order.GetOrder( orderId,  draft,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.Order GetOrder(string orderId, bool? draft =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> response;
-			var client = Mozu.Api.Clients.Commerce.OrderClient.GetOrderClient( orderId,  draft,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of an order specified by the order ID.
+		/// 
 		/// </summary>
 		/// <param name="draft">If true, retrieve the draft version of the order, which might include uncommitted changes to the order or its components.</param>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="includeBin"></param>
+		/// <param name="orderId">Unique identifier of the order details to get.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>
 		/// </returns>
 		/// <example>
 		/// <code>
 		///   var order = new Order();
-		///   var order = await order.GetOrderAsync( orderId,  draft,  responseFields);
+		///   var order = await order.GetOrderAsync( orderId,  draft,  includeBin,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> GetOrderAsync(string orderId, bool? draft =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> GetOrderAsync(string orderId, bool? draft =  null, bool? includeBin =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> response;
-			var client = Mozu.Api.Clients.Commerce.OrderClient.GetOrderClient( orderId,  draft,  responseFields);
+			var client = Mozu.Api.Clients.Commerce.OrderClient.GetOrderClient( orderId,  draft,  includeBin,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Creates a new order from an existing cart when the customer chooses to proceed to checkout.
-		/// </summary>
-		/// <param name="cartId">Identifier of the cart to delete.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var order = new Order();
-		///   var order = order.CreateOrderFromCart( cartId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.Order CreateOrderFromCart(string cartId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> response;
-			var client = Mozu.Api.Clients.Commerce.OrderClient.CreateOrderFromCartClient( cartId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Creates a new order from an existing cart when the customer chooses to proceed to checkout.
+		/// 
 		/// </summary>
-		/// <param name="cartId">Identifier of the cart to delete.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="cartId">Unique identifier of the cart. This is the original cart ID expressed as a GUID.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>
 		/// </returns>
@@ -280,46 +159,22 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.Order CreateOrderFromCa
 		///   var order = await order.CreateOrderFromCartAsync( cartId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> CreateOrderFromCartAsync(string cartId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> CreateOrderFromCartAsync(string cartId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> response;
 			var client = Mozu.Api.Clients.Commerce.OrderClient.CreateOrderFromCartClient( cartId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Creates a new order for no-cart quick-ordering scenarios.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="order">Properties of an order, including its components.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var order = new Order();
-		///   var order = order.CreateOrder( order,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.Order CreateOrder(Mozu.Api.Contracts.CommerceRuntime.Orders.Order order, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> response;
-			var client = Mozu.Api.Clients.Commerce.OrderClient.CreateOrderClient( order,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Creates a new order for no-cart quick-ordering scenarios.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="order">Properties of an order, including its components.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="order">Properties of the order to create and submit.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>
 		/// </returns>
@@ -329,47 +184,22 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.Order CreateOrder(Mozu.
 		///   var order = await order.CreateOrderAsync( order,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> CreateOrderAsync(Mozu.Api.Contracts.CommerceRuntime.Orders.Order order, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> CreateOrderAsync(Mozu.Api.Contracts.CommerceRuntime.Orders.Order order, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> response;
 			var client = Mozu.Api.Clients.Commerce.OrderClient.CreateOrderClient( order,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Perform the specified action for an order. The actions you can perform depend on the current status of the order.
-		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="action">The action to perform for the order.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var order = new Order();
-		///   var order = order.PerformOrderAction( action,  orderId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.Order PerformOrderAction(Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAction action, string orderId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> response;
-			var client = Mozu.Api.Clients.Commerce.OrderClient.PerformOrderActionClient( action,  orderId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Perform the specified action for an order. The actions you can perform depend on the current status of the order.
+		/// 
 		/// </summary>
 		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="action">The action to perform for the order.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>
@@ -380,50 +210,51 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.Order PerformOrderActio
 		///   var order = await order.PerformOrderActionAsync( action,  orderId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> PerformOrderActionAsync(Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAction action, string orderId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> PerformOrderActionAsync(Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAction action, string orderId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> response;
 			var client = Mozu.Api.Clients.Commerce.OrderClient.PerformOrderActionClient( action,  orderId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
+
 		/// <summary>
-		/// Processes a digital wallet (used to hold 3rd party payment and shipping information).
+		/// 
 		/// </summary>
-		/// <param name="digitalWalletType">The type of digital wallet to be processed.</param>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="digitalWallet">The details of the digitial wallet.</param>
+		/// <param name="couponCodeToApply"></param>
+		/// <param name="refreshShipping"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="order"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>
 		/// </returns>
 		/// <example>
 		/// <code>
 		///   var order = new Order();
-		///   var order = order.ProcessDigitalWallet( digitalWallet,  orderId,  digitalWalletType,  responseFields);
+		///   var order = await order.PriceOrderAsync( order,  refreshShipping,  couponCodeToApply,  responseFields);
 		/// </code>
 		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.Order ProcessDigitalWallet(Mozu.Api.Contracts.CommerceRuntime.Orders.DigitalWallet digitalWallet, string orderId, string digitalWalletType, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> PriceOrderAsync(Mozu.Api.Contracts.CommerceRuntime.Orders.Order order, bool refreshShipping, string couponCodeToApply =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> response;
-			var client = Mozu.Api.Clients.Commerce.OrderClient.ProcessDigitalWalletClient( digitalWallet,  orderId,  digitalWalletType,  responseFields);
+			var client = Mozu.Api.Clients.Commerce.OrderClient.PriceOrderClient( order,  refreshShipping,  couponCodeToApply,  responseFields);
 			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+			return await response.ResultAsync();
 
 		}
 
+
 		/// <summary>
-		/// Processes a digital wallet (used to hold 3rd party payment and shipping information).
+		/// 
 		/// </summary>
-		/// <param name="digitalWalletType">The type of digital wallet to be processed.</param>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="digitalWallet">The details of the digitial wallet.</param>
+		/// <param name="digitalWalletType"></param>
+		/// <param name="orderId"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="digitalWallet"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>
 		/// </returns>
@@ -433,54 +264,26 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.Order ProcessDigitalWal
 		///   var order = await order.ProcessDigitalWalletAsync( digitalWallet,  orderId,  digitalWalletType,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> ProcessDigitalWalletAsync(Mozu.Api.Contracts.CommerceRuntime.Orders.DigitalWallet digitalWallet, string orderId, string digitalWalletType, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> ProcessDigitalWalletAsync(Mozu.Api.Contracts.CommerceRuntime.Orders.DigitalWallet digitalWallet, string orderId, string digitalWalletType, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> response;
 			var client = Mozu.Api.Clients.Commerce.OrderClient.ProcessDigitalWalletClient( digitalWallet,  orderId,  digitalWalletType,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Update the properties of a discount applied to an order.
-		/// </summary>
-		/// <param name="discountId">discountId parameter description DOCUMENT_HERE </param>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
-		/// <param name="discount">Properties of all applied discounts for an associated cart, order, or product. </param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var order = new Order();
-		///   var order = order.UpdateOrderDiscount( discount,  orderId,  discountId,  updateMode,  version,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.Order UpdateOrderDiscount(Mozu.Api.Contracts.CommerceRuntime.Discounts.AppliedDiscount discount, string orderId, int discountId, string updateMode =  null, string version =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> response;
-			var client = Mozu.Api.Clients.Commerce.OrderClient.UpdateOrderDiscountClient( discount,  orderId,  discountId,  updateMode,  version,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Update the properties of a discount applied to an order.
+		/// 
 		/// </summary>
-		/// <param name="discountId">discountId parameter description DOCUMENT_HERE </param>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
-		/// <param name="discount">Properties of all applied discounts for an associated cart, order, or product. </param>
+		/// <param name="discountId">Unique identifier of the discount. System-supplied and read only.</param>
+		/// <param name="orderId">Unique identifier of the order discount. System-supplied and read only.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="updateMode">Specifies whether to modify the discount by updating the original order, updating the order in draft mode, or updating the order in draft mode and then committing the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
+		/// <param name="version"></param>
+		/// <param name="discount">Properties of the order discount to update.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>
 		/// </returns>
@@ -490,45 +293,22 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.Order UpdateOrderDiscou
 		///   var order = await order.UpdateOrderDiscountAsync( discount,  orderId,  discountId,  updateMode,  version,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> UpdateOrderDiscountAsync(Mozu.Api.Contracts.CommerceRuntime.Discounts.AppliedDiscount discount, string orderId, int discountId, string updateMode =  null, string version =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> UpdateOrderDiscountAsync(Mozu.Api.Contracts.CommerceRuntime.Discounts.AppliedDiscount discount, string orderId, int discountId, string updateMode =  null, string version =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> response;
 			var client = Mozu.Api.Clients.Commerce.OrderClient.UpdateOrderDiscountClient( discount,  orderId,  discountId,  updateMode,  version,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Deletes the current draft version of the order, which also deletes any uncommitted changes made to the order in draft mode.
-		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="version">Determines whether or not to check versioning of items for concurrency purposes.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var order = new Order();
-		///   order.DeleteOrderDraft( orderId,  version);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteOrderDraft(string orderId, string version =  null)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.OrderClient.DeleteOrderDraftClient( orderId,  version);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes the current draft version of the order, which also deletes any uncommitted changes made to the order in draft mode.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="version">Determines whether or not to check versioning of items for concurrency purposes.</param>
+		/// <param name="orderId">Unique identifier of the order associated with the draft to delete.</param>
+		/// <param name="version">If applicable, the version of the order draft to delete.</param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -538,44 +318,21 @@ public virtual void DeleteOrderDraft(string orderId, string version =  null)
 		///   await order.DeleteOrderDraftAsync( orderId,  version);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteOrderDraftAsync(string orderId, string version =  null)
+		public virtual async Task DeleteOrderDraftAsync(string orderId, string version =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.OrderClient.DeleteOrderDraftClient( orderId,  version);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
-		/// <summary>
-		/// Triggers an order confirmation email to be resent.
-		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="action">The action to perform for the order.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var order = new Order();
-		///   order.ResendOrderConfirmationEmail( action,  orderId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void ResendOrderConfirmationEmail(Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAction action, string orderId)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.OrderClient.ResendOrderConfirmationEmailClient( action,  orderId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Triggers an order confirmation email to be resent.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="action">The action to perform for the order.</param>
+		/// <param name="orderId"></param>
+		/// <param name="action"></param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -585,51 +342,24 @@ public virtual void ResendOrderConfirmationEmail(Mozu.Api.Contracts.CommerceRunt
 		///   await order.ResendOrderConfirmationEmailAsync( action,  orderId);
 		/// </code>
 		/// </example>
-		public virtual async Task ResendOrderConfirmationEmailAsync(Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAction action, string orderId)
+		public virtual async Task ResendOrderConfirmationEmailAsync(Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAction action, string orderId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.OrderClient.ResendOrderConfirmationEmailClient( action,  orderId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
-		/// <summary>
-		/// Changes the price list associated with an order. The desired price list code should be specified in the ApiContext.
-		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">Determines whether or not to check versioning of items for concurrency purposes.</param>
-		/// <param name="priceListCode">The unique price list code.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var order = new Order();
-		///   var order = order.ChangeOrderPriceList( priceListCode,  orderId,  updateMode,  version,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.Order ChangeOrderPriceList(string priceListCode, string orderId, string updateMode =  null, string version =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> response;
-			var client = Mozu.Api.Clients.Commerce.OrderClient.ChangeOrderPriceListClient( priceListCode,  orderId,  updateMode,  version,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Changes the price list associated with an order. The desired price list code should be specified in the ApiContext.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">Determines whether or not to check versioning of items for concurrency purposes.</param>
-		/// <param name="priceListCode">The unique price list code.</param>
+		/// <param name="orderId"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="updateMode"></param>
+		/// <param name="version"></param>
+		/// <param name="priceListCode"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>
 		/// </returns>
@@ -639,46 +369,22 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.Order ChangeOrderPriceL
 		///   var order = await order.ChangeOrderPriceListAsync( priceListCode,  orderId,  updateMode,  version,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> ChangeOrderPriceListAsync(string priceListCode, string orderId, string updateMode =  null, string version =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> ChangeOrderPriceListAsync(string priceListCode, string orderId, string updateMode =  null, string version =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> response;
 			var client = Mozu.Api.Clients.Commerce.OrderClient.ChangeOrderPriceListClient( priceListCode,  orderId,  updateMode,  version,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates the user ID of the shopper who placed the order to the current user.
-		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var order = new Order();
-		///   var order = order.ChangeOrderUserId( orderId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.Order ChangeOrderUserId(string orderId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> response;
-			var client = Mozu.Api.Clients.Commerce.OrderClient.ChangeOrderUserIdClient( orderId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates the user ID of the shopper who placed the order to the current user.
+		/// 
 		/// </summary>
 		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>
 		/// </returns>
@@ -688,52 +394,25 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.Order ChangeOrderUserId
 		///   var order = await order.ChangeOrderUserIdAsync( orderId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> ChangeOrderUserIdAsync(string orderId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> ChangeOrderUserIdAsync(string orderId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> response;
 			var client = Mozu.Api.Clients.Commerce.OrderClient.ChangeOrderUserIdClient( orderId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates the specified order when additional order information, such as shipping or billing information, is modified during the checkout process.
-		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
-		/// <param name="order">Properties of an order, including its components.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var order = new Order();
-		///   var order = order.UpdateOrder( order,  orderId,  updateMode,  version,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.Order UpdateOrder(Mozu.Api.Contracts.CommerceRuntime.Orders.Order order, string orderId, string updateMode =  null, string version =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> response;
-			var client = Mozu.Api.Clients.Commerce.OrderClient.UpdateOrderClient( order,  orderId,  updateMode,  version,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates the specified order when additional order information, such as shipping or billing information, is modified during the checkout process.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="orderId">Unique identifier of the order to update.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
-		/// <param name="order">Properties of an order, including its components.</param>
+		/// <param name="version"></param>
+		/// <param name="order">The properties of the order to update.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>
 		/// </returns>
@@ -743,12 +422,12 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.Order UpdateOrder(Mozu.
 		///   var order = await order.UpdateOrderAsync( order,  orderId,  updateMode,  version,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> UpdateOrderAsync(Mozu.Api.Contracts.CommerceRuntime.Orders.Order order, string orderId, string updateMode =  null, string version =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> UpdateOrderAsync(Mozu.Api.Contracts.CommerceRuntime.Orders.Order order, string orderId, string updateMode =  null, string version =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> response;
 			var client = Mozu.Api.Clients.Commerce.OrderClient.UpdateOrderClient( order,  orderId,  updateMode,  version,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
diff --git a/Mozu.Api/Resources/Commerce/Orders/AdjustmentResource.cs b/Mozu.Api/Resources/Commerce/Orders/AdjustmentResource.cs
old mode 100644
new mode 100755
index 4bc69579..32f7757c
--- a/Mozu.Api/Resources/Commerce/Orders/AdjustmentResource.cs
+++ b/Mozu.Api/Resources/Commerce/Orders/AdjustmentResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Orders
 {
@@ -37,41 +38,14 @@ public AdjustmentResource CloneWithApiContext(Action<IApiContext> contextModific
 		}
 
 				
-		/// <summary>
-		/// Updates the order handling adjustment.
-		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">Determines whether or not to check versioning of items for concurrency purposes.</param>
-		/// <param name="adjustment"></param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var adjustment = new Adjustment();
-		///   var order = adjustment.ApplyHandlingAdjustment( adjustment,  orderId,  updateMode,  version,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.Order ApplyHandlingAdjustment(Mozu.Api.Contracts.CommerceRuntime.Commerce.Adjustment adjustment, string orderId, string updateMode =  null, string version =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.AdjustmentClient.ApplyHandlingAdjustmentClient( adjustment,  orderId,  updateMode,  version,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates the order handling adjustment.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">Determines whether or not to check versioning of items for concurrency purposes.</param>
+		/// <param name="orderId"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="updateMode"></param>
+		/// <param name="version"></param>
 		/// <param name="adjustment"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>
@@ -82,52 +56,25 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.Order ApplyHandlingAdju
 		///   var order = await adjustment.ApplyHandlingAdjustmentAsync( adjustment,  orderId,  updateMode,  version,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> ApplyHandlingAdjustmentAsync(Mozu.Api.Contracts.CommerceRuntime.Commerce.Adjustment adjustment, string orderId, string updateMode =  null, string version =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> ApplyHandlingAdjustmentAsync(Mozu.Api.Contracts.CommerceRuntime.Commerce.Adjustment adjustment, string orderId, string updateMode =  null, string version =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.AdjustmentClient.ApplyHandlingAdjustmentClient( adjustment,  orderId,  updateMode,  version,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Applies a shipping adjustment to the specified order.
-		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
-		/// <param name="adjustment">Properties of an ad-hoc price adjustment for an order.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var adjustment = new Adjustment();
-		///   var order = adjustment.ApplyShippingAdjustment( adjustment,  orderId,  updateMode,  version,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.Order ApplyShippingAdjustment(Mozu.Api.Contracts.CommerceRuntime.Commerce.Adjustment adjustment, string orderId, string updateMode =  null, string version =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.AdjustmentClient.ApplyShippingAdjustmentClient( adjustment,  orderId,  updateMode,  version,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Applies a shipping adjustment to the specified order.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
-		/// <param name="adjustment">Properties of an ad-hoc price adjustment for an order.</param>
+		/// <param name="orderId">Unique identifier of the order associated with the shipping adjustment.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="updateMode">Specifies whether to apply the shipping adjustment by updating the original order, updating the order in draft mode, or updating the order in draft mode and then committing the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
+		/// <param name="version"></param>
+		/// <param name="adjustment">Properties of the shipping adjustment to apply to the order.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>
 		/// </returns>
@@ -137,52 +84,25 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.Order ApplyShippingAdju
 		///   var order = await adjustment.ApplyShippingAdjustmentAsync( adjustment,  orderId,  updateMode,  version,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> ApplyShippingAdjustmentAsync(Mozu.Api.Contracts.CommerceRuntime.Commerce.Adjustment adjustment, string orderId, string updateMode =  null, string version =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> ApplyShippingAdjustmentAsync(Mozu.Api.Contracts.CommerceRuntime.Commerce.Adjustment adjustment, string orderId, string updateMode =  null, string version =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.AdjustmentClient.ApplyShippingAdjustmentClient( adjustment,  orderId,  updateMode,  version,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Applies a price adjustment to the specified order.
-		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
-		/// <param name="adjustment">Properties of an ad-hoc price adjustment for an order.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var adjustment = new Adjustment();
-		///   var order = adjustment.ApplyAdjustment( adjustment,  orderId,  updateMode,  version,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.Order ApplyAdjustment(Mozu.Api.Contracts.CommerceRuntime.Commerce.Adjustment adjustment, string orderId, string updateMode =  null, string version =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.AdjustmentClient.ApplyAdjustmentClient( adjustment,  orderId,  updateMode,  version,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Applies a price adjustment to the specified order.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
-		/// <param name="adjustment">Properties of an ad-hoc price adjustment for an order.</param>
+		/// <param name="orderId">Unique identifier of the order for which to apply the adjustment.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="updateMode">Specifies whether to apply the adjustment by updating the original order, updating the order in draft mode, or updating the order in draft mode and then committing the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
+		/// <param name="version"></param>
+		/// <param name="adjustment">Properties of the price adjustment to apply to the order.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>
 		/// </returns>
@@ -192,48 +112,23 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.Order ApplyAdjustment(M
 		///   var order = await adjustment.ApplyAdjustmentAsync( adjustment,  orderId,  updateMode,  version,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> ApplyAdjustmentAsync(Mozu.Api.Contracts.CommerceRuntime.Commerce.Adjustment adjustment, string orderId, string updateMode =  null, string version =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> ApplyAdjustmentAsync(Mozu.Api.Contracts.CommerceRuntime.Commerce.Adjustment adjustment, string orderId, string updateMode =  null, string version =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.AdjustmentClient.ApplyAdjustmentClient( adjustment,  orderId,  updateMode,  version,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Removes an adjustment to the order handling fee.
-		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">Determines whether or not to check versioning of items for concurrency purposes.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var adjustment = new Adjustment();
-		///   var order = adjustment.RemoveHandlingAdjustment( orderId,  updateMode,  version);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.Order RemoveHandlingAdjustment(string orderId, string updateMode =  null, string version =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.AdjustmentClient.RemoveHandlingAdjustmentClient( orderId,  updateMode,  version);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Removes an adjustment to the order handling fee.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">Determines whether or not to check versioning of items for concurrency purposes.</param>
+		/// <param name="orderId"></param>
+		/// <param name="updateMode"></param>
+		/// <param name="version"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>
 		/// </returns>
@@ -243,48 +138,23 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.Order RemoveHandlingAdj
 		///   var order = await adjustment.RemoveHandlingAdjustmentAsync( orderId,  updateMode,  version);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> RemoveHandlingAdjustmentAsync(string orderId, string updateMode =  null, string version =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> RemoveHandlingAdjustmentAsync(string orderId, string updateMode =  null, string version =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.AdjustmentClient.RemoveHandlingAdjustmentClient( orderId,  updateMode,  version);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Removes a shipping adjustment previously applied to an order or draft.
-		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var adjustment = new Adjustment();
-		///   var order = adjustment.RemoveShippingAdjustment( orderId,  updateMode,  version);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.Order RemoveShippingAdjustment(string orderId, string updateMode =  null, string version =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.AdjustmentClient.RemoveShippingAdjustmentClient( orderId,  updateMode,  version);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Removes a shipping adjustment previously applied to an order or draft.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
+		/// <param name="orderId">Unique identifier of the order with the applied shipping adjustment.</param>
+		/// <param name="updateMode">Specifies whether to remove the shipping adjustment by updating the original order, updating the order in draft mode, or updating the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
+		/// <param name="version"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>
 		/// </returns>
@@ -294,48 +164,23 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.Order RemoveShippingAdj
 		///   var order = await adjustment.RemoveShippingAdjustmentAsync( orderId,  updateMode,  version);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> RemoveShippingAdjustmentAsync(string orderId, string updateMode =  null, string version =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> RemoveShippingAdjustmentAsync(string orderId, string updateMode =  null, string version =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.AdjustmentClient.RemoveShippingAdjustmentClient( orderId,  updateMode,  version);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Removes a price adjustment from the specified order.
-		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var adjustment = new Adjustment();
-		///   var order = adjustment.RemoveAdjustment( orderId,  updateMode,  version);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.Order RemoveAdjustment(string orderId, string updateMode =  null, string version =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.AdjustmentClient.RemoveAdjustmentClient( orderId,  updateMode,  version);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Removes a price adjustment from the specified order.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
+		/// <param name="orderId">Unique identifier of the order for which to delete the adjustment.</param>
+		/// <param name="updateMode">Specifies whether to remove the adjustment by updating the original order, updating the order in draft mode, or updating the order in draft mode and then committing the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
+		/// <param name="version"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>
 		/// </returns>
@@ -345,12 +190,12 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.Order RemoveAdjustment(
 		///   var order = await adjustment.RemoveAdjustmentAsync( orderId,  updateMode,  version);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> RemoveAdjustmentAsync(string orderId, string updateMode =  null, string version =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> RemoveAdjustmentAsync(string orderId, string updateMode =  null, string version =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.AdjustmentClient.RemoveAdjustmentClient( orderId,  updateMode,  version);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
diff --git a/Mozu.Api/Resources/Commerce/Orders/AppliedDiscountResource.cs b/Mozu.Api/Resources/Commerce/Orders/AppliedDiscountResource.cs
old mode 100644
new mode 100755
index b2cf70de..0a7f7c7e
--- a/Mozu.Api/Resources/Commerce/Orders/AppliedDiscountResource.cs
+++ b/Mozu.Api/Resources/Commerce/Orders/AppliedDiscountResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Orders
 {
@@ -37,42 +38,15 @@ public AppliedDiscountResource CloneWithApiContext(Action<IApiContext> contextMo
 		}
 
 				
-		/// <summary>
-		/// Apply a coupon to the order.
-		/// </summary>
-		/// <param name="couponCode">Alphanumeric code associated with the coupon or promotion that results in a discounted price.</param>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var applieddiscount = new AppliedDiscount();
-		///   var order = applieddiscount.ApplyCoupon( orderId,  couponCode,  updateMode,  version,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.Order ApplyCoupon(string orderId, string couponCode, string updateMode =  null, string version =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.AppliedDiscountClient.ApplyCouponClient( orderId,  couponCode,  updateMode,  version,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Apply a coupon to the order.
+		/// 
 		/// </summary>
-		/// <param name="couponCode">Alphanumeric code associated with the coupon or promotion that results in a discounted price.</param>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
+		/// <param name="couponCode"></param>
+		/// <param name="orderId">Unique identifier of the order to associate the coupon. System-supplied and read-only.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="updateMode">Specifies whether to apply the coupon by updating the original order, updating the order in draft mode, or updating the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
+		/// <param name="version"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>
 		/// </returns>
@@ -82,50 +56,24 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.Order ApplyCoupon(strin
 		///   var order = await applieddiscount.ApplyCouponAsync( orderId,  couponCode,  updateMode,  version,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> ApplyCouponAsync(string orderId, string couponCode, string updateMode =  null, string version =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> ApplyCouponAsync(string orderId, string couponCode, string updateMode =  null, string version =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.AppliedDiscountClient.ApplyCouponClient( orderId,  couponCode,  updateMode,  version,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Removes a coupon previously applied to the order.
-		/// </summary>
-		/// <param name="couponCode">Alphanumeric code associated with the coupon or promotion that results in a discounted price.</param>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var applieddiscount = new AppliedDiscount();
-		///   var order = applieddiscount.RemoveCoupon( orderId,  couponCode,  updateMode,  version);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.Order RemoveCoupon(string orderId, string couponCode, string updateMode =  null, string version =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.AppliedDiscountClient.RemoveCouponClient( orderId,  couponCode,  updateMode,  version);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Removes a coupon previously applied to the order.
+		/// 
 		/// </summary>
-		/// <param name="couponCode">Alphanumeric code associated with the coupon or promotion that results in a discounted price.</param>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
+		/// <param name="couponCode"></param>
+		/// <param name="orderId">Unique identifier of the order with the coupon to remove.</param>
+		/// <param name="updateMode">Specifies whether to remove the coupon by updating the original order, updating the order in draft mode, or updating the order in draft mode and then committing the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
+		/// <param name="version"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>
 		/// </returns>
@@ -135,48 +83,23 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.Order RemoveCoupon(stri
 		///   var order = await applieddiscount.RemoveCouponAsync( orderId,  couponCode,  updateMode,  version);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> RemoveCouponAsync(string orderId, string couponCode, string updateMode =  null, string version =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> RemoveCouponAsync(string orderId, string couponCode, string updateMode =  null, string version =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.AppliedDiscountClient.RemoveCouponClient( orderId,  couponCode,  updateMode,  version);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Removes all coupons previously applied to the order.
-		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var applieddiscount = new AppliedDiscount();
-		///   var order = applieddiscount.RemoveCoupons( orderId,  updateMode,  version);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.Order RemoveCoupons(string orderId, string updateMode =  null, string version =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.AppliedDiscountClient.RemoveCouponsClient( orderId,  updateMode,  version);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Removes all coupons previously applied to the order.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
+		/// <param name="orderId">Unique identifier of the order with the coupons to remove.</param>
+		/// <param name="updateMode">Specifies whether to remove coupons by updating the original order, updating the order in draft mode, or updating the order in draft mode and then committing the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
+		/// <param name="version"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>
 		/// </returns>
@@ -186,12 +109,12 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.Order RemoveCoupons(str
 		///   var order = await applieddiscount.RemoveCouponsAsync( orderId,  updateMode,  version);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> RemoveCouponsAsync(string orderId, string updateMode =  null, string version =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> RemoveCouponsAsync(string orderId, string updateMode =  null, string version =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.AppliedDiscountClient.RemoveCouponsClient( orderId,  updateMode,  version);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
diff --git a/Mozu.Api/Resources/Commerce/Orders/Attributedefinition/AttributeResource.cs b/Mozu.Api/Resources/Commerce/Orders/Attributedefinition/AttributeResource.cs
old mode 100644
new mode 100755
index 4493ae8a..33e309f8
--- a/Mozu.Api/Resources/Commerce/Orders/Attributedefinition/AttributeResource.cs
+++ b/Mozu.Api/Resources/Commerce/Orders/Attributedefinition/AttributeResource.cs
@@ -13,13 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Orders.Attributedefinition
 {
 	/// <summary>
-	/// Attributes are used to add custom definitions and characteristics to the following objects:
-
-
+	/// Use the Order Attribute Definition resource to manage the attributes that uniquely describe orders, such as the associated shopping season or "How did you hear about us?". Merchants can display order attributes on the order summary, the order confirmation page, invoices, or packing slips.
 	/// </summary>
 	public partial class AttributeResource  	{
 		///
@@ -39,42 +38,15 @@ public AttributeResource CloneWithApiContext(Action<IApiContext> contextModifica
 		}
 
 				
-		/// <summary>
-		/// Retrieves a paged list of attributes according to any specified filter criteria and sort options.
-		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Core.Extensible.AttributeCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var attribute = new Attribute();
-		///   var attributeCollection = attribute.GetAttributes( startIndex,  pageSize,  sortBy,  filter,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Core.Extensible.AttributeCollection GetAttributes(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Core.Extensible.AttributeCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.Attributedefinition.AttributeClient.GetAttributesClient( startIndex,  pageSize,  sortBy,  filter,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a paged list of attributes according to any specified filter criteria and sort options.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Core.Extensible.AttributeCollection"/>
 		/// </returns>
@@ -84,44 +56,21 @@ public virtual Mozu.Api.Contracts.Core.Extensible.AttributeCollection GetAttribu
 		///   var attributeCollection = await attribute.GetAttributesAsync( startIndex,  pageSize,  sortBy,  filter,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Core.Extensible.AttributeCollection> GetAttributesAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Core.Extensible.AttributeCollection> GetAttributesAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Core.Extensible.AttributeCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.Attributedefinition.AttributeClient.GetAttributesClient( startIndex,  pageSize,  sortBy,  filter,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieve a list of the vocabulary values defined for the customer attribute specified in the request.
-		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <returns>
-		/// List{<see cref="Mozu.Api.Contracts.Core.Extensible.AttributeVocabularyValue"/>}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var attribute = new Attribute();
-		///   var attributeVocabularyValue = attribute.GetAttributeVocabularyValues( attributeFQN);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<Mozu.Api.Contracts.Core.Extensible.AttributeVocabularyValue> GetAttributeVocabularyValues(string attributeFQN)
-		{
-			MozuClient<List<Mozu.Api.Contracts.Core.Extensible.AttributeVocabularyValue>> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.Attributedefinition.AttributeClient.GetAttributeVocabularyValuesClient( attributeFQN);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieve a list of the vocabulary values defined for the customer attribute specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
+		/// <param name="attributeFQN"></param>
 		/// <returns>
 		/// List{<see cref="Mozu.Api.Contracts.Core.Extensible.AttributeVocabularyValue"/>}
 		/// </returns>
@@ -131,46 +80,22 @@ public virtual Mozu.Api.Contracts.Core.Extensible.AttributeCollection GetAttribu
 		///   var attributeVocabularyValue = await attribute.GetAttributeVocabularyValuesAsync( attributeFQN);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<Mozu.Api.Contracts.Core.Extensible.AttributeVocabularyValue>> GetAttributeVocabularyValuesAsync(string attributeFQN)
+		public virtual async Task<List<Mozu.Api.Contracts.Core.Extensible.AttributeVocabularyValue>> GetAttributeVocabularyValuesAsync(string attributeFQN, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<Mozu.Api.Contracts.Core.Extensible.AttributeVocabularyValue>> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.Attributedefinition.AttributeClient.GetAttributeVocabularyValuesClient( attributeFQN);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the details of the specified product attribute.
-		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Core.Extensible.Attribute"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var attribute = new Attribute();
-		///   var attribute = attribute.GetAttribute( attributeFQN,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Core.Extensible.Attribute GetAttribute(string attributeFQN, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Core.Extensible.Attribute> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.Attributedefinition.AttributeClient.GetAttributeClient( attributeFQN,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of the specified product attribute.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Core.Extensible.Attribute"/>
 		/// </returns>
@@ -180,46 +105,22 @@ public virtual Mozu.Api.Contracts.Core.Extensible.Attribute GetAttribute(string
 		///   var attribute = await attribute.GetAttributeAsync( attributeFQN,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Core.Extensible.Attribute> GetAttributeAsync(string attributeFQN, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Core.Extensible.Attribute> GetAttributeAsync(string attributeFQN, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Core.Extensible.Attribute> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.Attributedefinition.AttributeClient.GetAttributeClient( attributeFQN,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Create and save a new attribute. These attributes are used in products and product options.
-		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="attribute">Properties of an attribute used to describe customers or orders.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Core.Extensible.Attribute"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var attribute = new Attribute();
-		///   var attribute = attribute.CreateAttribute( attribute,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Core.Extensible.Attribute CreateAttribute(Mozu.Api.Contracts.Core.Extensible.Attribute attribute, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Core.Extensible.Attribute> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.Attributedefinition.AttributeClient.CreateAttributeClient( attribute,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Create and save a new attribute. These attributes are used in products and product options.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="attribute">Properties of an attribute used to describe customers or orders.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="attribute">The properties of the order attribute to create.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Core.Extensible.Attribute"/>
 		/// </returns>
@@ -229,48 +130,23 @@ public virtual Mozu.Api.Contracts.Core.Extensible.Attribute CreateAttribute(Mozu
 		///   var attribute = await attribute.CreateAttributeAsync( attribute,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Core.Extensible.Attribute> CreateAttributeAsync(Mozu.Api.Contracts.Core.Extensible.Attribute attribute, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Core.Extensible.Attribute> CreateAttributeAsync(Mozu.Api.Contracts.Core.Extensible.Attribute attribute, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Core.Extensible.Attribute> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.Attributedefinition.AttributeClient.CreateAttributeClient( attribute,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates an existing attribute with attribute properties to set.
-		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="attribute">Properties of an attribute used to describe customers or orders.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Core.Extensible.Attribute"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var attribute = new Attribute();
-		///   var attribute = attribute.UpdateAttribute( attribute,  attributeFQN,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Core.Extensible.Attribute UpdateAttribute(Mozu.Api.Contracts.Core.Extensible.Attribute attribute, string attributeFQN, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Core.Extensible.Attribute> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.Attributedefinition.AttributeClient.UpdateAttributeClient( attribute,  attributeFQN,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates an existing attribute with attribute properties to set.
+		/// 
 		/// </summary>
-		/// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="attribute">Properties of an attribute used to describe customers or orders.</param>
+		/// <param name="attributeFQN"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="attribute">The properties of the order attribute to update.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Core.Extensible.Attribute"/>
 		/// </returns>
@@ -280,12 +156,12 @@ public virtual Mozu.Api.Contracts.Core.Extensible.Attribute UpdateAttribute(Mozu
 		///   var attribute = await attribute.UpdateAttributeAsync( attribute,  attributeFQN,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Core.Extensible.Attribute> UpdateAttributeAsync(Mozu.Api.Contracts.Core.Extensible.Attribute attribute, string attributeFQN, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Core.Extensible.Attribute> UpdateAttributeAsync(Mozu.Api.Contracts.Core.Extensible.Attribute attribute, string attributeFQN, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Core.Extensible.Attribute> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.Attributedefinition.AttributeClient.UpdateAttributeClient( attribute,  attributeFQN,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
diff --git a/Mozu.Api/Resources/Commerce/Orders/BillingInfoResource.cs b/Mozu.Api/Resources/Commerce/Orders/BillingInfoResource.cs
old mode 100644
new mode 100755
index 621523fd..7c144747
--- a/Mozu.Api/Resources/Commerce/Orders/BillingInfoResource.cs
+++ b/Mozu.Api/Resources/Commerce/Orders/BillingInfoResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Orders
 {
@@ -37,38 +38,13 @@ public BillingInfoResource CloneWithApiContext(Action<IApiContext> contextModifi
 		}
 
 				
-		/// <summary>
-		/// Retrieves the billing information associated with an order.
-		/// </summary>
-		/// <param name="draft">If true, retrieve the draft version of the order, which might include uncommitted changes to the order or its components.</param>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Payments.BillingInfo"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var billinginfo = new BillingInfo();
-		///   var billingInfo = billinginfo.GetBillingInfo( orderId,  draft,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Payments.BillingInfo GetBillingInfo(string orderId, bool? draft =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Payments.BillingInfo> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.BillingInfoClient.GetBillingInfoClient( orderId,  draft,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the billing information associated with an order.
+		/// 
 		/// </summary>
-		/// <param name="draft">If true, retrieve the draft version of the order, which might include uncommitted changes to the order or its components.</param>
+		/// <param name="draft">If true, retrieve the draft version of the order billing information, which might include uncommitted changes.</param>
 		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Payments.BillingInfo"/>
 		/// </returns>
@@ -78,52 +54,25 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Payments.BillingInfo GetBillin
 		///   var billingInfo = await billinginfo.GetBillingInfoAsync( orderId,  draft,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Payments.BillingInfo> GetBillingInfoAsync(string orderId, bool? draft =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Payments.BillingInfo> GetBillingInfoAsync(string orderId, bool? draft =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Payments.BillingInfo> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.BillingInfoClient.GetBillingInfoClient( orderId,  draft,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates the billing information supplied for an order.
-		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
-		/// <param name="billingInfo">Properties of the billing information entered for an order during checkout.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Payments.BillingInfo"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var billinginfo = new BillingInfo();
-		///   var billingInfo = billinginfo.SetBillingInfo( billingInfo,  orderId,  updateMode,  version,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Payments.BillingInfo SetBillingInfo(Mozu.Api.Contracts.CommerceRuntime.Payments.BillingInfo billingInfo, string orderId, string updateMode =  null, string version =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Payments.BillingInfo> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.BillingInfoClient.SetBillingInfoClient( billingInfo,  orderId,  updateMode,  version,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates the billing information supplied for an order.
+		/// 
 		/// </summary>
 		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
-		/// <param name="billingInfo">Properties of the billing information entered for an order during checkout.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="updateMode">Specifies whether to set the billing information by updating the original order, updating the order in draft mode, or updating the order in draft mode and then committing the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
+		/// <param name="version"></param>
+		/// <param name="billingInfo">The properties of the order billing information to update.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Payments.BillingInfo"/>
 		/// </returns>
@@ -133,12 +82,12 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Payments.BillingInfo SetBillin
 		///   var billingInfo = await billinginfo.SetBillingInfoAsync( billingInfo,  orderId,  updateMode,  version,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Payments.BillingInfo> SetBillingInfoAsync(Mozu.Api.Contracts.CommerceRuntime.Payments.BillingInfo billingInfo, string orderId, string updateMode =  null, string version =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Payments.BillingInfo> SetBillingInfoAsync(Mozu.Api.Contracts.CommerceRuntime.Payments.BillingInfo billingInfo, string orderId, string updateMode =  null, string version =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Payments.BillingInfo> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.BillingInfoClient.SetBillingInfoClient( billingInfo,  orderId,  updateMode,  version,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
diff --git a/Mozu.Api/Resources/Commerce/Orders/DigitalPackageResource.cs b/Mozu.Api/Resources/Commerce/Orders/DigitalPackageResource.cs
old mode 100644
new mode 100755
index 0a288cbe..c3528831
--- a/Mozu.Api/Resources/Commerce/Orders/DigitalPackageResource.cs
+++ b/Mozu.Api/Resources/Commerce/Orders/DigitalPackageResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Orders
 {
@@ -37,36 +38,12 @@ public DigitalPackageResource CloneWithApiContext(Action<IApiContext> contextMod
 		}
 
 				
-		/// <summary>
-		/// Retrieves a collection of fulfillment options for digital packages. Options may include emailed files/links or provided links. 
-		/// </summary>
-		/// <param name="digitalPackageId">This parameter supplies package ID to get fulfillment actions for the digital package.</param>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <returns>
-		/// List{string}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var digitalpackage = new DigitalPackage();
-		///   var string = digitalpackage.GetAvailableDigitalPackageFulfillmentActions( orderId,  digitalPackageId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<string> GetAvailableDigitalPackageFulfillmentActions(string orderId, string digitalPackageId)
-		{
-			MozuClient<List<string>> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.DigitalPackageClient.GetAvailableDigitalPackageFulfillmentActionsClient( orderId,  digitalPackageId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a collection of fulfillment options for digital packages. Options may include emailed files/links or provided links. 
+		/// 
 		/// </summary>
 		/// <param name="digitalPackageId">This parameter supplies package ID to get fulfillment actions for the digital package.</param>
-		/// <param name="orderId">Unique identifier of the order.</param>
+		/// <param name="orderId">This parameter provides the unique identifier of the order on which to get a list of available actions.</param>
 		/// <returns>
 		/// List{string}
 		/// </returns>
@@ -76,48 +53,23 @@ public virtual List<string> GetAvailableDigitalPackageFulfillmentActions(string
 		///   var string = await digitalpackage.GetAvailableDigitalPackageFulfillmentActionsAsync( orderId,  digitalPackageId);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<string>> GetAvailableDigitalPackageFulfillmentActionsAsync(string orderId, string digitalPackageId)
+		public virtual async Task<List<string>> GetAvailableDigitalPackageFulfillmentActionsAsync(string orderId, string digitalPackageId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<string>> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.DigitalPackageClient.GetAvailableDigitalPackageFulfillmentActionsClient( orderId,  digitalPackageId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// This operation retreives a digital package within an order and it requires two parameters: orderId and digitalPackageId.
-		/// </summary>
-		/// <param name="digitalPackageId">This parameter supplies package ID to get fulfillment actions for the digital package.</param>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.DigitalPackage"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var digitalpackage = new DigitalPackage();
-		///   var digitalPackage = digitalpackage.GetDigitalPackage( orderId,  digitalPackageId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Fulfillment.DigitalPackage GetDigitalPackage(string orderId, string digitalPackageId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.DigitalPackage> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.DigitalPackageClient.GetDigitalPackageClient( orderId,  digitalPackageId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// This operation retreives a digital package within an order and it requires two parameters: orderId and digitalPackageId.
+		/// 
 		/// </summary>
-		/// <param name="digitalPackageId">This parameter supplies package ID to get fulfillment actions for the digital package.</param>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="digitalPackageId">This parameter provides the digital package Id.</param>
+		/// <param name="orderId">This parameter provides the unique identifier of the order with which to associate the digital package.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.DigitalPackage"/>
 		/// </returns>
@@ -127,48 +79,23 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Fulfillment.DigitalPackage Get
 		///   var digitalPackage = await digitalpackage.GetDigitalPackageAsync( orderId,  digitalPackageId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.DigitalPackage> GetDigitalPackageAsync(string orderId, string digitalPackageId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.DigitalPackage> GetDigitalPackageAsync(string orderId, string digitalPackageId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.DigitalPackage> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.DigitalPackageClient.GetDigitalPackageClient( orderId,  digitalPackageId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Lets you apply a digital package to the order using the orderId and digitalPackage parameters.
-		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="digitalPackage">Lets you manage an order's digital packages, by applying a digital package to the order.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.DigitalPackage"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var digitalpackage = new DigitalPackage();
-		///   var digitalPackage = digitalpackage.CreateDigitalPackage( digitalPackage,  orderId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Fulfillment.DigitalPackage CreateDigitalPackage(Mozu.Api.Contracts.CommerceRuntime.Fulfillment.DigitalPackage digitalPackage, string orderId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.DigitalPackage> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.DigitalPackageClient.CreateDigitalPackageClient( digitalPackage,  orderId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Lets you apply a digital package to the order using the orderId and digitalPackage parameters.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="digitalPackage">Lets you manage an order's digital packages, by applying a digital package to the order.</param>
+		/// <param name="orderId">The orderID is a required paramter for the digitalpackages operation. The orderId is a unique identifier of the order with which to associate the digital package.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="digitalPackage">The digitalPackage parameter is a required parameter for the CreateDigitalPackages operation. The digitalPackage is the digital package to create and add to the order.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.DigitalPackage"/>
 		/// </returns>
@@ -178,50 +105,24 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Fulfillment.DigitalPackage Cre
 		///   var digitalPackage = await digitalpackage.CreateDigitalPackageAsync( digitalPackage,  orderId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.DigitalPackage> CreateDigitalPackageAsync(Mozu.Api.Contracts.CommerceRuntime.Fulfillment.DigitalPackage digitalPackage, string orderId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.DigitalPackage> CreateDigitalPackageAsync(Mozu.Api.Contracts.CommerceRuntime.Fulfillment.DigitalPackage digitalPackage, string orderId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.DigitalPackage> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.DigitalPackageClient.CreateDigitalPackageClient( digitalPackage,  orderId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// This method operates on one digital package, specified by the id given. This method ensures that the digital package ID provided is in the order with the id given, and then updates the properties of that package with the properties of the one passed in using the ‘digitalpackage’ parameter.
-		/// </summary>
-		/// <param name="digitalPackageId">This parameter supplies package ID to get fulfillment actions for the digital package.</param>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="digitalPackage">Lets you manage an order's digital packages, by applying a digital package to the order.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.DigitalPackage"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var digitalpackage = new DigitalPackage();
-		///   var digitalPackage = digitalpackage.UpdateDigitalPackage( digitalPackage,  orderId,  digitalPackageId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Fulfillment.DigitalPackage UpdateDigitalPackage(Mozu.Api.Contracts.CommerceRuntime.Fulfillment.DigitalPackage digitalPackage, string orderId, string digitalPackageId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.DigitalPackage> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.DigitalPackageClient.UpdateDigitalPackageClient( digitalPackage,  orderId,  digitalPackageId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// This method operates on one digital package, specified by the id given. This method ensures that the digital package ID provided is in the order with the id given, and then updates the properties of that package with the properties of the one passed in using the ‘digitalpackage’ parameter.
+		/// 
 		/// </summary>
-		/// <param name="digitalPackageId">This parameter supplies package ID to get fulfillment actions for the digital package.</param>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="digitalPackage">Lets you manage an order's digital packages, by applying a digital package to the order.</param>
+		/// <param name="digitalPackageId">This parameter specifies the digital package to update in the order.</param>
+		/// <param name="orderId">This parameter provides the unique identifier of the order with which to associate the digital package.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="digitalPackage">This parameter provides the package content to update in the order.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.DigitalPackage"/>
 		/// </returns>
@@ -231,45 +132,22 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Fulfillment.DigitalPackage Upd
 		///   var digitalPackage = await digitalpackage.UpdateDigitalPackageAsync( digitalPackage,  orderId,  digitalPackageId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.DigitalPackage> UpdateDigitalPackageAsync(Mozu.Api.Contracts.CommerceRuntime.Fulfillment.DigitalPackage digitalPackage, string orderId, string digitalPackageId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.DigitalPackage> UpdateDigitalPackageAsync(Mozu.Api.Contracts.CommerceRuntime.Fulfillment.DigitalPackage digitalPackage, string orderId, string digitalPackageId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.DigitalPackage> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.DigitalPackageClient.UpdateDigitalPackageClient( digitalPackage,  orderId,  digitalPackageId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// This operation deletes a digital package from an order. This operation requires three parameters: orderId, digitalPackageId, and digitalPackage.
-		/// </summary>
-		/// <param name="digitalPackageId">This parameter supplies package ID to get fulfillment actions for the digital package.</param>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var digitalpackage = new DigitalPackage();
-		///   digitalpackage.DeleteDigitalPackage( orderId,  digitalPackageId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteDigitalPackage(string orderId, string digitalPackageId)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Orders.DigitalPackageClient.DeleteDigitalPackageClient( orderId,  digitalPackageId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// This operation deletes a digital package from an order. This operation requires three parameters: orderId, digitalPackageId, and digitalPackage.
+		/// 
 		/// </summary>
-		/// <param name="digitalPackageId">This parameter supplies package ID to get fulfillment actions for the digital package.</param>
-		/// <param name="orderId">Unique identifier of the order.</param>
+		/// <param name="digitalPackageId">The digitalPackage ID is unique package ID to update on the order.</param>
+		/// <param name="orderId">The orderId is unique identifier of the order with which to associate the package.</param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -279,12 +157,12 @@ public virtual void DeleteDigitalPackage(string orderId, string digitalPackageId
 		///   await digitalpackage.DeleteDigitalPackageAsync( orderId,  digitalPackageId);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteDigitalPackageAsync(string orderId, string digitalPackageId)
+		public virtual async Task DeleteDigitalPackageAsync(string orderId, string digitalPackageId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Orders.DigitalPackageClient.DeleteDigitalPackageClient( orderId,  digitalPackageId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/Orders/ExtendedPropertyResource.cs b/Mozu.Api/Resources/Commerce/Orders/ExtendedPropertyResource.cs
old mode 100644
new mode 100755
index 247ab410..174c80e7
--- a/Mozu.Api/Resources/Commerce/Orders/ExtendedPropertyResource.cs
+++ b/Mozu.Api/Resources/Commerce/Orders/ExtendedPropertyResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Orders
 {
 	/// <summary>
-	/// Use the Extended Properties resource to store tracking strings for your orders. Extended properties can help you track affiliate sources.
+	/// 
 	/// </summary>
 	public partial class ExtendedPropertyResource  	{
 		///
@@ -37,36 +38,12 @@ public ExtendedPropertyResource CloneWithApiContext(Action<IApiContext> contextM
 		}
 
 				
-		/// <summary>
-		/// Retrieves the extended property string associated with the order. 
-		/// </summary>
-		/// <param name="draft">If true, retrieve the draft version of the order, which might include uncommitted changes to the order or its components.</param>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <returns>
-		/// List{<see cref="Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty"/>}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var extendedproperty = new ExtendedProperty();
-		///   var extendedProperty = extendedproperty.GetExtendedProperties( orderId,  draft);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty> GetExtendedProperties(string orderId, bool? draft =  null)
-		{
-			MozuClient<List<Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty>> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.ExtendedPropertyClient.GetExtendedPropertiesClient( orderId,  draft);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the extended property string associated with the order. 
+		/// 
 		/// </summary>
-		/// <param name="draft">If true, retrieve the draft version of the order, which might include uncommitted changes to the order or its components.</param>
-		/// <param name="orderId">Unique identifier of the order.</param>
+		/// <param name="draft"></param>
+		/// <param name="orderId"></param>
 		/// <returns>
 		/// List{<see cref="Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty"/>}
 		/// </returns>
@@ -76,50 +53,24 @@ public ExtendedPropertyResource CloneWithApiContext(Action<IApiContext> contextM
 		///   var extendedProperty = await extendedproperty.GetExtendedPropertiesAsync( orderId,  draft);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty>> GetExtendedPropertiesAsync(string orderId, bool? draft =  null)
+		public virtual async Task<List<Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty>> GetExtendedPropertiesAsync(string orderId, bool? draft =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty>> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.ExtendedPropertyClient.GetExtendedPropertiesClient( orderId,  draft);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Creates an extended property for the order.
-		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">Determines whether or not to check versioning of items for concurrency purposes.</param>
-		/// <param name="extendedProperties">The details of the extended property.</param>
-		/// <returns>
-		/// List{<see cref="Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty"/>}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var extendedproperty = new ExtendedProperty();
-		///   var extendedProperty = extendedproperty.AddExtendedProperties( extendedProperties,  orderId,  updateMode,  version);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty> AddExtendedProperties(List<Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty> extendedProperties, string orderId, string updateMode =  null, string version =  null)
-		{
-			MozuClient<List<Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty>> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.ExtendedPropertyClient.AddExtendedPropertiesClient( extendedProperties,  orderId,  updateMode,  version);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Creates an extended property for the order.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">Determines whether or not to check versioning of items for concurrency purposes.</param>
-		/// <param name="extendedProperties">The details of the extended property.</param>
+		/// <param name="orderId"></param>
+		/// <param name="updateMode"></param>
+		/// <param name="version"></param>
+		/// <param name="extendedProperties"></param>
 		/// <returns>
 		/// List{<see cref="Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty"/>}
 		/// </returns>
@@ -129,56 +80,27 @@ public ExtendedPropertyResource CloneWithApiContext(Action<IApiContext> contextM
 		///   var extendedProperty = await extendedproperty.AddExtendedPropertiesAsync( extendedProperties,  orderId,  updateMode,  version);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty>> AddExtendedPropertiesAsync(List<Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty> extendedProperties, string orderId, string updateMode =  null, string version =  null)
+		public virtual async Task<List<Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty>> AddExtendedPropertiesAsync(List<Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty> extendedProperties, string orderId, string updateMode =  null, string version =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty>> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.ExtendedPropertyClient.AddExtendedPropertiesClient( extendedProperties,  orderId,  updateMode,  version);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates one ore more extended properties.
-		/// </summary>
-		/// <param name="key">The extended property key.</param>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="upsert">Inserts and updates an extended property.        </param>
-		/// <param name="version">Determines whether or not to check versioning of items for concurrency purposes.</param>
-		/// <param name="extendedProperty">The details of the updated extended property.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var extendedproperty = new ExtendedProperty();
-		///   var extendedProperty = extendedproperty.UpdateExtendedProperty( extendedProperty,  orderId,  key,  updateMode,  version,  upsert,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty UpdateExtendedProperty(Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty extendedProperty, string orderId, string key, string updateMode =  null, string version =  null, bool? upsert =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.ExtendedPropertyClient.UpdateExtendedPropertyClient( extendedProperty,  orderId,  key,  updateMode,  version,  upsert,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates one ore more extended properties.
+		/// 
 		/// </summary>
-		/// <param name="key">The extended property key.</param>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="upsert">Inserts and updates an extended property.        </param>
-		/// <param name="version">Determines whether or not to check versioning of items for concurrency purposes.</param>
-		/// <param name="extendedProperty">The details of the updated extended property.</param>
+		/// <param name="key"></param>
+		/// <param name="orderId"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="updateMode"></param>
+		/// <param name="upsert"></param>
+		/// <param name="version"></param>
+		/// <param name="extendedProperty"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty"/>
 		/// </returns>
@@ -188,52 +110,25 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty Upda
 		///   var extendedProperty = await extendedproperty.UpdateExtendedPropertyAsync( extendedProperty,  orderId,  key,  updateMode,  version,  upsert,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty> UpdateExtendedPropertyAsync(Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty extendedProperty, string orderId, string key, string updateMode =  null, string version =  null, bool? upsert =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty> UpdateExtendedPropertyAsync(Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty extendedProperty, string orderId, string key, string updateMode =  null, string version =  null, bool? upsert =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.ExtendedPropertyClient.UpdateExtendedPropertyClient( extendedProperty,  orderId,  key,  updateMode,  version,  upsert,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates one or more extended properties.
-		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="upsert">Inserts and updates the extended property.        </param>
-		/// <param name="version">Determines whether or not to check versioning of items for concurrency purposes.</param>
-		/// <param name="extendedProperties">The details of the updated extended properties.</param>
-		/// <returns>
-		/// List{<see cref="Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty"/>}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var extendedproperty = new ExtendedProperty();
-		///   var extendedProperty = extendedproperty.UpdateExtendedProperties( extendedProperties,  orderId,  updateMode,  version,  upsert);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty> UpdateExtendedProperties(List<Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty> extendedProperties, string orderId, string updateMode =  null, string version =  null, bool? upsert =  null)
-		{
-			MozuClient<List<Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty>> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.ExtendedPropertyClient.UpdateExtendedPropertiesClient( extendedProperties,  orderId,  updateMode,  version,  upsert);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates one or more extended properties.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="upsert">Inserts and updates the extended property.        </param>
-		/// <param name="version">Determines whether or not to check versioning of items for concurrency purposes.</param>
-		/// <param name="extendedProperties">The details of the updated extended properties.</param>
+		/// <param name="orderId"></param>
+		/// <param name="updateMode"></param>
+		/// <param name="upsert"></param>
+		/// <param name="version"></param>
+		/// <param name="extendedProperties"></param>
 		/// <returns>
 		/// List{<see cref="Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty"/>}
 		/// </returns>
@@ -243,49 +138,24 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty Upda
 		///   var extendedProperty = await extendedproperty.UpdateExtendedPropertiesAsync( extendedProperties,  orderId,  updateMode,  version,  upsert);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty>> UpdateExtendedPropertiesAsync(List<Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty> extendedProperties, string orderId, string updateMode =  null, string version =  null, bool? upsert =  null)
+		public virtual async Task<List<Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty>> UpdateExtendedPropertiesAsync(List<Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty> extendedProperties, string orderId, string updateMode =  null, string version =  null, bool? upsert =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<Mozu.Api.Contracts.CommerceRuntime.Commerce.ExtendedProperty>> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.ExtendedPropertyClient.UpdateExtendedPropertiesClient( extendedProperties,  orderId,  updateMode,  version,  upsert);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Deletes one or more extended properties.
-		/// </summary>
-		/// <param name="key">The extended property key.</param>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">Determines whether or not to check versioning of items for concurrency purposes.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var extendedproperty = new ExtendedProperty();
-		///   extendedproperty.DeleteExtendedProperty( orderId,  key,  updateMode,  version);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteExtendedProperty(string orderId, string key, string updateMode =  null, string version =  null)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Orders.ExtendedPropertyClient.DeleteExtendedPropertyClient( orderId,  key,  updateMode,  version);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes one or more extended properties.
+		/// 
 		/// </summary>
-		/// <param name="key">The extended property key.</param>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">Determines whether or not to check versioning of items for concurrency purposes.</param>
+		/// <param name="key"></param>
+		/// <param name="orderId"></param>
+		/// <param name="updateMode"></param>
+		/// <param name="version"></param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -295,48 +165,23 @@ public virtual void DeleteExtendedProperty(string orderId, string key, string up
 		///   await extendedproperty.DeleteExtendedPropertyAsync( orderId,  key,  updateMode,  version);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteExtendedPropertyAsync(string orderId, string key, string updateMode =  null, string version =  null)
+		public virtual async Task DeleteExtendedPropertyAsync(string orderId, string key, string updateMode =  null, string version =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Orders.ExtendedPropertyClient.DeleteExtendedPropertyClient( orderId,  key,  updateMode,  version);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
-		/// <summary>
-		/// Deletes the extended property associated with the order. 
-		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">Determines whether or not to check versioning of items for concurrency purposes.</param>
-		/// <param name="keys">The extended property keys.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var extendedproperty = new ExtendedProperty();
-		///   extendedproperty.DeleteExtendedProperties( keys,  orderId,  updateMode,  version);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteExtendedProperties(List<string> keys, string orderId, string updateMode =  null, string version =  null)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Orders.ExtendedPropertyClient.DeleteExtendedPropertiesClient( keys,  orderId,  updateMode,  version);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes the extended property associated with the order. 
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">Determines whether or not to check versioning of items for concurrency purposes.</param>
-		/// <param name="keys">The extended property keys.</param>
+		/// <param name="orderId"></param>
+		/// <param name="updateMode"></param>
+		/// <param name="version"></param>
+		/// <param name="keys"></param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -346,12 +191,12 @@ public virtual void DeleteExtendedProperties(List<string> keys, string orderId,
 		///   await extendedproperty.DeleteExtendedPropertiesAsync( keys,  orderId,  updateMode,  version);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteExtendedPropertiesAsync(List<string> keys, string orderId, string updateMode =  null, string version =  null)
+		public virtual async Task DeleteExtendedPropertiesAsync(List<string> keys, string orderId, string updateMode =  null, string version =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Orders.ExtendedPropertyClient.DeleteExtendedPropertiesClient( keys,  orderId,  updateMode,  version);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/Orders/FulfillmentActionResource.cs b/Mozu.Api/Resources/Commerce/Orders/FulfillmentActionResource.cs
old mode 100644
new mode 100755
index 03f56e9a..58ca9c5f
--- a/Mozu.Api/Resources/Commerce/Orders/FulfillmentActionResource.cs
+++ b/Mozu.Api/Resources/Commerce/Orders/FulfillmentActionResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Orders
 {
@@ -37,38 +38,13 @@ public FulfillmentActionResource CloneWithApiContext(Action<IApiContext> context
 		}
 
 				
-		/// <summary>
-		/// Sets the fulfillment action to "Ship" or "PickUp". To ship an order or prepare it for in-store pickup, the order must have a customer name, the "Open" or "OpenAndProcessing" status. To ship the order, it must also have the full shipping address and shipping method. Shipping all packages or picking up all pickups for an order will complete a paid order.
-		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="action">Properties of an action to perform when fulfilling an item in an order, whether through in-store pickup or direct shipping.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var fulfillmentaction = new FulfillmentAction();
-		///   var order = fulfillmentaction.PerformFulfillmentAction( action,  orderId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.Order PerformFulfillmentAction(Mozu.Api.Contracts.CommerceRuntime.Fulfillment.FulfillmentAction action, string orderId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.FulfillmentActionClient.PerformFulfillmentActionClient( action,  orderId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Sets the fulfillment action to "Ship" or "PickUp". To ship an order or prepare it for in-store pickup, the order must have a customer name, the "Open" or "OpenAndProcessing" status. To ship the order, it must also have the full shipping address and shipping method. Shipping all packages or picking up all pickups for an order will complete a paid order.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="action">Properties of an action to perform when fulfilling an item in an order, whether through in-store pickup or direct shipping.</param>
+		/// <param name="orderId">Unique identifier of the order for which to perform the fulfillment action.</param>
+		/// <param name="responseFields">Updated order with a new fulfillment status resulting from the action supplied in the request.</param>
+		/// <param name="action">The action to perform for the order fulfillment.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>
 		/// </returns>
@@ -78,48 +54,23 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.Order PerformFulfillmen
 		///   var order = await fulfillmentaction.PerformFulfillmentActionAsync( action,  orderId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> PerformFulfillmentActionAsync(Mozu.Api.Contracts.CommerceRuntime.Fulfillment.FulfillmentAction action, string orderId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> PerformFulfillmentActionAsync(Mozu.Api.Contracts.CommerceRuntime.Fulfillment.FulfillmentAction action, string orderId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.FulfillmentActionClient.PerformFulfillmentActionClient( action,  orderId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Resends an email with details about the package fulfillment to the shopper. 
-		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="action">Properties of an action to perform when fulfilling an item in an order, whether through in-store pickup or direct shipping.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var fulfillmentaction = new FulfillmentAction();
-		///   var order = fulfillmentaction.ResendPackageFulfillmentEmail( action,  orderId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.Order ResendPackageFulfillmentEmail(Mozu.Api.Contracts.CommerceRuntime.Fulfillment.FulfillmentAction action, string orderId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.FulfillmentActionClient.ResendPackageFulfillmentEmailClient( action,  orderId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Resends an email with details about the package fulfillment to the shopper. 
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="action">Properties of an action to perform when fulfilling an item in an order, whether through in-store pickup or direct shipping.</param>
+		/// <param name="orderId"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="action"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>
 		/// </returns>
@@ -129,12 +80,12 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.Order ResendPackageFulf
 		///   var order = await fulfillmentaction.ResendPackageFulfillmentEmailAsync( action,  orderId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> ResendPackageFulfillmentEmailAsync(Mozu.Api.Contracts.CommerceRuntime.Fulfillment.FulfillmentAction action, string orderId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> ResendPackageFulfillmentEmailAsync(Mozu.Api.Contracts.CommerceRuntime.Fulfillment.FulfillmentAction action, string orderId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.FulfillmentActionClient.ResendPackageFulfillmentEmailClient( action,  orderId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
diff --git a/Mozu.Api/Resources/Commerce/Orders/FulfillmentInfoResource.cs b/Mozu.Api/Resources/Commerce/Orders/FulfillmentInfoResource.cs
old mode 100644
new mode 100755
index 1a350280..c204eac5
--- a/Mozu.Api/Resources/Commerce/Orders/FulfillmentInfoResource.cs
+++ b/Mozu.Api/Resources/Commerce/Orders/FulfillmentInfoResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Orders
 {
@@ -37,38 +38,13 @@ public FulfillmentInfoResource CloneWithApiContext(Action<IApiContext> contextMo
 		}
 
 				
-		/// <summary>
-		/// Retrieves a list of the fulfillment information for the specified order.
-		/// </summary>
-		/// <param name="draft">If true, retrieve the draft version of the order, which might include uncommitted changes to the order or its components.</param>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.FulfillmentInfo"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var fulfillmentinfo = new FulfillmentInfo();
-		///   var fulfillmentInfo = fulfillmentinfo.GetFulfillmentInfo( orderId,  draft,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Fulfillment.FulfillmentInfo GetFulfillmentInfo(string orderId, bool? draft =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.FulfillmentInfo> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.FulfillmentInfoClient.GetFulfillmentInfoClient( orderId,  draft,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of the fulfillment information for the specified order.
+		/// 
 		/// </summary>
-		/// <param name="draft">If true, retrieve the draft version of the order, which might include uncommitted changes to the order or its components.</param>
+		/// <param name="draft">If true, retrieve the draft version of the order's fulfillment information, which might include uncommitted changes.</param>
 		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.FulfillmentInfo"/>
 		/// </returns>
@@ -78,52 +54,25 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Fulfillment.FulfillmentInfo Ge
 		///   var fulfillmentInfo = await fulfillmentinfo.GetFulfillmentInfoAsync( orderId,  draft,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.FulfillmentInfo> GetFulfillmentInfoAsync(string orderId, bool? draft =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.FulfillmentInfo> GetFulfillmentInfoAsync(string orderId, bool? draft =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.FulfillmentInfo> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.FulfillmentInfoClient.GetFulfillmentInfoClient( orderId,  draft,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates one or more properties of fulfillment information for the specified order.
-		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
-		/// <param name="fulfillmentInfo">Properties of the information needed to fulfill an order, whether via in-store pickup or direct shipping.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.FulfillmentInfo"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var fulfillmentinfo = new FulfillmentInfo();
-		///   var fulfillmentInfo = fulfillmentinfo.SetFulFillmentInfo( fulfillmentInfo,  orderId,  updateMode,  version,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Fulfillment.FulfillmentInfo SetFulFillmentInfo(Mozu.Api.Contracts.CommerceRuntime.Fulfillment.FulfillmentInfo fulfillmentInfo, string orderId, string updateMode =  null, string version =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.FulfillmentInfo> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.FulfillmentInfoClient.SetFulFillmentInfoClient( fulfillmentInfo,  orderId,  updateMode,  version,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates one or more properties of fulfillment information for the specified order.
+		/// 
 		/// </summary>
 		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
-		/// <param name="fulfillmentInfo">Properties of the information needed to fulfill an order, whether via in-store pickup or direct shipping.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="updateMode">Specifies whether to set the fulfillment information by updating the original order, updating the order in draft mode, or updating the order in draft mode and then committing the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
+		/// <param name="version"></param>
+		/// <param name="fulfillmentInfo">Array list of fulfillment information associated with an order.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.FulfillmentInfo"/>
 		/// </returns>
@@ -133,12 +82,12 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Fulfillment.FulfillmentInfo Se
 		///   var fulfillmentInfo = await fulfillmentinfo.SetFulFillmentInfoAsync( fulfillmentInfo,  orderId,  updateMode,  version,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.FulfillmentInfo> SetFulFillmentInfoAsync(Mozu.Api.Contracts.CommerceRuntime.Fulfillment.FulfillmentInfo fulfillmentInfo, string orderId, string updateMode =  null, string version =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.FulfillmentInfo> SetFulFillmentInfoAsync(Mozu.Api.Contracts.CommerceRuntime.Fulfillment.FulfillmentInfo fulfillmentInfo, string orderId, string updateMode =  null, string version =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.FulfillmentInfo> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.FulfillmentInfoClient.SetFulFillmentInfoClient( fulfillmentInfo,  orderId,  updateMode,  version,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
diff --git a/Mozu.Api/Resources/Commerce/Orders/OrderAttributeResource.cs b/Mozu.Api/Resources/Commerce/Orders/OrderAttributeResource.cs
old mode 100644
new mode 100755
index dc91ed2c..e6914ba1
--- a/Mozu.Api/Resources/Commerce/Orders/OrderAttributeResource.cs
+++ b/Mozu.Api/Resources/Commerce/Orders/OrderAttributeResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Orders
 {
@@ -37,34 +38,11 @@ public OrderAttributeResource CloneWithApiContext(Action<IApiContext> contextMod
 		}
 
 				
-		/// <summary>
-		/// Retrieves a list of the attributes defined for the order specified in the request.
-		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <returns>
-		/// List{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAttribute"/>}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var orderattribute = new OrderAttribute();
-		///   var orderAttribute = orderattribute.GetOrderAttributes( orderId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAttribute> GetOrderAttributes(string orderId)
-		{
-			MozuClient<List<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAttribute>> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.OrderAttributeClient.GetOrderAttributesClient( orderId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of the attributes defined for the order specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
+		/// <param name="orderId">Unique identifier of the order for which to retrieve a list of defined attributes.</param>
 		/// <returns>
 		/// List{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAttribute"/>}
 		/// </returns>
@@ -74,46 +52,22 @@ public OrderAttributeResource CloneWithApiContext(Action<IApiContext> contextMod
 		///   var orderAttribute = await orderattribute.GetOrderAttributesAsync( orderId);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAttribute>> GetOrderAttributesAsync(string orderId)
+		public virtual async Task<List<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAttribute>> GetOrderAttributesAsync(string orderId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAttribute>> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.OrderAttributeClient.GetOrderAttributesClient( orderId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Applies a list of attributes to the order specified in the request and defines a value for each attribute in the request body.
-		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="orderAttributes">Properties of an attribute applied to an order.</param>
-		/// <returns>
-		/// List{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAttribute"/>}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var orderattribute = new OrderAttribute();
-		///   var orderAttribute = orderattribute.CreateOrderAttributes( orderAttributes,  orderId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAttribute> CreateOrderAttributes(List<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAttribute> orderAttributes, string orderId)
-		{
-			MozuClient<List<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAttribute>> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.OrderAttributeClient.CreateOrderAttributesClient( orderAttributes,  orderId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Applies a list of attributes to the order specified in the request and defines a value for each attribute in the request body.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="orderAttributes">Properties of an attribute applied to an order.</param>
+		/// <param name="orderId">Unique identifier of the order for which to assign the attributes.</param>
+		/// <param name="orderAttributes">The list of attributes to associate with the order, and the properties of each attribute to define for the order.</param>
 		/// <returns>
 		/// List{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAttribute"/>}
 		/// </returns>
@@ -123,48 +77,23 @@ public OrderAttributeResource CloneWithApiContext(Action<IApiContext> contextMod
 		///   var orderAttribute = await orderattribute.CreateOrderAttributesAsync( orderAttributes,  orderId);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAttribute>> CreateOrderAttributesAsync(List<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAttribute> orderAttributes, string orderId)
+		public virtual async Task<List<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAttribute>> CreateOrderAttributesAsync(List<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAttribute> orderAttributes, string orderId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAttribute>> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.OrderAttributeClient.CreateOrderAttributesClient( orderAttributes,  orderId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates one or more properties of an attribute defined for the order specified in the request.
-		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="removeMissing">If true, the operation removes missing properties so that the updated order attributes will not show properties with a null value.</param>
-		/// <param name="orderAttributes">Properties of an attribute applied to an order.</param>
-		/// <returns>
-		/// List{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAttribute"/>}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var orderattribute = new OrderAttribute();
-		///   var orderAttribute = orderattribute.UpdateOrderAttributes( orderAttributes,  orderId,  removeMissing);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAttribute> UpdateOrderAttributes(List<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAttribute> orderAttributes, string orderId, bool? removeMissing =  null)
-		{
-			MozuClient<List<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAttribute>> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.OrderAttributeClient.UpdateOrderAttributesClient( orderAttributes,  orderId,  removeMissing);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates one or more properties of an attribute defined for the order specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
+		/// <param name="orderId">Identifier of the order for which to update attributes.</param>
 		/// <param name="removeMissing">If true, the operation removes missing properties so that the updated order attributes will not show properties with a null value.</param>
-		/// <param name="orderAttributes">Properties of an attribute applied to an order.</param>
+		/// <param name="orderAttributes">List of order attributes to update, including the properties of each defined attribute in the list.</param>
 		/// <returns>
 		/// List{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAttribute"/>}
 		/// </returns>
@@ -174,12 +103,12 @@ public OrderAttributeResource CloneWithApiContext(Action<IApiContext> contextMod
 		///   var orderAttribute = await orderattribute.UpdateOrderAttributesAsync( orderAttributes,  orderId,  removeMissing);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAttribute>> UpdateOrderAttributesAsync(List<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAttribute> orderAttributes, string orderId, bool? removeMissing =  null)
+		public virtual async Task<List<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAttribute>> UpdateOrderAttributesAsync(List<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAttribute> orderAttributes, string orderId, bool? removeMissing =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderAttribute>> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.OrderAttributeClient.UpdateOrderAttributesClient( orderAttributes,  orderId,  removeMissing);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
diff --git a/Mozu.Api/Resources/Commerce/Orders/OrderItemResource.cs b/Mozu.Api/Resources/Commerce/Orders/OrderItemResource.cs
old mode 100644
new mode 100755
index b3f33658..eacb3caa
--- a/Mozu.Api/Resources/Commerce/Orders/OrderItemResource.cs
+++ b/Mozu.Api/Resources/Commerce/Orders/OrderItemResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Orders
 {
@@ -37,40 +38,14 @@ public OrderItemResource CloneWithApiContext(Action<IApiContext> contextModifica
 		}
 
 				
-		/// <summary>
-		/// Retrieves an order item with the order line ID.
-		/// </summary>
-		/// <param name="draft">If true, retrieve the draft version of the order, which might include uncommitted changes to the order or its components.</param>
-		/// <param name="lineId">The specific line id that's associated with the order item.</param>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.OrderItem"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var orderitem = new OrderItem();
-		///   var orderItem = orderitem.GetOrderItemViaLineId( orderId,  lineId,  draft,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.OrderItem GetOrderItemViaLineId(string orderId, int lineId, bool? draft =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderItem> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.OrderItemClient.GetOrderItemViaLineIdClient( orderId,  lineId,  draft,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves an order item with the order line ID.
+		/// 
 		/// </summary>
-		/// <param name="draft">If true, retrieve the draft version of the order, which might include uncommitted changes to the order or its components.</param>
-		/// <param name="lineId">The specific line id that's associated with the order item.</param>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="draft"></param>
+		/// <param name="lineId"></param>
+		/// <param name="orderId"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.OrderItem"/>
 		/// </returns>
@@ -80,50 +55,24 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.OrderItem GetOrderItemV
 		///   var orderItem = await orderitem.GetOrderItemViaLineIdAsync( orderId,  lineId,  draft,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderItem> GetOrderItemViaLineIdAsync(string orderId, int lineId, bool? draft =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderItem> GetOrderItemViaLineIdAsync(string orderId, int lineId, bool? draft =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderItem> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.OrderItemClient.GetOrderItemViaLineIdClient( orderId,  lineId,  draft,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the details of a single order item.
-		/// </summary>
-		/// <param name="draft">If true, retrieve the draft version of the order, which might include uncommitted changes to the order or its components.</param>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="orderItemId">Unique identifier of the item to remove from the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.OrderItem"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var orderitem = new OrderItem();
-		///   var orderItem = orderitem.GetOrderItem( orderId,  orderItemId,  draft,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.OrderItem GetOrderItem(string orderId, string orderItemId, bool? draft =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderItem> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.OrderItemClient.GetOrderItemClient( orderId,  orderItemId,  draft,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of a single order item.
+		/// 
 		/// </summary>
-		/// <param name="draft">If true, retrieve the draft version of the order, which might include uncommitted changes to the order or its components.</param>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="orderItemId">Unique identifier of the item to remove from the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="draft">If true, retrieve the draft version of this order item, which might include uncommitted changes to the order item, the order, or other order components.</param>
+		/// <param name="orderId">Unique identifier of the order item to retrieve.</param>
+		/// <param name="orderItemId">Unique identifier of the order item details to retrieve.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.OrderItem"/>
 		/// </returns>
@@ -133,48 +82,23 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.OrderItem GetOrderItem(
 		///   var orderItem = await orderitem.GetOrderItemAsync( orderId,  orderItemId,  draft,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderItem> GetOrderItemAsync(string orderId, string orderItemId, bool? draft =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderItem> GetOrderItemAsync(string orderId, string orderItemId, bool? draft =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderItem> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.OrderItemClient.GetOrderItemClient( orderId,  orderItemId,  draft,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the details of all items in an order.
-		/// </summary>
-		/// <param name="draft">If true, retrieve the draft version of the order, which might include uncommitted changes to the order or its components.</param>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.OrderItemCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var orderitem = new OrderItem();
-		///   var orderItemCollection = orderitem.GetOrderItems( orderId,  draft,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.OrderItemCollection GetOrderItems(string orderId, bool? draft =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderItemCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.OrderItemClient.GetOrderItemsClient( orderId,  draft,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of all items in an order.
+		/// 
 		/// </summary>
-		/// <param name="draft">If true, retrieve the draft version of the order, which might include uncommitted changes to the order or its components.</param>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="draft">If true, retrieve the draft version of the order's items, which might include uncommitted changes to one or more order items, the order itself, or other order components.</param>
+		/// <param name="orderId">Unique identifier of the order items to retrieve.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.OrderItemCollection"/>
 		/// </returns>
@@ -184,54 +108,26 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.OrderItemCollection Get
 		///   var orderItemCollection = await orderitem.GetOrderItemsAsync( orderId,  draft,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderItemCollection> GetOrderItemsAsync(string orderId, bool? draft =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderItemCollection> GetOrderItemsAsync(string orderId, bool? draft =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderItemCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.OrderItemClient.GetOrderItemsClient( orderId,  draft,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Adds a new item to a defined order.
-		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="skipInventoryCheck">If true, skip the process to validate inventory when creating this product reservation.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
-		/// <param name="orderItem">The details associated with a specific item in an order.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var orderitem = new OrderItem();
-		///   var order = orderitem.CreateOrderItem( orderItem,  orderId,  updateMode,  version,  skipInventoryCheck,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.Order CreateOrderItem(Mozu.Api.Contracts.CommerceRuntime.Orders.OrderItem orderItem, string orderId, string updateMode =  null, string version =  null, bool? skipInventoryCheck =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.OrderItemClient.CreateOrderItemClient( orderItem,  orderId,  updateMode,  version,  skipInventoryCheck,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Adds a new item to a defined order.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="skipInventoryCheck">If true, skip the process to validate inventory when creating this product reservation.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
-		/// <param name="orderItem">The details associated with a specific item in an order.</param>
+		/// <param name="orderId">Unique identifier of the order for which to add the item.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="skipInventoryCheck">If true, do not validate the product inventory when adding this item to the order.</param>
+		/// <param name="updateMode">Specifies whether to add the item by updating the original order, updating the order in draft mode, or updating the order in draft mode and then committing the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
+		/// <param name="version"></param>
+		/// <param name="orderItem">The properties of the item to create in the existing order.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>
 		/// </returns>
@@ -241,56 +137,27 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.Order CreateOrderItem(M
 		///   var order = await orderitem.CreateOrderItemAsync( orderItem,  orderId,  updateMode,  version,  skipInventoryCheck,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> CreateOrderItemAsync(Mozu.Api.Contracts.CommerceRuntime.Orders.OrderItem orderItem, string orderId, string updateMode =  null, string version =  null, bool? skipInventoryCheck =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> CreateOrderItemAsync(Mozu.Api.Contracts.CommerceRuntime.Orders.OrderItem orderItem, string orderId, string updateMode =  null, string version =  null, bool? skipInventoryCheck =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.OrderItemClient.CreateOrderItemClient( orderItem,  orderId,  updateMode,  version,  skipInventoryCheck,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Update the discount applied to an item in an order.
-		/// </summary>
-		/// <param name="discountId">discountId parameter description DOCUMENT_HERE </param>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="orderItemId">Unique identifier of the item to remove from the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
-		/// <param name="discount">Properties of all applied discounts for an associated cart, order, or product. </param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var orderitem = new OrderItem();
-		///   var order = orderitem.UpdateOrderItemDiscount( discount,  orderId,  orderItemId,  discountId,  updateMode,  version,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.Order UpdateOrderItemDiscount(Mozu.Api.Contracts.CommerceRuntime.Discounts.AppliedDiscount discount, string orderId, string orderItemId, int discountId, string updateMode =  null, string version =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.OrderItemClient.UpdateOrderItemDiscountClient( discount,  orderId,  orderItemId,  discountId,  updateMode,  version,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Update the discount applied to an item in an order.
+		/// 
 		/// </summary>
-		/// <param name="discountId">discountId parameter description DOCUMENT_HERE </param>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="orderItemId">Unique identifier of the item to remove from the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
-		/// <param name="discount">Properties of all applied discounts for an associated cart, order, or product. </param>
+		/// <param name="discountId">Unique identifier of the discount. System-supplied and read only.</param>
+		/// <param name="orderId">Unique identifier of the order associated with the item discount.</param>
+		/// <param name="orderItemId">Unique identifier of the item in the order.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="updateMode">Specifies whether to change the item discount by updating the original order, updating the order in draft mode, or updating the order in draft mode and then committing the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
+		/// <param name="version"></param>
+		/// <param name="discount">Properties of the discount to modify for the order item.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>
 		/// </returns>
@@ -300,54 +167,26 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.Order UpdateOrderItemDi
 		///   var order = await orderitem.UpdateOrderItemDiscountAsync( discount,  orderId,  orderItemId,  discountId,  updateMode,  version,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> UpdateOrderItemDiscountAsync(Mozu.Api.Contracts.CommerceRuntime.Discounts.AppliedDiscount discount, string orderId, string orderItemId, int discountId, string updateMode =  null, string version =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> UpdateOrderItemDiscountAsync(Mozu.Api.Contracts.CommerceRuntime.Discounts.AppliedDiscount discount, string orderId, string orderItemId, int discountId, string updateMode =  null, string version =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.OrderItemClient.UpdateOrderItemDiscountClient( discount,  orderId,  orderItemId,  discountId,  updateMode,  version,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Update the duty fee information for an order item.
-		/// </summary>
-		/// <param name="dutyAmount">The amount added to the order item for duty fees.        </param>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="orderItemId">Unique identifier of the item to remove from the order.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">Determines whether or not to check versioning of items for concurrency purposes.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var orderitem = new OrderItem();
-		///   var order = orderitem.UpdateItemDuty( orderId,  orderItemId,  dutyAmount,  updateMode,  version,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.Order UpdateItemDuty(string orderId, string orderItemId, decimal dutyAmount, string updateMode =  null, string version =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.OrderItemClient.UpdateItemDutyClient( orderId,  orderItemId,  dutyAmount,  updateMode,  version,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Update the duty fee information for an order item.
+		/// 
 		/// </summary>
-		/// <param name="dutyAmount">The amount added to the order item for duty fees.        </param>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="orderItemId">Unique identifier of the item to remove from the order.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">Determines whether or not to check versioning of items for concurrency purposes.</param>
+		/// <param name="dutyAmount"></param>
+		/// <param name="orderId"></param>
+		/// <param name="orderItemId"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="updateMode"></param>
+		/// <param name="version"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>
 		/// </returns>
@@ -357,54 +196,26 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.Order UpdateItemDuty(st
 		///   var order = await orderitem.UpdateItemDutyAsync( orderId,  orderItemId,  dutyAmount,  updateMode,  version,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> UpdateItemDutyAsync(string orderId, string orderItemId, decimal dutyAmount, string updateMode =  null, string version =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> UpdateItemDutyAsync(string orderId, string orderItemId, decimal dutyAmount, string updateMode =  null, string version =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.OrderItemClient.UpdateItemDutyClient( orderId,  orderItemId,  dutyAmount,  updateMode,  version,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates the item fulfillment information for the order specified in the request.
-		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="orderItemId">Unique identifier of the item to remove from the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
-		/// <param name="orderItem">The details associated with a specific item in an order.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var orderitem = new OrderItem();
-		///   var order = orderitem.UpdateItemFulfillment( orderItem,  orderId,  orderItemId,  updateMode,  version,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.Order UpdateItemFulfillment(Mozu.Api.Contracts.CommerceRuntime.Orders.OrderItem orderItem, string orderId, string orderItemId, string updateMode =  null, string version =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.OrderItemClient.UpdateItemFulfillmentClient( orderItem,  orderId,  orderItemId,  updateMode,  version,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates the item fulfillment information for the order specified in the request.
+		/// 
 		/// </summary>
 		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="orderItemId">Unique identifier of the item to remove from the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
-		/// <param name="orderItem">The details associated with a specific item in an order.</param>
+		/// <param name="orderItemId">Unique identifier of the item in the order.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="updateMode">Specifies whether to apply the coupon by updating the original order, updating the order in draft mode, or updating the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
+		/// <param name="version"></param>
+		/// <param name="orderItem">Properties of the order item to update for fulfillment.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>
 		/// </returns>
@@ -414,54 +225,26 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.Order UpdateItemFulfill
 		///   var order = await orderitem.UpdateItemFulfillmentAsync( orderItem,  orderId,  orderItemId,  updateMode,  version,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> UpdateItemFulfillmentAsync(Mozu.Api.Contracts.CommerceRuntime.Orders.OrderItem orderItem, string orderId, string orderItemId, string updateMode =  null, string version =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> UpdateItemFulfillmentAsync(Mozu.Api.Contracts.CommerceRuntime.Orders.OrderItem orderItem, string orderId, string orderItemId, string updateMode =  null, string version =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.OrderItemClient.UpdateItemFulfillmentClient( orderItem,  orderId,  orderItemId,  updateMode,  version,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Override the price of an individual product on a line item in the specified order.
-		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="orderItemId">Unique identifier of the item to remove from the order.</param>
-		/// <param name="price">The override price to specify for this item in the specified order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var orderitem = new OrderItem();
-		///   var order = orderitem.UpdateItemProductPrice( orderId,  orderItemId,  price,  updateMode,  version,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.Order UpdateItemProductPrice(string orderId, string orderItemId, decimal price, string updateMode =  null, string version =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.OrderItemClient.UpdateItemProductPriceClient( orderId,  orderItemId,  price,  updateMode,  version,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Override the price of an individual product on a line item in the specified order.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="orderItemId">Unique identifier of the item to remove from the order.</param>
+		/// <param name="orderId">Unique identifier of the order containing the item to price override.</param>
+		/// <param name="orderItemId">Unique identifier of the item in the order to price override.</param>
 		/// <param name="price">The override price to specify for this item in the specified order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="updateMode">Specifies whether to change the product price by updating the original order, updating the order in draft mode, or updating the order in draft mode and then committing the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
+		/// <param name="version"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>
 		/// </returns>
@@ -471,54 +254,26 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.Order UpdateItemProduct
 		///   var order = await orderitem.UpdateItemProductPriceAsync( orderId,  orderItemId,  price,  updateMode,  version,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> UpdateItemProductPriceAsync(string orderId, string orderItemId, decimal price, string updateMode =  null, string version =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> UpdateItemProductPriceAsync(string orderId, string orderItemId, decimal price, string updateMode =  null, string version =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.OrderItemClient.UpdateItemProductPriceClient( orderId,  orderItemId,  price,  updateMode,  version,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Update the quantity of an item in an order.
-		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="orderItemId">Unique identifier of the item to remove from the order.</param>
-		/// <param name="quantity">The number of cart items in the shopper's active cart.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var orderitem = new OrderItem();
-		///   var order = orderitem.UpdateItemQuantity( orderId,  orderItemId,  quantity,  updateMode,  version,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.Order UpdateItemQuantity(string orderId, string orderItemId, int quantity, string updateMode =  null, string version =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.OrderItemClient.UpdateItemQuantityClient( orderId,  orderItemId,  quantity,  updateMode,  version,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Update the quantity of an item in an order.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="orderItemId">Unique identifier of the item to remove from the order.</param>
-		/// <param name="quantity">The number of cart items in the shopper's active cart.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
+		/// <param name="orderId">Unique identifier of the order containing the item to update quantity.</param>
+		/// <param name="orderItemId">Unique identifier of the item in the order to update quantity.</param>
+		/// <param name="quantity">The quantity of the item in the order to update.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="updateMode">Specifies whether to change the item quantity by updating the original order, updating the order in draft mode, or updating the order in draft mode and then committing the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
+		/// <param name="version"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>
 		/// </returns>
@@ -528,50 +283,24 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.Order UpdateItemQuantit
 		///   var order = await orderitem.UpdateItemQuantityAsync( orderId,  orderItemId,  quantity,  updateMode,  version,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> UpdateItemQuantityAsync(string orderId, string orderItemId, int quantity, string updateMode =  null, string version =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> UpdateItemQuantityAsync(string orderId, string orderItemId, int quantity, string updateMode =  null, string version =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.OrderItemClient.UpdateItemQuantityClient( orderId,  orderItemId,  quantity,  updateMode,  version,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Removes a previously added item from a defined order.
-		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="orderItemId">Unique identifier of the item to remove from the order.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var orderitem = new OrderItem();
-		///   var order = orderitem.DeleteOrderItem( orderId,  orderItemId,  updateMode,  version);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.Order DeleteOrderItem(string orderId, string orderItemId, string updateMode =  null, string version =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.OrderItemClient.DeleteOrderItemClient( orderId,  orderItemId,  updateMode,  version);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Removes a previously added item from a defined order.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
+		/// <param name="orderId">Unique identifier of the order with the item to remove.</param>
 		/// <param name="orderItemId">Unique identifier of the item to remove from the order.</param>
-		/// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-		/// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
+		/// <param name="updateMode">Specifies whether to remove the item by updating the original order, updating the order in draft mode, or updating the order in draft mode and then committing the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
+		/// <param name="version"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>
 		/// </returns>
@@ -581,12 +310,12 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.Order DeleteOrderItem(s
 		///   var order = await orderitem.DeleteOrderItemAsync( orderId,  orderItemId,  updateMode,  version);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> DeleteOrderItemAsync(string orderId, string orderItemId, string updateMode =  null, string version =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> DeleteOrderItemAsync(string orderId, string orderItemId, string updateMode =  null, string version =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.OrderItemClient.DeleteOrderItemClient( orderId,  orderItemId,  updateMode,  version);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
diff --git a/Mozu.Api/Resources/Commerce/Orders/OrderNoteResource.cs b/Mozu.Api/Resources/Commerce/Orders/OrderNoteResource.cs
old mode 100644
new mode 100755
index 38cf1634..9a71b368
--- a/Mozu.Api/Resources/Commerce/Orders/OrderNoteResource.cs
+++ b/Mozu.Api/Resources/Commerce/Orders/OrderNoteResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Orders
 {
@@ -37,32 +38,9 @@ public OrderNoteResource CloneWithApiContext(Action<IApiContext> contextModifica
 		}
 
 				
-		/// <summary>
-		/// Retrieves a list of all notes for an order.
-		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <returns>
-		/// List{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote"/>}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var ordernote = new OrderNote();
-		///   var orderNote = ordernote.GetOrderNotes( orderId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote> GetOrderNotes(string orderId)
-		{
-			MozuClient<List<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote>> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.OrderNoteClient.GetOrderNotesClient( orderId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of all notes for an order.
+		/// 
 		/// </summary>
 		/// <param name="orderId">Unique identifier of the order.</param>
 		/// <returns>
@@ -74,48 +52,23 @@ public OrderNoteResource CloneWithApiContext(Action<IApiContext> contextModifica
 		///   var orderNote = await ordernote.GetOrderNotesAsync( orderId);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote>> GetOrderNotesAsync(string orderId)
+		public virtual async Task<List<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote>> GetOrderNotesAsync(string orderId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote>> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.OrderNoteClient.GetOrderNotesClient( orderId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the details of a specific order note.
-		/// </summary>
-		/// <param name="noteId">Unique identifier of a particular note to retrieve.</param>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var ordernote = new OrderNote();
-		///   var orderNote = ordernote.GetOrderNote( orderId,  noteId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote GetOrderNote(string orderId, string noteId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.OrderNoteClient.GetOrderNoteClient( orderId,  noteId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of a specific order note.
+		/// 
 		/// </summary>
-		/// <param name="noteId">Unique identifier of a particular note to retrieve.</param>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="noteId">Unique identifier of the order note to retrieve.</param>
+		/// <param name="orderId">Unique identifier of the order associated with the note.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote"/>
 		/// </returns>
@@ -125,48 +78,23 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote GetOrderNote(
 		///   var orderNote = await ordernote.GetOrderNoteAsync( orderId,  noteId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote> GetOrderNoteAsync(string orderId, string noteId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote> GetOrderNoteAsync(string orderId, string noteId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.OrderNoteClient.GetOrderNoteClient( orderId,  noteId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Creates a new merchant note for the specified order.
-		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="orderNote">Properties of an order note for a merchant, which is internal only for administrative purposes and not available to the shopper.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var ordernote = new OrderNote();
-		///   var orderNote = ordernote.CreateOrderNote( orderNote,  orderId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote CreateOrderNote(Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote orderNote, string orderId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.OrderNoteClient.CreateOrderNoteClient( orderNote,  orderId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Creates a new merchant note for the specified order.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="orderNote">Properties of an order note for a merchant, which is internal only for administrative purposes and not available to the shopper.</param>
+		/// <param name="orderId">Unique identifier of the order for which to add a note.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="orderNote">The alphanumeric text contained in the note. The maximum length is 256 characters.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote"/>
 		/// </returns>
@@ -176,50 +104,24 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote CreateOrderNo
 		///   var orderNote = await ordernote.CreateOrderNoteAsync( orderNote,  orderId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote> CreateOrderNoteAsync(Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote orderNote, string orderId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote> CreateOrderNoteAsync(Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote orderNote, string orderId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.OrderNoteClient.CreateOrderNoteClient( orderNote,  orderId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates a specific note for an order.
-		/// </summary>
-		/// <param name="noteId">Unique identifier of a particular note to retrieve.</param>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="orderNote">Properties of an order note for a merchant, which is internal only for administrative purposes and not available to the shopper.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var ordernote = new OrderNote();
-		///   var orderNote = ordernote.UpdateOrderNote( orderNote,  orderId,  noteId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote UpdateOrderNote(Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote orderNote, string orderId, string noteId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.OrderNoteClient.UpdateOrderNoteClient( orderNote,  orderId,  noteId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates a specific note for an order.
+		/// 
 		/// </summary>
-		/// <param name="noteId">Unique identifier of a particular note to retrieve.</param>
+		/// <param name="noteId">Unique identifier of the order note.</param>
 		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="orderNote">Properties of an order note for a merchant, which is internal only for administrative purposes and not available to the shopper.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="orderNote">The content of the order note. The maximum length is 256 characters.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote"/>
 		/// </returns>
@@ -229,45 +131,22 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote UpdateOrderNo
 		///   var orderNote = await ordernote.UpdateOrderNoteAsync( orderNote,  orderId,  noteId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote> UpdateOrderNoteAsync(Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote orderNote, string orderId, string noteId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote> UpdateOrderNoteAsync(Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote orderNote, string orderId, string noteId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.OrderNoteClient.UpdateOrderNoteClient( orderNote,  orderId,  noteId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Deletes the specified order note.
-		/// </summary>
-		/// <param name="noteId">Unique identifier of a particular note to retrieve.</param>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var ordernote = new OrderNote();
-		///   ordernote.DeleteOrderNote( orderId,  noteId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteOrderNote(string orderId, string noteId)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Orders.OrderNoteClient.DeleteOrderNoteClient( orderId,  noteId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes the specified order note.
+		/// 
 		/// </summary>
-		/// <param name="noteId">Unique identifier of a particular note to retrieve.</param>
-		/// <param name="orderId">Unique identifier of the order.</param>
+		/// <param name="noteId">Unique identifier of the order note to delete.</param>
+		/// <param name="orderId">Unique identifier of the order associated with the note.</param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -277,12 +156,12 @@ public virtual void DeleteOrderNote(string orderId, string noteId)
 		///   await ordernote.DeleteOrderNoteAsync( orderId,  noteId);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteOrderNoteAsync(string orderId, string noteId)
+		public virtual async Task DeleteOrderNoteAsync(string orderId, string noteId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Orders.OrderNoteClient.DeleteOrderNoteClient( orderId,  noteId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/Orders/OrderReturnableItemResource.cs b/Mozu.Api/Resources/Commerce/Orders/OrderReturnableItemResource.cs
old mode 100644
new mode 100755
index 86b547d3..a0a96c75
--- a/Mozu.Api/Resources/Commerce/Orders/OrderReturnableItemResource.cs
+++ b/Mozu.Api/Resources/Commerce/Orders/OrderReturnableItemResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Orders
 {
 	/// <summary>
-	/// Use this subresource to view which order items are eligible for return.
+	/// 
 	/// </summary>
 	public partial class OrderReturnableItemResource  	{
 		///
@@ -37,42 +38,12 @@ public OrderReturnableItemResource CloneWithApiContext(Action<IApiContext> conte
 		}
 
 				
-		/// <summary>
-		/// Retrieves information about which items are eligible for return on an order.Each item displays the following information:
-
-
-
-		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.OrderReturnableItemCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var orderreturnableitem = new OrderReturnableItem();
-		///   var orderReturnableItemCollection = orderreturnableitem.GetOrderReturnableItems( orderId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.OrderReturnableItemCollection GetOrderReturnableItems(string orderId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderReturnableItemCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.OrderReturnableItemClient.GetOrderReturnableItemsClient( orderId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves information about which items are eligible for return on an order.Each item displays the following information:
-
-
-
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="orderId"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.OrderReturnableItemCollection"/>
 		/// </returns>
@@ -82,12 +53,12 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.OrderReturnableItemColl
 		///   var orderReturnableItemCollection = await orderreturnableitem.GetOrderReturnableItemsAsync( orderId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderReturnableItemCollection> GetOrderReturnableItemsAsync(string orderId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderReturnableItemCollection> GetOrderReturnableItemsAsync(string orderId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderReturnableItemCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.OrderReturnableItemClient.GetOrderReturnableItemsClient( orderId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
diff --git a/Mozu.Api/Resources/Commerce/Orders/OrderValidationResultResource.cs b/Mozu.Api/Resources/Commerce/Orders/OrderValidationResultResource.cs
old mode 100644
new mode 100755
index 71263c3b..62af2ae5
--- a/Mozu.Api/Resources/Commerce/Orders/OrderValidationResultResource.cs
+++ b/Mozu.Api/Resources/Commerce/Orders/OrderValidationResultResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Orders
 {
@@ -37,32 +38,9 @@ public OrderValidationResultResource CloneWithApiContext(Action<IApiContext> con
 		}
 
 				
-		/// <summary>
-		/// Retrieves a list of the validation results associated with the order.
-		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <returns>
-		/// List{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.OrderValidationResult"/>}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var ordervalidationresult = new OrderValidationResult();
-		///   var orderValidationResult = ordervalidationresult.GetValidationResults( orderId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderValidationResult> GetValidationResults(string orderId)
-		{
-			MozuClient<List<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderValidationResult>> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.OrderValidationResultClient.GetValidationResultsClient( orderId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of the validation results associated with the order.
+		/// 
 		/// </summary>
 		/// <param name="orderId">Unique identifier of the order.</param>
 		/// <returns>
@@ -74,48 +52,23 @@ public OrderValidationResultResource CloneWithApiContext(Action<IApiContext> con
 		///   var orderValidationResult = await ordervalidationresult.GetValidationResultsAsync( orderId);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderValidationResult>> GetValidationResultsAsync(string orderId)
+		public virtual async Task<List<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderValidationResult>> GetValidationResultsAsync(string orderId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderValidationResult>> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.OrderValidationResultClient.GetValidationResultsClient( orderId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Add a new order validation result to a submitted order.
-		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="validationResult">Properties of the resulting order validation performed by an order validation capability.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.OrderValidationResult"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var ordervalidationresult = new OrderValidationResult();
-		///   var orderValidationResult = ordervalidationresult.AddValidationResult( validationResult,  orderId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.OrderValidationResult AddValidationResult(Mozu.Api.Contracts.CommerceRuntime.Orders.OrderValidationResult validationResult, string orderId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderValidationResult> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.OrderValidationResultClient.AddValidationResultClient( validationResult,  orderId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Add a new order validation result to a submitted order.
+		/// 
 		/// </summary>
 		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="validationResult">Properties of the resulting order validation performed by an order validation capability.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="validationResult">Properties of the validation result to add for the order.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.OrderValidationResult"/>
 		/// </returns>
@@ -125,12 +78,12 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.OrderValidationResult A
 		///   var orderValidationResult = await ordervalidationresult.AddValidationResultAsync( validationResult,  orderId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderValidationResult> AddValidationResultAsync(Mozu.Api.Contracts.CommerceRuntime.Orders.OrderValidationResult validationResult, string orderId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderValidationResult> AddValidationResultAsync(Mozu.Api.Contracts.CommerceRuntime.Orders.OrderValidationResult validationResult, string orderId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderValidationResult> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.OrderValidationResultClient.AddValidationResultClient( validationResult,  orderId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
diff --git a/Mozu.Api/Resources/Commerce/Orders/PackageResource.cs b/Mozu.Api/Resources/Commerce/Orders/PackageResource.cs
old mode 100644
new mode 100755
index 935b7bb6..cadc1fee
--- a/Mozu.Api/Resources/Commerce/Orders/PackageResource.cs
+++ b/Mozu.Api/Resources/Commerce/Orders/PackageResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Orders
 {
@@ -37,36 +38,12 @@ public PackageResource CloneWithApiContext(Action<IApiContext> contextModificati
 		}
 
 				
-		/// <summary>
-		/// Retrieves a list of the actions available to perform for a package associated with order fulfillment.
-		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="packageId">Unique identifier of the package for which to retrieve the label.</param>
-		/// <returns>
-		/// List{string}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var package = new Package();
-		///   var string = package.GetAvailablePackageFulfillmentActions( orderId,  packageId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<string> GetAvailablePackageFulfillmentActions(string orderId, string packageId)
-		{
-			MozuClient<List<string>> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.PackageClient.GetAvailablePackageFulfillmentActionsClient( orderId,  packageId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of the actions available to perform for a package associated with order fulfillment.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="packageId">Unique identifier of the package for which to retrieve the label.</param>
+		/// <param name="orderId">Unique identifier of the order associated with the package fulfillment.</param>
+		/// <param name="packageId">Unique identifier of the package associated with the fulfillment actions to retrieve.</param>
 		/// <returns>
 		/// List{string}
 		/// </returns>
@@ -76,45 +53,21 @@ public virtual List<string> GetAvailablePackageFulfillmentActions(string orderId
 		///   var string = await package.GetAvailablePackageFulfillmentActionsAsync( orderId,  packageId);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<string>> GetAvailablePackageFulfillmentActionsAsync(string orderId, string packageId)
+		public virtual async Task<List<string>> GetAvailablePackageFulfillmentActionsAsync(string orderId, string packageId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<string>> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.PackageClient.GetAvailablePackageFulfillmentActionsClient( orderId,  packageId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the package label image supplied by the carrier.
-		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="packageId">Unique identifier of the package for which to retrieve the label.</param>
-		/// <returns>
-		/// <see cref="System.IO.Stream"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var package = new Package();
-		///   var stream = package.GetPackageLabel( orderId,  packageId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual System.IO.Stream GetPackageLabel(string orderId, string packageId)
-		{
-			MozuClient<System.IO.Stream> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.PackageClient.GetPackageLabelClient( orderId,  packageId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the package label image supplied by the carrier.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
+		/// <param name="orderId">Unique identifier of the order associated with the package label to retrieve.</param>
 		/// <param name="packageId">Unique identifier of the package for which to retrieve the label.</param>
 		/// <returns>
 		/// <see cref="System.IO.Stream"/>
@@ -125,48 +78,23 @@ public virtual System.IO.Stream GetPackageLabel(string orderId, string packageId
 		///   var stream = await package.GetPackageLabelAsync( orderId,  packageId);
 		/// </code>
 		/// </example>
-		public virtual async Task<System.IO.Stream> GetPackageLabelAsync(string orderId, string packageId)
+		public virtual async Task<System.IO.Stream> GetPackageLabelAsync(string orderId, string packageId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<System.IO.Stream> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.PackageClient.GetPackageLabelClient( orderId,  packageId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the details of a package of order items.
-		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="packageId">Unique identifier of the package for which to retrieve the label.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var package = new Package();
-		///   var package = package.GetPackage( orderId,  packageId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package GetPackage(string orderId, string packageId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.PackageClient.GetPackageClient( orderId,  packageId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of a package of order items.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="packageId">Unique identifier of the package for which to retrieve the label.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="orderId">Unique identifier of the order associated with the package to retrieve.</param>
+		/// <param name="packageId">Unique identifier of the package to retrieve.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package"/>
 		/// </returns>
@@ -176,48 +104,23 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package GetPackage
 		///   var package = await package.GetPackageAsync( orderId,  packageId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package> GetPackageAsync(string orderId, string packageId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package> GetPackageAsync(string orderId, string packageId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.PackageClient.GetPackageClient( orderId,  packageId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Creates a new physical package of order items.
-		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="package">Properties of a physical package shipped for an order.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var package = new Package();
-		///   var package = package.CreatePackage( pkg,  orderId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package CreatePackage(Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package pkg, string orderId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.PackageClient.CreatePackageClient( pkg,  orderId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Creates a new physical package of order items.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="package">Properties of a physical package shipped for an order.</param>
+		/// <param name="orderId">Unique identifier of the order associated with this package.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="package">Properties of the physical package of order items.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package"/>
 		/// </returns>
@@ -227,50 +130,24 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package CreatePack
 		///   var package = await package.CreatePackageAsync( pkg,  orderId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package> CreatePackageAsync(Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package pkg, string orderId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package> CreatePackageAsync(Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package pkg, string orderId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.PackageClient.CreatePackageClient( pkg,  orderId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates one or more properties of a physical package of order items.
-		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="packageId">Unique identifier of the package for which to retrieve the label.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="package">Properties of a physical package shipped for an order.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var package = new Package();
-		///   var package = package.UpdatePackage( pkg,  orderId,  packageId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package UpdatePackage(Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package pkg, string orderId, string packageId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.PackageClient.UpdatePackageClient( pkg,  orderId,  packageId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates one or more properties of a physical package of order items.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="packageId">Unique identifier of the package for which to retrieve the label.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="package">Properties of a physical package shipped for an order.</param>
+		/// <param name="orderId">Unique identifier of the order associated with the package to update.</param>
+		/// <param name="packageId">Unique identifier of the package of order items to update.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="package">Wrapper of properties for the package of order items to update.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package"/>
 		/// </returns>
@@ -280,45 +157,22 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package UpdatePack
 		///   var package = await package.UpdatePackageAsync( pkg,  orderId,  packageId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package> UpdatePackageAsync(Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package pkg, string orderId, string packageId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package> UpdatePackageAsync(Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package pkg, string orderId, string packageId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.PackageClient.UpdatePackageClient( pkg,  orderId,  packageId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Removes a physical package of items from the specified order.
-		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="packageId">Unique identifier of the package for which to retrieve the label.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var package = new Package();
-		///   package.DeletePackage( orderId,  packageId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeletePackage(string orderId, string packageId)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Orders.PackageClient.DeletePackageClient( orderId,  packageId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Removes a physical package of items from the specified order.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="packageId">Unique identifier of the package for which to retrieve the label.</param>
+		/// <param name="orderId">Unique identifier of the order associated with the package to delete.</param>
+		/// <param name="packageId">Unique identifier of the package to delete.</param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -328,12 +182,12 @@ public virtual void DeletePackage(string orderId, string packageId)
 		///   await package.DeletePackageAsync( orderId,  packageId);
 		/// </code>
 		/// </example>
-		public virtual async Task DeletePackageAsync(string orderId, string packageId)
+		public virtual async Task DeletePackageAsync(string orderId, string packageId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Orders.PackageClient.DeletePackageClient( orderId,  packageId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/Orders/PaymentResource.cs b/Mozu.Api/Resources/Commerce/Orders/PaymentResource.cs
old mode 100644
new mode 100755
index a3cc0dc2..488dff72
--- a/Mozu.Api/Resources/Commerce/Orders/PaymentResource.cs
+++ b/Mozu.Api/Resources/Commerce/Orders/PaymentResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Orders
 {
@@ -37,36 +38,12 @@ public PaymentResource CloneWithApiContext(Action<IApiContext> contextModificati
 		}
 
 				
-		/// <summary>
-		/// Retrieves information about all payment transactions submitted for the specified order.
-		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Payments.PaymentCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var payment = new Payment();
-		///   var paymentCollection = payment.GetPayments( orderId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Payments.PaymentCollection GetPayments(string orderId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Payments.PaymentCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.PaymentClient.GetPaymentsClient( orderId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves information about all payment transactions submitted for the specified order.
+		/// 
 		/// </summary>
 		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Payments.PaymentCollection"/>
 		/// </returns>
@@ -76,46 +53,22 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Payments.PaymentCollection Get
 		///   var paymentCollection = await payment.GetPaymentsAsync( orderId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Payments.PaymentCollection> GetPaymentsAsync(string orderId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Payments.PaymentCollection> GetPaymentsAsync(string orderId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Payments.PaymentCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.PaymentClient.GetPaymentsClient( orderId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the list of all available payment actions dependent on the order payment status by specifying the order ID.
-		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="paymentId">Unique identifier of the payment for which to perform the action.</param>
-		/// <returns>
-		/// List{string}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var payment = new Payment();
-		///   var string = payment.GetAvailablePaymentActions( orderId,  paymentId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<string> GetAvailablePaymentActions(string orderId, string paymentId)
-		{
-			MozuClient<List<string>> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.PaymentClient.GetAvailablePaymentActionsClient( orderId,  paymentId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the list of all available payment actions dependent on the order payment status by specifying the order ID.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="paymentId">Unique identifier of the payment for which to perform the action.</param>
+		/// <param name="orderId">Unique identifier of the order associated with the payment.</param>
+		/// <param name="paymentId">Unique identifer of the payment for which to retrieve available actions.</param>
 		/// <returns>
 		/// List{string}
 		/// </returns>
@@ -125,48 +78,23 @@ public virtual List<string> GetAvailablePaymentActions(string orderId, string pa
 		///   var string = await payment.GetAvailablePaymentActionsAsync( orderId,  paymentId);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<string>> GetAvailablePaymentActionsAsync(string orderId, string paymentId)
+		public virtual async Task<List<string>> GetAvailablePaymentActionsAsync(string orderId, string paymentId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<string>> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.PaymentClient.GetAvailablePaymentActionsClient( orderId,  paymentId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves information about a specific payment transaction submitted for the specified order.
-		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="paymentId">Unique identifier of the payment for which to perform the action.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Payments.Payment"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var payment = new Payment();
-		///   var payment = payment.GetPayment( orderId,  paymentId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Payments.Payment GetPayment(string orderId, string paymentId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Payments.Payment> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.PaymentClient.GetPaymentClient( orderId,  paymentId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves information about a specific payment transaction submitted for the specified order.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="paymentId">Unique identifier of the payment for which to perform the action.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="orderId">Unique identifier of the order associated with the payment transaction.</param>
+		/// <param name="paymentId">Unique identifier of the payment transaction submitted for the order.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Payments.Payment"/>
 		/// </returns>
@@ -176,50 +104,24 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Payments.Payment GetPayment(st
 		///   var payment = await payment.GetPaymentAsync( orderId,  paymentId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Payments.Payment> GetPaymentAsync(string orderId, string paymentId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Payments.Payment> GetPaymentAsync(string orderId, string paymentId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Payments.Payment> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.PaymentClient.GetPaymentClient( orderId,  paymentId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Performs the specified action for an individual order payment transaction.
-		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="paymentId">Unique identifier of the payment for which to perform the action.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="action">Properties of the payment action performed for an order.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var payment = new Payment();
-		///   var order = payment.PerformPaymentAction( action,  orderId,  paymentId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.Order PerformPaymentAction(Mozu.Api.Contracts.CommerceRuntime.Payments.PaymentAction action, string orderId, string paymentId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.PaymentClient.PerformPaymentActionClient( action,  orderId,  paymentId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Performs the specified action for an individual order payment transaction.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="paymentId">Unique identifier of the payment for which to perform the action.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="action">Properties of the payment action performed for an order.</param>
+		/// <param name="orderId">Unique identifier of the order associated with the payment.</param>
+		/// <param name="paymentId">Unique identifer of the payment for which to perform the action.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="action">The action to perform for the payment. Possible values are AuthAndCapture, AuthorizePayment, CapturePayment, VoidPayment, CreditPayment, RequestCheck, ApplyCheck, DeclineCheck.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>
 		/// </returns>
@@ -229,48 +131,23 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.Order PerformPaymentAct
 		///   var order = await payment.PerformPaymentActionAsync( action,  orderId,  paymentId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> PerformPaymentActionAsync(Mozu.Api.Contracts.CommerceRuntime.Payments.PaymentAction action, string orderId, string paymentId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> PerformPaymentActionAsync(Mozu.Api.Contracts.CommerceRuntime.Payments.PaymentAction action, string orderId, string paymentId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.PaymentClient.PerformPaymentActionClient( action,  orderId,  paymentId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Creates a new payment transaction for the specified order and performs the specified action.
-		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="action">Properties of the payment action performed for an order.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var payment = new Payment();
-		///   var order = payment.CreatePaymentAction( action,  orderId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.Order CreatePaymentAction(Mozu.Api.Contracts.CommerceRuntime.Payments.PaymentAction action, string orderId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.PaymentClient.CreatePaymentActionClient( action,  orderId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Creates a new payment transaction for the specified order and performs the specified action.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="action">Properties of the payment action performed for an order.</param>
+		/// <param name="orderId">Unique identifier of the order for which to apply the payment.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="action">To action to perform for the newly created payment. Possible values are AuthAndCapture, AuthorizePayment, CapturePayment, VoidPayment, CreditPayment, RequestCheck, ApplyCheck, DeclineCheck.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>
 		/// </returns>
@@ -280,12 +157,12 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.Order CreatePaymentActi
 		///   var order = await payment.CreatePaymentActionAsync( action,  orderId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> CreatePaymentActionAsync(Mozu.Api.Contracts.CommerceRuntime.Payments.PaymentAction action, string orderId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> CreatePaymentActionAsync(Mozu.Api.Contracts.CommerceRuntime.Payments.PaymentAction action, string orderId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.PaymentClient.CreatePaymentActionClient( action,  orderId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
diff --git a/Mozu.Api/Resources/Commerce/Orders/PickupResource.cs b/Mozu.Api/Resources/Commerce/Orders/PickupResource.cs
old mode 100644
new mode 100755
index f1d1fdf7..3c46ef60
--- a/Mozu.Api/Resources/Commerce/Orders/PickupResource.cs
+++ b/Mozu.Api/Resources/Commerce/Orders/PickupResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Orders
 {
@@ -37,36 +38,12 @@ public PickupResource CloneWithApiContext(Action<IApiContext> contextModificatio
 		}
 
 				
-		/// <summary>
-		/// Retrieves a list of the actions available to perform for the pickup specified in the request.
-		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="pickupId">Unique identifier of the pickup to remove.</param>
-		/// <returns>
-		/// List{string}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var pickup = new Pickup();
-		///   var string = pickup.GetAvailablePickupFulfillmentActions( orderId,  pickupId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<string> GetAvailablePickupFulfillmentActions(string orderId, string pickupId)
-		{
-			MozuClient<List<string>> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.PickupClient.GetAvailablePickupFulfillmentActionsClient( orderId,  pickupId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of the actions available to perform for the pickup specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="pickupId">Unique identifier of the pickup to remove.</param>
+		/// <param name="orderId">Unique identifier of the order associated with the pickup.</param>
+		/// <param name="pickupId">Unique identifier of the pickup for which to retrieve available actions.</param>
 		/// <returns>
 		/// List{string}
 		/// </returns>
@@ -76,48 +53,23 @@ public virtual List<string> GetAvailablePickupFulfillmentActions(string orderId,
 		///   var string = await pickup.GetAvailablePickupFulfillmentActionsAsync( orderId,  pickupId);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<string>> GetAvailablePickupFulfillmentActionsAsync(string orderId, string pickupId)
+		public virtual async Task<List<string>> GetAvailablePickupFulfillmentActionsAsync(string orderId, string pickupId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<string>> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.PickupClient.GetAvailablePickupFulfillmentActionsClient( orderId,  pickupId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the details of the in-store pickup specified in the request.
-		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="pickupId">Unique identifier of the pickup to remove.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Pickup"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var pickup = new Pickup();
-		///   var pickup = pickup.GetPickup( orderId,  pickupId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Pickup GetPickup(string orderId, string pickupId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Pickup> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.PickupClient.GetPickupClient( orderId,  pickupId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of the in-store pickup specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="pickupId">Unique identifier of the pickup to remove.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="orderId">Unique identifier of the order associated with the pickup.</param>
+		/// <param name="pickupId">Unique identifier of the pickup to retrieve.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Pickup"/>
 		/// </returns>
@@ -127,48 +79,23 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Pickup GetPickup(s
 		///   var pickup = await pickup.GetPickupAsync( orderId,  pickupId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Pickup> GetPickupAsync(string orderId, string pickupId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Pickup> GetPickupAsync(string orderId, string pickupId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Pickup> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.PickupClient.GetPickupClient( orderId,  pickupId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Create a new pickup for the order specified in the request for in-store fufillment.
-		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="pickup">Properties of an in-store pickup defined to fulfill items in an order.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Pickup"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var pickup = new Pickup();
-		///   var pickup = pickup.CreatePickup( pickup,  orderId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Pickup CreatePickup(Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Pickup pickup, string orderId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Pickup> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.PickupClient.CreatePickupClient( pickup,  orderId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Create a new pickup for the order specified in the request for in-store fufillment.
+		/// 
 		/// </summary>
 		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="pickup">Properties of an in-store pickup defined to fulfill items in an order.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="pickup">Properties of the in-store pickup to create.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Pickup"/>
 		/// </returns>
@@ -178,50 +105,24 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Pickup CreatePicku
 		///   var pickup = await pickup.CreatePickupAsync( pickup,  orderId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Pickup> CreatePickupAsync(Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Pickup pickup, string orderId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Pickup> CreatePickupAsync(Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Pickup pickup, string orderId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Pickup> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.PickupClient.CreatePickupClient( pickup,  orderId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates one or more details of a defined in-store pickup.
-		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="pickupId">Unique identifier of the pickup to remove.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="pickup">Properties of an in-store pickup defined to fulfill items in an order.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Pickup"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var pickup = new Pickup();
-		///   var pickup = pickup.UpdatePickup( pickup,  orderId,  pickupId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Pickup UpdatePickup(Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Pickup pickup, string orderId, string pickupId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Pickup> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.PickupClient.UpdatePickupClient( pickup,  orderId,  pickupId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates one or more details of a defined in-store pickup.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="pickupId">Unique identifier of the pickup to remove.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="pickup">Properties of an in-store pickup defined to fulfill items in an order.</param>
+		/// <param name="orderId">Unique identifier of the order associated with the in-store pickup.</param>
+		/// <param name="pickupId">Unique identifier of the pickup to update.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="pickup">Properties of the in-store pickup to update.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Pickup"/>
 		/// </returns>
@@ -231,44 +132,21 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Pickup UpdatePicku
 		///   var pickup = await pickup.UpdatePickupAsync( pickup,  orderId,  pickupId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Pickup> UpdatePickupAsync(Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Pickup pickup, string orderId, string pickupId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Pickup> UpdatePickupAsync(Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Pickup pickup, string orderId, string pickupId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Pickup> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.PickupClient.UpdatePickupClient( pickup,  orderId,  pickupId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Removes a pickup previously defined for order item in-store pickup fulfillment.
-		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="pickupId">Unique identifier of the pickup to remove.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var pickup = new Pickup();
-		///   pickup.DeletePickup( orderId,  pickupId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeletePickup(string orderId, string pickupId)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Orders.PickupClient.DeletePickupClient( orderId,  pickupId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Removes a pickup previously defined for order item in-store pickup fulfillment.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
+		/// <param name="orderId">Unique identifier of the order associated with the pickup.</param>
 		/// <param name="pickupId">Unique identifier of the pickup to remove.</param>
 		/// <returns>
 		/// 
@@ -279,12 +157,12 @@ public virtual void DeletePickup(string orderId, string pickupId)
 		///   await pickup.DeletePickupAsync( orderId,  pickupId);
 		/// </code>
 		/// </example>
-		public virtual async Task DeletePickupAsync(string orderId, string pickupId)
+		public virtual async Task DeletePickupAsync(string orderId, string pickupId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Orders.PickupClient.DeletePickupClient( orderId,  pickupId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/Orders/RefundResource.cs b/Mozu.Api/Resources/Commerce/Orders/RefundResource.cs
old mode 100644
new mode 100755
index 98eb98cd..7991a9c1
--- a/Mozu.Api/Resources/Commerce/Orders/RefundResource.cs
+++ b/Mozu.Api/Resources/Commerce/Orders/RefundResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Orders
 {
 	/// <summary>
-	/// Use the refunds resource to create a refund.
+	/// 
 	/// </summary>
 	public partial class RefundResource  	{
 		///
@@ -37,38 +38,13 @@ public RefundResource CloneWithApiContext(Action<IApiContext> contextModificatio
 		}
 
 				
-		/// <summary>
-		/// Creates a refund based on the information supplied in the request.  
-		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="refund">The details of the refund.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Refunds.Refund"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var refund = new Refund();
-		///   var refund = refund.CreateRefund( refund,  orderId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Refunds.Refund CreateRefund(Mozu.Api.Contracts.CommerceRuntime.Refunds.Refund refund, string orderId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Refunds.Refund> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.RefundClient.CreateRefundClient( refund,  orderId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Creates a refund based on the information supplied in the request.  
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="refund">The details of the refund.</param>
+		/// <param name="orderId"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="refund"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Refunds.Refund"/>
 		/// </returns>
@@ -78,45 +54,22 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Refunds.Refund CreateRefund(Mo
 		///   var refund = await refund.CreateRefundAsync( refund,  orderId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Refunds.Refund> CreateRefundAsync(Mozu.Api.Contracts.CommerceRuntime.Refunds.Refund refund, string orderId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Refunds.Refund> CreateRefundAsync(Mozu.Api.Contracts.CommerceRuntime.Refunds.Refund refund, string orderId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Refunds.Refund> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.RefundClient.CreateRefundClient( refund,  orderId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Resends the order refund email previously sent to the shopper. 
-		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="refundId">Unique ID of the refund.        </param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var refund = new Refund();
-		///   refund.ResendRefundEmail( orderId,  refundId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void ResendRefundEmail(string orderId, string refundId)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Orders.RefundClient.ResendRefundEmailClient( orderId,  refundId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Resends the order refund email previously sent to the shopper. 
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="refundId">Unique ID of the refund.        </param>
+		/// <param name="orderId"></param>
+		/// <param name="refundId"></param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -126,12 +79,12 @@ public virtual void ResendRefundEmail(string orderId, string refundId)
 		///   await refund.ResendRefundEmailAsync( orderId,  refundId);
 		/// </code>
 		/// </example>
-		public virtual async Task ResendRefundEmailAsync(string orderId, string refundId)
+		public virtual async Task ResendRefundEmailAsync(string orderId, string refundId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Orders.RefundClient.ResendRefundEmailClient( orderId,  refundId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/Orders/ShipmentResource.cs b/Mozu.Api/Resources/Commerce/Orders/ShipmentResource.cs
old mode 100644
new mode 100755
index 5465c1ae..24db901a
--- a/Mozu.Api/Resources/Commerce/Orders/ShipmentResource.cs
+++ b/Mozu.Api/Resources/Commerce/Orders/ShipmentResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Orders
 {
@@ -37,37 +38,12 @@ public ShipmentResource CloneWithApiContext(Action<IApiContext> contextModificat
 		}
 
 				
-		/// <summary>
-		/// Retrieves the details of the order shipment specified in the request.
-		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="shipmentId">Unique identifier of the shipment to retrieve.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Shipment"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var shipment = new Shipment();
-		///   var shipment = shipment.GetShipment( orderId,  shipmentId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Shipment GetShipment(string orderId, string shipmentId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Shipment> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.ShipmentClient.GetShipmentClient( orderId,  shipmentId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of the order shipment specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="orderId">Unique identifier of the order associated with the shipment to retrieve.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="shipmentId">Unique identifier of the shipment to retrieve.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Shipment"/>
@@ -78,46 +54,22 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Shipment GetShipme
 		///   var shipment = await shipment.GetShipmentAsync( orderId,  shipmentId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Shipment> GetShipmentAsync(string orderId, string shipmentId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Shipment> GetShipmentAsync(string orderId, string shipmentId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Shipment> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.ShipmentClient.GetShipmentClient( orderId,  shipmentId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the available shipping methods applicable to the order. Typically used to display available shipping method options on the checkout page.
-		/// </summary>
-		/// <param name="draft">If true, retrieve the draft version of the order, which might include uncommitted changes to the order or its components.</param>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <returns>
-		/// List{<see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.ShippingRate"/>}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var shipment = new Shipment();
-		///   var shippingRate = shipment.GetAvailableShipmentMethods( orderId,  draft);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.ShippingRate> GetAvailableShipmentMethods(string orderId, bool? draft =  null)
-		{
-			MozuClient<List<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.ShippingRate>> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.ShipmentClient.GetAvailableShipmentMethodsClient( orderId,  draft);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the available shipping methods applicable to the order. Typically used to display available shipping method options on the checkout page.
+		/// 
 		/// </summary>
-		/// <param name="draft">If true, retrieve the draft version of the order, which might include uncommitted changes to the order or its components.</param>
-		/// <param name="orderId">Unique identifier of the order.</param>
+		/// <param name="draft"></param>
+		/// <param name="orderId">Unique identifier of the order for the available shipment methods being retrieved.</param>
 		/// <returns>
 		/// List{<see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.ShippingRate"/>}
 		/// </returns>
@@ -127,45 +79,21 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Shipment GetShipme
 		///   var shippingRate = await shipment.GetAvailableShipmentMethodsAsync( orderId,  draft);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.ShippingRate>> GetAvailableShipmentMethodsAsync(string orderId, bool? draft =  null)
+		public virtual async Task<List<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.ShippingRate>> GetAvailableShipmentMethodsAsync(string orderId, bool? draft =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.ShippingRate>> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.ShipmentClient.GetAvailableShipmentMethodsClient( orderId,  draft);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Creates a shipment from one or more package associated with an order and assign a label and tracking number to an order shipment.
-		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="packageIds">List of unique identifiers for each package associated with this shipment. Not all packages must belong to the same shipment.</param>
-		/// <returns>
-		/// List{<see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package"/>}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var shipment = new Shipment();
-		///   var package = shipment.CreatePackageShipments( packageIds,  orderId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package> CreatePackageShipments(List<string> packageIds, string orderId)
-		{
-			MozuClient<List<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package>> response;
-			var client = Mozu.Api.Clients.Commerce.Orders.ShipmentClient.CreatePackageShipmentsClient( packageIds,  orderId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Creates a shipment from one or more package associated with an order and assign a label and tracking number to an order shipment.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
+		/// <param name="orderId">Unique identifier of the order for this shipment.</param>
 		/// <param name="packageIds">List of unique identifiers for each package associated with this shipment. Not all packages must belong to the same shipment.</param>
 		/// <returns>
 		/// List{<see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package"/>}
@@ -176,45 +104,22 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Shipment GetShipme
 		///   var package = await shipment.CreatePackageShipmentsAsync( packageIds,  orderId);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package>> CreatePackageShipmentsAsync(List<string> packageIds, string orderId)
+		public virtual async Task<List<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package>> CreatePackageShipmentsAsync(List<string> packageIds, string orderId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package>> response;
 			var client = Mozu.Api.Clients.Commerce.Orders.ShipmentClient.CreatePackageShipmentsClient( packageIds,  orderId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Deletes the shipment specified in the request.
-		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="shipmentId">Unique identifier of the shipment to retrieve.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var shipment = new Shipment();
-		///   shipment.DeleteShipment( orderId,  shipmentId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteShipment(string orderId, string shipmentId)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Orders.ShipmentClient.DeleteShipmentClient( orderId,  shipmentId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes the shipment specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="orderId">Unique identifier of the order.</param>
-		/// <param name="shipmentId">Unique identifier of the shipment to retrieve.</param>
+		/// <param name="orderId">Unique identifier of the order to cancel shipment.</param>
+		/// <param name="shipmentId">Unique identifier of the shipment to cancel.</param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -224,12 +129,12 @@ public virtual void DeleteShipment(string orderId, string shipmentId)
 		///   await shipment.DeleteShipmentAsync( orderId,  shipmentId);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteShipmentAsync(string orderId, string shipmentId)
+		public virtual async Task DeleteShipmentAsync(string orderId, string shipmentId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Orders.ShipmentClient.DeleteShipmentClient( orderId,  shipmentId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/Payments/FraudScreenResource.cs b/Mozu.Api/Resources/Commerce/Payments/FraudScreenResource.cs
old mode 100644
new mode 100755
index 5490fba1..5a0c3a80
--- a/Mozu.Api/Resources/Commerce/Payments/FraudScreenResource.cs
+++ b/Mozu.Api/Resources/Commerce/Payments/FraudScreenResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Payments
 {
 	/// <summary>
-	/// commerce/payments/fraudscreen related resources. DOCUMENT_HERE 
+	/// 
 	/// </summary>
 	public partial class FraudScreenResource  	{
 		///
@@ -37,36 +38,12 @@ public FraudScreenResource CloneWithApiContext(Action<IApiContext> contextModifi
 		}
 
 				
-		/// <summary>
-		/// payments-fraudscreen Post Screen description DOCUMENT_HERE 
-		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="request">Mozu.PaymentService.Contracts.Request.FraudScreenRequest ApiType DOCUMENT_HERE </param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.PaymentService.Response.FraudScreen"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var fraudscreen = new FraudScreen();
-		///   var fraudScreen = fraudscreen.Screen( request,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.PaymentService.Response.FraudScreen Screen(Mozu.Api.Contracts.PaymentService.Request.FraudScreenRequest request, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.PaymentService.Response.FraudScreen> response;
-			var client = Mozu.Api.Clients.Commerce.Payments.FraudScreenClient.ScreenClient( request,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// payments-fraudscreen Post Screen description DOCUMENT_HERE 
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="request">Mozu.PaymentService.Contracts.Request.FraudScreenRequest ApiType DOCUMENT_HERE </param>
+		/// <param name="responseFields"></param>
+		/// <param name="request"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.PaymentService.Response.FraudScreen"/>
 		/// </returns>
@@ -76,12 +53,12 @@ public virtual Mozu.Api.Contracts.PaymentService.Response.FraudScreen Screen(Moz
 		///   var fraudScreen = await fraudscreen.ScreenAsync( request,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.PaymentService.Response.FraudScreen> ScreenAsync(Mozu.Api.Contracts.PaymentService.Request.FraudScreenRequest request, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.PaymentService.Response.FraudScreen> ScreenAsync(Mozu.Api.Contracts.PaymentService.Request.FraudScreenRequest request, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.PaymentService.Response.FraudScreen> response;
 			var client = Mozu.Api.Clients.Commerce.Payments.FraudScreenClient.ScreenClient( request,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
diff --git a/Mozu.Api/Resources/Commerce/Payments/PublicCardResource.cs b/Mozu.Api/Resources/Commerce/Payments/PublicCardResource.cs
old mode 100644
new mode 100755
index 7337101d..e6b47697
--- a/Mozu.Api/Resources/Commerce/Payments/PublicCardResource.cs
+++ b/Mozu.Api/Resources/Commerce/Payments/PublicCardResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Payments
 {
 	/// <summary>
-	/// commerce/payments/cards related resources. DOCUMENT_HERE 
+	/// 
 	/// </summary>
 	public partial class PublicCardResource  	{
 		///
@@ -41,36 +42,12 @@ public PublicCardResource CloneWithApiContext(Action<IApiContext> contextModific
 		}
 
 				
-		/// <summary>
-		/// payments-cards Post Create description DOCUMENT_HERE 
-		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="request">Mozu.PaymentService.Contracts.PublicCard ApiType DOCUMENT_HERE </param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.PaymentService.Response.SyncResponse"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var publiccard = new PublicCard();
-		///   var syncResponse = publiccard.Create( request,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.PaymentService.Response.SyncResponse Create(Mozu.Api.Contracts.PaymentService.PublicCard request, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.PaymentService.Response.SyncResponse> response;
-			var client = Mozu.Api.Clients.Commerce.Payments.PublicCardClient.CreateClient( request,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// payments-cards Post Create description DOCUMENT_HERE 
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="request">Mozu.PaymentService.Contracts.PublicCard ApiType DOCUMENT_HERE </param>
+		/// <param name="responseFields"></param>
+		/// <param name="request"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.PaymentService.Response.SyncResponse"/>
 		/// </returns>
@@ -80,48 +57,23 @@ public virtual Mozu.Api.Contracts.PaymentService.Response.SyncResponse Create(Mo
 		///   var syncResponse = await publiccard.CreateAsync( request,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.PaymentService.Response.SyncResponse> CreateAsync(Mozu.Api.Contracts.PaymentService.PublicCard request, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.PaymentService.Response.SyncResponse> CreateAsync(Mozu.Api.Contracts.PaymentService.PublicCard request, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.PaymentService.Response.SyncResponse> response;
 			var client = Mozu.Api.Clients.Commerce.Payments.PublicCardClient.CreateClient( request,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// payments-cards Put Update description DOCUMENT_HERE 
-		/// </summary>
-		/// <param name="cardId">Unique identifier of the card associated with the customer account billing contact.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="request">Mozu.PaymentService.Contracts.PublicCard ApiType DOCUMENT_HERE </param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.PaymentService.Response.SyncResponse"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var publiccard = new PublicCard();
-		///   var syncResponse = publiccard.Update( request,  cardId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.PaymentService.Response.SyncResponse Update(Mozu.Api.Contracts.PaymentService.PublicCard request, string cardId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.PaymentService.Response.SyncResponse> response;
-			var client = Mozu.Api.Clients.Commerce.Payments.PublicCardClient.UpdateClient( request,  cardId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// payments-cards Put Update description DOCUMENT_HERE 
+		/// 
 		/// </summary>
-		/// <param name="cardId">Unique identifier of the card associated with the customer account billing contact.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="request">Mozu.PaymentService.Contracts.PublicCard ApiType DOCUMENT_HERE </param>
+		/// <param name="cardId"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="request"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.PaymentService.Response.SyncResponse"/>
 		/// </returns>
@@ -131,43 +83,21 @@ public virtual Mozu.Api.Contracts.PaymentService.Response.SyncResponse Update(Mo
 		///   var syncResponse = await publiccard.UpdateAsync( request,  cardId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.PaymentService.Response.SyncResponse> UpdateAsync(Mozu.Api.Contracts.PaymentService.PublicCard request, string cardId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.PaymentService.Response.SyncResponse> UpdateAsync(Mozu.Api.Contracts.PaymentService.PublicCard request, string cardId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.PaymentService.Response.SyncResponse> response;
 			var client = Mozu.Api.Clients.Commerce.Payments.PublicCardClient.UpdateClient( request,  cardId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// payments-cards Delete Delete description DOCUMENT_HERE 
-		/// </summary>
-		/// <param name="cardId">Unique identifier of the card associated with the customer account billing contact.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var publiccard = new PublicCard();
-		///   publiccard.Delete( cardId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void Delete(string cardId)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Payments.PublicCardClient.DeleteClient( cardId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// payments-cards Delete Delete description DOCUMENT_HERE 
+		/// 
 		/// </summary>
-		/// <param name="cardId">Unique identifier of the card associated with the customer account billing contact.</param>
+		/// <param name="cardId"></param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -177,12 +107,12 @@ public virtual void Delete(string cardId)
 		///   await publiccard.DeleteAsync( cardId);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteAsync(string cardId)
+		public virtual async Task DeleteAsync(string cardId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Payments.PublicCardClient.DeleteClient( cardId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/ReturnResource.cs b/Mozu.Api/Resources/Commerce/ReturnResource.cs
old mode 100644
new mode 100755
index 7016e4dd..d6606cc4
--- a/Mozu.Api/Resources/Commerce/ReturnResource.cs
+++ b/Mozu.Api/Resources/Commerce/ReturnResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce
 {
 	/// <summary>
-	/// Use the Returns resource to manage returned items that were previously fufilled. Returns can include any number of items associated with an original  order. Each return must either be associated with an original order or a product definition to represent each returned item.Refer to the [Returns API](https://www.mozu.com/docs/developer/api-guides/returns.htm) topic for more information about creating and processing returns using the API.
+	/// Use the Returns resource to manage returned items that were previously fufilled. Returns can include any number of items associated with an original Mozu order. Each return must either be associated with an original order or a product definition to represent each returned item.
 	/// </summary>
 	public partial class ReturnResource  	{
 		///
@@ -37,44 +38,16 @@ public ReturnResource CloneWithApiContext(Action<IApiContext> contextModificatio
 		}
 
 				
-		/// <summary>
-		/// Retrieves a list of all returns according to any filter and sort criteria.
-		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="q">A list of order search terms (not phrases) to use in the query when searching across order number and the name or email of the billing contact. When entering, separate multiple search terms with a space character.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Returns.ReturnCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var return = new Return();
-		///   var returnCollection = return.GetReturns( startIndex,  pageSize,  sortBy,  filter,  q,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Returns.ReturnCollection GetReturns(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string q =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Returns.ReturnCollection> response;
-			var client = Mozu.Api.Clients.Commerce.ReturnClient.GetReturnsClient( startIndex,  pageSize,  sortBy,  filter,  q,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of all returns according to any filter and sort criteria.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="q">A list of order search terms (not phrases) to use in the query when searching across order number and the name or email of the billing contact. When entering, separate multiple search terms with a space character.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="q"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Returns.ReturnCollection"/>
 		/// </returns>
@@ -84,44 +57,21 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Returns.ReturnCollection GetRe
 		///   var returnCollection = await return.GetReturnsAsync( startIndex,  pageSize,  sortBy,  filter,  q,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Returns.ReturnCollection> GetReturnsAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string q =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Returns.ReturnCollection> GetReturnsAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string q =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Returns.ReturnCollection> response;
 			var client = Mozu.Api.Clients.Commerce.ReturnClient.GetReturnsClient( startIndex,  pageSize,  sortBy,  filter,  q,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves a list of the actions available to perform for the specified return based on its current state.
-		/// </summary>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
-		/// <returns>
-		/// List{string}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var return = new Return();
-		///   var string = return.GetAvailableReturnActions( returnId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<string> GetAvailableReturnActions(string returnId)
-		{
-			MozuClient<List<string>> response;
-			var client = Mozu.Api.Clients.Commerce.ReturnClient.GetAvailableReturnActionsClient( returnId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of the actions available to perform for the specified return based on its current state.
+		/// 
 		/// </summary>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
+		/// <param name="returnId">Unique identifier of the return for which to retrieve available actions.</param>
 		/// <returns>
 		/// List{string}
 		/// </returns>
@@ -131,48 +81,23 @@ public virtual List<string> GetAvailableReturnActions(string returnId)
 		///   var string = await return.GetAvailableReturnActionsAsync( returnId);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<string>> GetAvailableReturnActionsAsync(string returnId)
+		public virtual async Task<List<string>> GetAvailableReturnActionsAsync(string returnId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<string>> response;
 			var client = Mozu.Api.Clients.Commerce.ReturnClient.GetAvailableReturnActionsClient( returnId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the details of a single return item.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
-		/// <param name="returnItemId">Unique identifier of the return item whose details you want to get.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Returns.ReturnItem"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var return = new Return();
-		///   var returnItem = return.GetReturnItem( returnId,  returnItemId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Returns.ReturnItem GetReturnItem(string returnId, string returnItemId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Returns.ReturnItem> response;
-			var client = Mozu.Api.Clients.Commerce.ReturnClient.GetReturnItemClient( returnId,  returnItemId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of a single return item.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
-		/// <param name="returnItemId">Unique identifier of the return item whose details you want to get.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="returnId"></param>
+		/// <param name="returnItemId"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Returns.ReturnItem"/>
 		/// </returns>
@@ -182,46 +107,22 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Returns.ReturnItem GetReturnIt
 		///   var returnItem = await return.GetReturnItemAsync( returnId,  returnItemId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Returns.ReturnItem> GetReturnItemAsync(string returnId, string returnItemId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Returns.ReturnItem> GetReturnItemAsync(string returnId, string returnItemId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Returns.ReturnItem> response;
 			var client = Mozu.Api.Clients.Commerce.ReturnClient.GetReturnItemClient( returnId,  returnItemId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the details of all return items in an order.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Returns.ReturnItemCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var return = new Return();
-		///   var returnItemCollection = return.GetReturnItems( returnId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Returns.ReturnItemCollection GetReturnItems(string returnId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Returns.ReturnItemCollection> response;
-			var client = Mozu.Api.Clients.Commerce.ReturnClient.GetReturnItemsClient( returnId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of all return items in an order.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="returnId"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Returns.ReturnItemCollection"/>
 		/// </returns>
@@ -231,46 +132,22 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Returns.ReturnItemCollection G
 		///   var returnItemCollection = await return.GetReturnItemsAsync( returnId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Returns.ReturnItemCollection> GetReturnItemsAsync(string returnId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Returns.ReturnItemCollection> GetReturnItemsAsync(string returnId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Returns.ReturnItemCollection> response;
 			var client = Mozu.Api.Clients.Commerce.ReturnClient.GetReturnItemsClient( returnId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves a list of the payment actions available to perform for the specified return when a return results in a refund to the customer.
-		/// </summary>
-		/// <param name="paymentId">Unique identifier of the payment for which to perform the action.</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
-		/// <returns>
-		/// List{string}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var return = new Return();
-		///   var string = return.GetAvailablePaymentActionsForReturn( returnId,  paymentId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<string> GetAvailablePaymentActionsForReturn(string returnId, string paymentId)
-		{
-			MozuClient<List<string>> response;
-			var client = Mozu.Api.Clients.Commerce.ReturnClient.GetAvailablePaymentActionsForReturnClient( returnId,  paymentId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of the payment actions available to perform for the specified return when a return results in a refund to the customer.
+		/// 
 		/// </summary>
 		/// <param name="paymentId">Unique identifier of the payment for which to perform the action.</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
+		/// <param name="returnId">Unique identifier of the return associated with the payment.</param>
 		/// <returns>
 		/// List{string}
 		/// </returns>
@@ -280,48 +157,23 @@ public virtual List<string> GetAvailablePaymentActionsForReturn(string returnId,
 		///   var string = await return.GetAvailablePaymentActionsForReturnAsync( returnId,  paymentId);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<string>> GetAvailablePaymentActionsForReturnAsync(string returnId, string paymentId)
+		public virtual async Task<List<string>> GetAvailablePaymentActionsForReturnAsync(string returnId, string paymentId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<string>> response;
 			var client = Mozu.Api.Clients.Commerce.ReturnClient.GetAvailablePaymentActionsForReturnClient( returnId,  paymentId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the details of a payment submitted as part of a refund associated with a customer return.
-		/// </summary>
-		/// <param name="paymentId">Unique identifier of the payment for which to perform the action.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Payments.Payment"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var return = new Return();
-		///   var payment = return.GetPayment( returnId,  paymentId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Payments.Payment GetPayment(string returnId, string paymentId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Payments.Payment> response;
-			var client = Mozu.Api.Clients.Commerce.ReturnClient.GetPaymentClient( returnId,  paymentId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of a payment submitted as part of a refund associated with a customer return.
+		/// 
 		/// </summary>
-		/// <param name="paymentId">Unique identifier of the payment for which to perform the action.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
+		/// <param name="paymentId">Unique identifier of the return payment to retrieve.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="returnId">Unique identifier of the return associated with the payment.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Payments.Payment"/>
 		/// </returns>
@@ -331,46 +183,22 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Payments.Payment GetPayment(st
 		///   var payment = await return.GetPaymentAsync( returnId,  paymentId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Payments.Payment> GetPaymentAsync(string returnId, string paymentId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Payments.Payment> GetPaymentAsync(string returnId, string paymentId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Payments.Payment> response;
 			var client = Mozu.Api.Clients.Commerce.ReturnClient.GetPaymentClient( returnId,  paymentId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves a list of all payments submitted as part of a refund associated with a customer return.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Payments.PaymentCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var return = new Return();
-		///   var paymentCollection = return.GetPayments( returnId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Payments.PaymentCollection GetPayments(string returnId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Payments.PaymentCollection> response;
-			var client = Mozu.Api.Clients.Commerce.ReturnClient.GetPaymentsClient( returnId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of all payments submitted as part of a refund associated with a customer return.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="returnId">Returns the details of the refund payment associated with the return specified in the request.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Payments.PaymentCollection"/>
 		/// </returns>
@@ -380,46 +208,22 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Payments.PaymentCollection Get
 		///   var paymentCollection = await return.GetPaymentsAsync( returnId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Payments.PaymentCollection> GetPaymentsAsync(string returnId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Payments.PaymentCollection> GetPaymentsAsync(string returnId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Payments.PaymentCollection> response;
 			var client = Mozu.Api.Clients.Commerce.ReturnClient.GetPaymentsClient( returnId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves a list of properties for the specified return.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Returns.Return"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var return = new Return();
-		///   var return = return.GetReturn( returnId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Returns.Return GetReturn(string returnId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Returns.Return> response;
-			var client = Mozu.Api.Clients.Commerce.ReturnClient.GetReturnClient( returnId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of properties for the specified return.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="returnId">Returns the properties of the return specified in the request as well as system-supplied information.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Returns.Return"/>
 		/// </returns>
@@ -429,44 +233,21 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Returns.Return GetReturn(strin
 		///   var return = await return.GetReturnAsync( returnId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Returns.Return> GetReturnAsync(string returnId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Returns.Return> GetReturnAsync(string returnId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Returns.Return> response;
 			var client = Mozu.Api.Clients.Commerce.ReturnClient.GetReturnClient( returnId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Returns a list of reasons for a return.
-		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Returns.ReasonCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var return = new Return();
-		///   var reasonCollection = return.GetReasons( responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Returns.ReasonCollection GetReasons(string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Returns.ReasonCollection> response;
-			var client = Mozu.Api.Clients.Commerce.ReturnClient.GetReasonsClient( responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Returns a list of reasons for a return.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Returns.ReasonCollection"/>
 		/// </returns>
@@ -476,52 +257,22 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Returns.ReasonCollection GetRe
 		///   var reasonCollection = await return.GetReasonsAsync( responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Returns.ReasonCollection> GetReasonsAsync(string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Returns.ReasonCollection> GetReasonsAsync(string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Returns.ReasonCollection> response;
 			var client = Mozu.Api.Clients.Commerce.ReturnClient.GetReasonsClient( responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Creates a return for previously fulfilled items. Each return must either be associated with an original order or a product definition to represent each returned item.When you create a return, you must specify the following fields:
-
-
-
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="ret">Properties of a return of one or more previously fulfilled items.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Returns.Return"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var return = new Return();
-		///   var return = return.CreateReturn( ret,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Returns.Return CreateReturn(Mozu.Api.Contracts.CommerceRuntime.Returns.Return ret, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Returns.Return> response;
-			var client = Mozu.Api.Clients.Commerce.ReturnClient.CreateReturnClient( ret,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Creates a return for previously fulfilled items. Each return must either be associated with an original order or a product definition to represent each returned item.When you create a return, you must specify the following fields:
-
-
-
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="ret">Properties of a return of one or more previously fulfilled items.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="ret">Wrapper for the properties of the return to create.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Returns.Return"/>
 		/// </returns>
@@ -531,48 +282,23 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Returns.Return CreateReturn(Mo
 		///   var return = await return.CreateReturnAsync( ret,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Returns.Return> CreateReturnAsync(Mozu.Api.Contracts.CommerceRuntime.Returns.Return ret, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Returns.Return> CreateReturnAsync(Mozu.Api.Contracts.CommerceRuntime.Returns.Return ret, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Returns.Return> response;
 			var client = Mozu.Api.Clients.Commerce.ReturnClient.CreateReturnClient( ret,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Adds a return item to the return.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
-		/// <param name="returnItem">Properties of a previously fulfilled item associated with a return.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Returns.Return"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var return = new Return();
-		///   var return = return.CreateReturnItem( returnItem,  returnId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Returns.Return CreateReturnItem(Mozu.Api.Contracts.CommerceRuntime.Returns.ReturnItem returnItem, string returnId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Returns.Return> response;
-			var client = Mozu.Api.Clients.Commerce.ReturnClient.CreateReturnItemClient( returnItem,  returnId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Adds a return item to the return.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
-		/// <param name="returnItem">Properties of a previously fulfilled item associated with a return.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="returnId"></param>
+		/// <param name="returnItem"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Returns.Return"/>
 		/// </returns>
@@ -582,50 +308,24 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Returns.Return CreateReturnIte
 		///   var return = await return.CreateReturnItemAsync( returnItem,  returnId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Returns.Return> CreateReturnItemAsync(Mozu.Api.Contracts.CommerceRuntime.Returns.ReturnItem returnItem, string returnId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Returns.Return> CreateReturnItemAsync(Mozu.Api.Contracts.CommerceRuntime.Returns.ReturnItem returnItem, string returnId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Returns.Return> response;
 			var client = Mozu.Api.Clients.Commerce.ReturnClient.CreateReturnItemClient( returnItem,  returnId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates a refund payment associated with a customer return by performing the specified action.
-		/// </summary>
-		/// <param name="paymentId">Unique identifier of the payment for which to perform the action.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
-		/// <param name="action">Properties of the payment action performed for an order.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Returns.Return"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var return = new Return();
-		///   var return = return.PerformPaymentActionForReturn( action,  returnId,  paymentId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Returns.Return PerformPaymentActionForReturn(Mozu.Api.Contracts.CommerceRuntime.Payments.PaymentAction action, string returnId, string paymentId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Returns.Return> response;
-			var client = Mozu.Api.Clients.Commerce.ReturnClient.PerformPaymentActionForReturnClient( action,  returnId,  paymentId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates a refund payment associated with a customer return by performing the specified action.
+		/// 
 		/// </summary>
-		/// <param name="paymentId">Unique identifier of the payment for which to perform the action.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
-		/// <param name="action">Properties of the payment action performed for an order.</param>
+		/// <param name="paymentId">Unique identifier of the return payment to update.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="returnId">Unique identifier of the return associated with the refund payment.</param>
+		/// <param name="action">The payment action to perform for the refund payment.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Returns.Return"/>
 		/// </returns>
@@ -635,48 +335,23 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Returns.Return PerformPaymentA
 		///   var return = await return.PerformPaymentActionForReturnAsync( action,  returnId,  paymentId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Returns.Return> PerformPaymentActionForReturnAsync(Mozu.Api.Contracts.CommerceRuntime.Payments.PaymentAction action, string returnId, string paymentId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Returns.Return> PerformPaymentActionForReturnAsync(Mozu.Api.Contracts.CommerceRuntime.Payments.PaymentAction action, string returnId, string paymentId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Returns.Return> response;
 			var client = Mozu.Api.Clients.Commerce.ReturnClient.PerformPaymentActionForReturnClient( action,  returnId,  paymentId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Creates a new payment for a return that results in a refund to the customer.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
-		/// <param name="action">Properties of the payment action performed for an order.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Returns.Return"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var return = new Return();
-		///   var return = return.CreatePaymentActionForReturn( action,  returnId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Returns.Return CreatePaymentActionForReturn(Mozu.Api.Contracts.CommerceRuntime.Payments.PaymentAction action, string returnId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Returns.Return> response;
-			var client = Mozu.Api.Clients.Commerce.ReturnClient.CreatePaymentActionForReturnClient( action,  returnId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Creates a new payment for a return that results in a refund to the customer.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
-		/// <param name="action">Properties of the payment action performed for an order.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="returnId">Unique identifier of the return associated with the payment action.</param>
+		/// <param name="action">The payment action to perform for the customer return.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Returns.Return"/>
 		/// </returns>
@@ -686,47 +361,22 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Returns.Return CreatePaymentAc
 		///   var return = await return.CreatePaymentActionForReturnAsync( action,  returnId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Returns.Return> CreatePaymentActionForReturnAsync(Mozu.Api.Contracts.CommerceRuntime.Payments.PaymentAction action, string returnId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Returns.Return> CreatePaymentActionForReturnAsync(Mozu.Api.Contracts.CommerceRuntime.Payments.PaymentAction action, string returnId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Returns.Return> response;
 			var client = Mozu.Api.Clients.Commerce.ReturnClient.CreatePaymentActionForReturnClient( action,  returnId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Creates a replacement order for the return.
-		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
-		/// <param name="itemQuantities"></param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var return = new Return();
-		///   var order = return.CreateReturnShippingOrder( itemQuantities,  returnId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.Order CreateReturnShippingOrder(List<Mozu.Api.Contracts.CommerceRuntime.Returns.ReturnItemSpecifier> itemQuantities, string returnId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> response;
-			var client = Mozu.Api.Clients.Commerce.ReturnClient.CreateReturnShippingOrderClient( itemQuantities,  returnId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Creates a replacement order for the return.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="returnId"></param>
 		/// <param name="itemQuantities"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.Order"/>
@@ -737,46 +387,22 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.Order CreateReturnShipp
 		///   var order = await return.CreateReturnShippingOrderAsync( itemQuantities,  returnId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> CreateReturnShippingOrderAsync(List<Mozu.Api.Contracts.CommerceRuntime.Returns.ReturnItemSpecifier> itemQuantities, string returnId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> CreateReturnShippingOrderAsync(List<Mozu.Api.Contracts.CommerceRuntime.Returns.ReturnItemSpecifier> itemQuantities, string returnId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.Order> response;
 			var client = Mozu.Api.Clients.Commerce.ReturnClient.CreateReturnShippingOrderClient( itemQuantities,  returnId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates the return by performing the action specified in the request.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="action">Properties of an action a user can perform for a return.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Returns.ReturnCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var return = new Return();
-		///   var returnCollection = return.PerformReturnActions( action,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Returns.ReturnCollection PerformReturnActions(Mozu.Api.Contracts.CommerceRuntime.Returns.ReturnAction action, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Returns.ReturnCollection> response;
-			var client = Mozu.Api.Clients.Commerce.ReturnClient.PerformReturnActionsClient( action,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates the return by performing the action specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="action">Properties of an action a user can perform for a return.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="action">The name of the return action to perform, such as "Reject" or "Authorize".</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Returns.ReturnCollection"/>
 		/// </returns>
@@ -786,48 +412,23 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Returns.ReturnCollection Perfo
 		///   var returnCollection = await return.PerformReturnActionsAsync( action,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Returns.ReturnCollection> PerformReturnActionsAsync(Mozu.Api.Contracts.CommerceRuntime.Returns.ReturnAction action, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Returns.ReturnCollection> PerformReturnActionsAsync(Mozu.Api.Contracts.CommerceRuntime.Returns.ReturnAction action, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Returns.ReturnCollection> response;
 			var client = Mozu.Api.Clients.Commerce.ReturnClient.PerformReturnActionsClient( action,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates one or more properties of a return for items previously shipped in a completed order.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
-		/// <param name="ret">Properties of a return of one or more previously fulfilled items.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Returns.Return"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var return = new Return();
-		///   var return = return.UpdateReturn( ret,  returnId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Returns.Return UpdateReturn(Mozu.Api.Contracts.CommerceRuntime.Returns.Return ret, string returnId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Returns.Return> response;
-			var client = Mozu.Api.Clients.Commerce.ReturnClient.UpdateReturnClient( ret,  returnId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates one or more properties of a return for items previously shipped in a completed order.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
-		/// <param name="ret">Properties of a return of one or more previously fulfilled items.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="returnId">Unique identifier of the return.</param>
+		/// <param name="ret">Wrapper for the array of properties to update for the return.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Returns.Return"/>
 		/// </returns>
@@ -837,43 +438,21 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Returns.Return UpdateReturn(Mo
 		///   var return = await return.UpdateReturnAsync( ret,  returnId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Returns.Return> UpdateReturnAsync(Mozu.Api.Contracts.CommerceRuntime.Returns.Return ret, string returnId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Returns.Return> UpdateReturnAsync(Mozu.Api.Contracts.CommerceRuntime.Returns.Return ret, string returnId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Returns.Return> response;
 			var client = Mozu.Api.Clients.Commerce.ReturnClient.UpdateReturnClient( ret,  returnId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Resend the email notification to a shopper that a return has been created.
-		/// </summary>
-		/// <param name="action">Properties of an action a user can perform for a return.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var return = new Return();
-		///   return.ResendReturnEmail( action);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void ResendReturnEmail(Mozu.Api.Contracts.CommerceRuntime.Returns.ReturnAction action)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.ReturnClient.ResendReturnEmailClient( action);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Resend the email notification to a shopper that a return has been created.
+		/// 
 		/// </summary>
-		/// <param name="action">Properties of an action a user can perform for a return.</param>
+		/// <param name="action"></param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -883,45 +462,21 @@ public virtual void ResendReturnEmail(Mozu.Api.Contracts.CommerceRuntime.Returns
 		///   await return.ResendReturnEmailAsync( action);
 		/// </code>
 		/// </example>
-		public virtual async Task ResendReturnEmailAsync(Mozu.Api.Contracts.CommerceRuntime.Returns.ReturnAction action)
+		public virtual async Task ResendReturnEmailAsync(Mozu.Api.Contracts.CommerceRuntime.Returns.ReturnAction action, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.ReturnClient.ResendReturnEmailClient( action);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
-		/// <summary>
-		/// Removes a particular order item from the order of the current shopper.
-		/// </summary>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
-		/// <param name="returnItemId">Unique identifier of the return item whose details you want to get.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Returns.Return"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var return = new Return();
-		///   var return = return.DeleteOrderItem( returnId,  returnItemId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Returns.Return DeleteOrderItem(string returnId, string returnItemId)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Returns.Return> response;
-			var client = Mozu.Api.Clients.Commerce.ReturnClient.DeleteOrderItemClient( returnId,  returnItemId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Removes a particular order item from the order of the current shopper.
+		/// 
 		/// </summary>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
-		/// <param name="returnItemId">Unique identifier of the return item whose details you want to get.</param>
+		/// <param name="returnId"></param>
+		/// <param name="returnItemId"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Returns.Return"/>
 		/// </returns>
@@ -931,43 +486,21 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Returns.Return DeleteOrderItem
 		///   var return = await return.DeleteOrderItemAsync( returnId,  returnItemId);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Returns.Return> DeleteOrderItemAsync(string returnId, string returnItemId)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Returns.Return> DeleteOrderItemAsync(string returnId, string returnItemId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Returns.Return> response;
 			var client = Mozu.Api.Clients.Commerce.ReturnClient.DeleteOrderItemClient( returnId,  returnItemId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Deletes the return specified in the request.
-		/// </summary>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var return = new Return();
-		///   return.DeleteReturn( returnId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteReturn(string returnId)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.ReturnClient.DeleteReturnClient( returnId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes the return specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
+		/// <param name="returnId">Unique identifier of the return to delete.</param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -977,12 +510,12 @@ public virtual void DeleteReturn(string returnId)
 		///   await return.DeleteReturnAsync( returnId);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteReturnAsync(string returnId)
+		public virtual async Task DeleteReturnAsync(string returnId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.ReturnClient.DeleteReturnClient( returnId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/Returns/OrderNoteResource.cs b/Mozu.Api/Resources/Commerce/Returns/OrderNoteResource.cs
old mode 100644
new mode 100755
index 876edabf..ddd98575
--- a/Mozu.Api/Resources/Commerce/Returns/OrderNoteResource.cs
+++ b/Mozu.Api/Resources/Commerce/Returns/OrderNoteResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Returns
 {
 	/// <summary>
-	/// Use the Return Notes resource to access and modify internal notes associated with returns. These notes can be useful to customer service representatives viewing them in .
+	/// 
 	/// </summary>
 	public partial class OrderNoteResource  	{
 		///
@@ -37,34 +38,11 @@ public OrderNoteResource CloneWithApiContext(Action<IApiContext> contextModifica
 		}
 
 				
-		/// <summary>
-		/// Retrieves all internal notes associated with a return.
-		/// </summary>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
-		/// <returns>
-		/// List{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote"/>}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var ordernote = new OrderNote();
-		///   var orderNote = ordernote.GetReturnNotes( returnId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote> GetReturnNotes(string returnId)
-		{
-			MozuClient<List<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote>> response;
-			var client = Mozu.Api.Clients.Commerce.Returns.OrderNoteClient.GetReturnNotesClient( returnId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves all internal notes associated with a return.
+		/// 
 		/// </summary>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
+		/// <param name="returnId"></param>
 		/// <returns>
 		/// List{<see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote"/>}
 		/// </returns>
@@ -74,48 +52,23 @@ public OrderNoteResource CloneWithApiContext(Action<IApiContext> contextModifica
 		///   var orderNote = await ordernote.GetReturnNotesAsync( returnId);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote>> GetReturnNotesAsync(string returnId)
+		public virtual async Task<List<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote>> GetReturnNotesAsync(string returnId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote>> response;
 			var client = Mozu.Api.Clients.Commerce.Returns.OrderNoteClient.GetReturnNotesClient( returnId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves a specific internal note from a return.
-		/// </summary>
-		/// <param name="noteId">Unique identifier of a particular note to retrieve.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var ordernote = new OrderNote();
-		///   var orderNote = ordernote.GetReturnNote( returnId,  noteId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote GetReturnNote(string returnId, string noteId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote> response;
-			var client = Mozu.Api.Clients.Commerce.Returns.OrderNoteClient.GetReturnNoteClient( returnId,  noteId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a specific internal note from a return.
+		/// 
 		/// </summary>
-		/// <param name="noteId">Unique identifier of a particular note to retrieve.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
+		/// <param name="noteId"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="returnId"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote"/>
 		/// </returns>
@@ -125,47 +78,22 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote GetReturnNote
 		///   var orderNote = await ordernote.GetReturnNoteAsync( returnId,  noteId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote> GetReturnNoteAsync(string returnId, string noteId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote> GetReturnNoteAsync(string returnId, string noteId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote> response;
 			var client = Mozu.Api.Clients.Commerce.Returns.OrderNoteClient.GetReturnNoteClient( returnId,  noteId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Creates an internal note on a given return. This note is visible in  for customer service representatives to see.
-		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
-		/// <param name="returnNote"></param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var ordernote = new OrderNote();
-		///   var orderNote = ordernote.CreateReturnNote( returnNote,  returnId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote CreateReturnNote(Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote returnNote, string returnId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote> response;
-			var client = Mozu.Api.Clients.Commerce.Returns.OrderNoteClient.CreateReturnNoteClient( returnNote,  returnId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Creates an internal note on a given return. This note is visible in  for customer service representatives to see.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="returnId"></param>
 		/// <param name="returnNote"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote"/>
@@ -176,49 +104,23 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote CreateReturnN
 		///   var orderNote = await ordernote.CreateReturnNoteAsync( returnNote,  returnId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote> CreateReturnNoteAsync(Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote returnNote, string returnId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote> CreateReturnNoteAsync(Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote returnNote, string returnId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote> response;
 			var client = Mozu.Api.Clients.Commerce.Returns.OrderNoteClient.CreateReturnNoteClient( returnNote,  returnId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates an internal note on a given return. This note is visible in  for customer service representatives to see.
-		/// </summary>
-		/// <param name="noteId">Unique identifier of a particular note to retrieve.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
-		/// <param name="returnNote"></param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var ordernote = new OrderNote();
-		///   var orderNote = ordernote.UpdateReturnNote( returnNote,  returnId,  noteId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote UpdateReturnNote(Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote returnNote, string returnId, string noteId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote> response;
-			var client = Mozu.Api.Clients.Commerce.Returns.OrderNoteClient.UpdateReturnNoteClient( returnNote,  returnId,  noteId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates an internal note on a given return. This note is visible in  for customer service representatives to see.
+		/// 
 		/// </summary>
-		/// <param name="noteId">Unique identifier of a particular note to retrieve.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
+		/// <param name="noteId"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="returnId"></param>
 		/// <param name="returnNote"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote"/>
@@ -229,45 +131,22 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote UpdateReturnN
 		///   var orderNote = await ordernote.UpdateReturnNoteAsync( returnNote,  returnId,  noteId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote> UpdateReturnNoteAsync(Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote returnNote, string returnId, string noteId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote> UpdateReturnNoteAsync(Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote returnNote, string returnId, string noteId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Orders.OrderNote> response;
 			var client = Mozu.Api.Clients.Commerce.Returns.OrderNoteClient.UpdateReturnNoteClient( returnNote,  returnId,  noteId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Deletes an internal note from a given return.
-		/// </summary>
-		/// <param name="noteId">Unique identifier of a particular note to retrieve.</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var ordernote = new OrderNote();
-		///   ordernote.DeleteReturnNote( returnId,  noteId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteReturnNote(string returnId, string noteId)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Returns.OrderNoteClient.DeleteReturnNoteClient( returnId,  noteId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes an internal note from a given return.
+		/// 
 		/// </summary>
-		/// <param name="noteId">Unique identifier of a particular note to retrieve.</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
+		/// <param name="noteId"></param>
+		/// <param name="returnId"></param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -277,12 +156,12 @@ public virtual void DeleteReturnNote(string returnId, string noteId)
 		///   await ordernote.DeleteReturnNoteAsync( returnId,  noteId);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteReturnNoteAsync(string returnId, string noteId)
+		public virtual async Task DeleteReturnNoteAsync(string returnId, string noteId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Returns.OrderNoteClient.DeleteReturnNoteClient( returnId,  noteId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/Returns/PackageResource.cs b/Mozu.Api/Resources/Commerce/Returns/PackageResource.cs
old mode 100644
new mode 100755
index 6503c56a..5360718d
--- a/Mozu.Api/Resources/Commerce/Returns/PackageResource.cs
+++ b/Mozu.Api/Resources/Commerce/Returns/PackageResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Returns
 {
@@ -37,38 +38,13 @@ public PackageResource CloneWithApiContext(Action<IApiContext> contextModificati
 		}
 
 				
-		/// <summary>
-		/// Retrieves the package label image supplied by the carrier for a return replacement.
-		/// </summary>
-		/// <param name="packageId">Unique identifier of the package for which to retrieve the label.</param>
-		/// <param name="returnAsBase64Png">Specifies whether to return the RMA label image as Base64-encoded PNG image instead of as a byte array encoded in the original image format. The default is .</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
-		/// <returns>
-		/// <see cref="System.IO.Stream"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var package = new Package();
-		///   var stream = package.GetPackageLabel( returnId,  packageId,  returnAsBase64Png);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual System.IO.Stream GetPackageLabel(string returnId, string packageId, bool? returnAsBase64Png =  null)
-		{
-			MozuClient<System.IO.Stream> response;
-			var client = Mozu.Api.Clients.Commerce.Returns.PackageClient.GetPackageLabelClient( returnId,  packageId,  returnAsBase64Png);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the package label image supplied by the carrier for a return replacement.
+		/// 
 		/// </summary>
-		/// <param name="packageId">Unique identifier of the package for which to retrieve the label.</param>
-		/// <param name="returnAsBase64Png">Specifies whether to return the RMA label image as Base64-encoded PNG image instead of as a byte array encoded in the original image format. The default is .</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
+		/// <param name="packageId">Unique identifier of the return replacement package for which to retrieve the label.</param>
+		/// <param name="returnAsBase64Png"></param>
+		/// <param name="returnId">Unique identifier of the return associated with the replacement package label to retrieve.</param>
 		/// <returns>
 		/// <see cref="System.IO.Stream"/>
 		/// </returns>
@@ -78,48 +54,23 @@ public virtual System.IO.Stream GetPackageLabel(string returnId, string packageI
 		///   var stream = await package.GetPackageLabelAsync( returnId,  packageId,  returnAsBase64Png);
 		/// </code>
 		/// </example>
-		public virtual async Task<System.IO.Stream> GetPackageLabelAsync(string returnId, string packageId, bool? returnAsBase64Png =  null)
+		public virtual async Task<System.IO.Stream> GetPackageLabelAsync(string returnId, string packageId, bool? returnAsBase64Png =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<System.IO.Stream> response;
 			var client = Mozu.Api.Clients.Commerce.Returns.PackageClient.GetPackageLabelClient( returnId,  packageId,  returnAsBase64Png);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the details of a package of return replacement items.
-		/// </summary>
-		/// <param name="packageId">Unique identifier of the package for which to retrieve the label.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var package = new Package();
-		///   var package = package.GetPackage( returnId,  packageId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package GetPackage(string returnId, string packageId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package> response;
-			var client = Mozu.Api.Clients.Commerce.Returns.PackageClient.GetPackageClient( returnId,  packageId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of a package of return replacement items.
+		/// 
 		/// </summary>
-		/// <param name="packageId">Unique identifier of the package for which to retrieve the label.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
+		/// <param name="packageId">Unique identifier of the return replacement package to retrieve.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="returnId">Unique identifier of the return associated with the replacement package to retrieve.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package"/>
 		/// </returns>
@@ -129,48 +80,23 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package GetPackage
 		///   var package = await package.GetPackageAsync( returnId,  packageId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package> GetPackageAsync(string returnId, string packageId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package> GetPackageAsync(string returnId, string packageId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package> response;
 			var client = Mozu.Api.Clients.Commerce.Returns.PackageClient.GetPackageClient( returnId,  packageId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Creates a new physical package of return replacement items.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
-		/// <param name="package">Properties of a physical package shipped for an order.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var package = new Package();
-		///   var package = package.CreatePackage( pkg,  returnId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package CreatePackage(Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package pkg, string returnId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package> response;
-			var client = Mozu.Api.Clients.Commerce.Returns.PackageClient.CreatePackageClient( pkg,  returnId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Creates a new physical package of return replacement items.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
-		/// <param name="package">Properties of a physical package shipped for an order.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="returnId">Unique identifier of the return for which to create a replacement package.</param>
+		/// <param name="package">Properties of the physical package for a return replacement.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package"/>
 		/// </returns>
@@ -180,50 +106,24 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package CreatePack
 		///   var package = await package.CreatePackageAsync( pkg,  returnId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package> CreatePackageAsync(Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package pkg, string returnId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package> CreatePackageAsync(Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package pkg, string returnId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package> response;
 			var client = Mozu.Api.Clients.Commerce.Returns.PackageClient.CreatePackageClient( pkg,  returnId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates one or more properties of a package associated with a return replacement.
-		/// </summary>
-		/// <param name="packageId">Unique identifier of the package for which to retrieve the label.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
-		/// <param name="package">Properties of a physical package shipped for an order.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var package = new Package();
-		///   var package = package.UpdatePackage( pkg,  returnId,  packageId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package UpdatePackage(Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package pkg, string returnId, string packageId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package> response;
-			var client = Mozu.Api.Clients.Commerce.Returns.PackageClient.UpdatePackageClient( pkg,  returnId,  packageId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates one or more properties of a package associated with a return replacement.
+		/// 
 		/// </summary>
-		/// <param name="packageId">Unique identifier of the package for which to retrieve the label.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
-		/// <param name="package">Properties of a physical package shipped for an order.</param>
+		/// <param name="packageId">Unique identifier of the return replacement package to update.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="returnId">Unique identifier of the return associated with the replacement package to update.</param>
+		/// <param name="package">Properties of the return replacement package to update.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package"/>
 		/// </returns>
@@ -233,45 +133,22 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package UpdatePack
 		///   var package = await package.UpdatePackageAsync( pkg,  returnId,  packageId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package> UpdatePackageAsync(Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package pkg, string returnId, string packageId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package> UpdatePackageAsync(Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package pkg, string returnId, string packageId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package> response;
 			var client = Mozu.Api.Clients.Commerce.Returns.PackageClient.UpdatePackageClient( pkg,  returnId,  packageId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Deletes a package associated with a return replacement.
-		/// </summary>
-		/// <param name="packageId">Unique identifier of the package for which to retrieve the label.</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var package = new Package();
-		///   package.DeletePackage( returnId,  packageId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeletePackage(string returnId, string packageId)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Returns.PackageClient.DeletePackageClient( returnId,  packageId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes a package associated with a return replacement.
+		/// 
 		/// </summary>
-		/// <param name="packageId">Unique identifier of the package for which to retrieve the label.</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
+		/// <param name="packageId">Unique identifier of the return replacement package to delete.</param>
+		/// <param name="returnId">Unique identifier of the return associated with the replacement package to delete.</param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -281,12 +158,12 @@ public virtual void DeletePackage(string returnId, string packageId)
 		///   await package.DeletePackageAsync( returnId,  packageId);
 		/// </code>
 		/// </example>
-		public virtual async Task DeletePackageAsync(string returnId, string packageId)
+		public virtual async Task DeletePackageAsync(string returnId, string packageId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Returns.PackageClient.DeletePackageClient( returnId,  packageId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/Returns/ShipmentResource.cs b/Mozu.Api/Resources/Commerce/Returns/ShipmentResource.cs
old mode 100644
new mode 100755
index 118ee1d6..b30a9a25
--- a/Mozu.Api/Resources/Commerce/Returns/ShipmentResource.cs
+++ b/Mozu.Api/Resources/Commerce/Returns/ShipmentResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Returns
 {
@@ -37,38 +38,13 @@ public ShipmentResource CloneWithApiContext(Action<IApiContext> contextModificat
 		}
 
 				
-		/// <summary>
-		/// Retrieves the details of the specified return replacement shipment.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
-		/// <param name="shipmentId">Unique identifier of the shipment to retrieve.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Shipment"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var shipment = new Shipment();
-		///   var shipment = shipment.GetShipment( returnId,  shipmentId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Shipment GetShipment(string returnId, string shipmentId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Shipment> response;
-			var client = Mozu.Api.Clients.Commerce.Returns.ShipmentClient.GetShipmentClient( returnId,  shipmentId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of the specified return replacement shipment.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
-		/// <param name="shipmentId">Unique identifier of the shipment to retrieve.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="returnId">Unique identifier of the return associated with the replacement shipment to retrieve.</param>
+		/// <param name="shipmentId">Unique identifier of the return replacement shipment to retrieve.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Shipment"/>
 		/// </returns>
@@ -78,46 +54,22 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Shipment GetShipme
 		///   var shipment = await shipment.GetShipmentAsync( returnId,  shipmentId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Shipment> GetShipmentAsync(string returnId, string shipmentId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Shipment> GetShipmentAsync(string returnId, string shipmentId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Shipment> response;
 			var client = Mozu.Api.Clients.Commerce.Returns.ShipmentClient.GetShipmentClient( returnId,  shipmentId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Creates a shipment from one or more packages associated with a return replacement.
-		/// </summary>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
-		/// <param name="packageIds">List of unique identifiers for each package associated with this shipment. Not all packages must belong to the same shipment.</param>
-		/// <returns>
-		/// List{<see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package"/>}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var shipment = new Shipment();
-		///   var package = shipment.CreatePackageShipments( packageIds,  returnId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package> CreatePackageShipments(List<string> packageIds, string returnId)
-		{
-			MozuClient<List<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package>> response;
-			var client = Mozu.Api.Clients.Commerce.Returns.ShipmentClient.CreatePackageShipmentsClient( packageIds,  returnId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Creates a shipment from one or more packages associated with a return replacement.
+		/// 
 		/// </summary>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
-		/// <param name="packageIds">List of unique identifiers for each package associated with this shipment. Not all packages must belong to the same shipment.</param>
+		/// <param name="returnId">Unique identifier of the return for which to create replacement package shipments.</param>
+		/// <param name="packageIds">List of packages in the return replacement shipment.</param>
 		/// <returns>
 		/// List{<see cref="Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package"/>}
 		/// </returns>
@@ -127,45 +79,22 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Shipment GetShipme
 		///   var package = await shipment.CreatePackageShipmentsAsync( packageIds,  returnId);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package>> CreatePackageShipmentsAsync(List<string> packageIds, string returnId)
+		public virtual async Task<List<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package>> CreatePackageShipmentsAsync(List<string> packageIds, string returnId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<Mozu.Api.Contracts.CommerceRuntime.Fulfillment.Package>> response;
 			var client = Mozu.Api.Clients.Commerce.Returns.ShipmentClient.CreatePackageShipmentsClient( packageIds,  returnId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Deletes a shipment for a return replacement.
-		/// </summary>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
-		/// <param name="shipmentId">Unique identifier of the shipment to retrieve.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var shipment = new Shipment();
-		///   shipment.DeleteShipment( returnId,  shipmentId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteShipment(string returnId, string shipmentId)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Returns.ShipmentClient.DeleteShipmentClient( returnId,  shipmentId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes a shipment for a return replacement.
+		/// 
 		/// </summary>
-		/// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
-		/// <param name="shipmentId">Unique identifier of the shipment to retrieve.</param>
+		/// <param name="returnId">Unique identifier of the return associated with the replacement shipment to delete.</param>
+		/// <param name="shipmentId">Unique identifier of the return replacement shipment to delete.</param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -175,12 +104,12 @@ public virtual void DeleteShipment(string returnId, string shipmentId)
 		///   await shipment.DeleteShipmentAsync( returnId,  shipmentId);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteShipmentAsync(string returnId, string shipmentId)
+		public virtual async Task DeleteShipmentAsync(string returnId, string shipmentId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Returns.ShipmentClient.DeleteShipmentClient( returnId,  shipmentId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/Settings/ApplicationResource.cs b/Mozu.Api/Resources/Commerce/Settings/ApplicationResource.cs
old mode 100644
new mode 100755
index 0504968c..91c9a3cf
--- a/Mozu.Api/Resources/Commerce/Settings/ApplicationResource.cs
+++ b/Mozu.Api/Resources/Commerce/Settings/ApplicationResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Settings
 {
@@ -37,34 +38,11 @@ public ApplicationResource CloneWithApiContext(Action<IApiContext> contextModifi
 		}
 
 				
-		/// <summary>
-		/// Retrieve the settings of a third-party application.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.SiteSettings.Application.Application"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var application = new Application();
-		///   var application = application.ThirdPartyGetApplication( responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.SiteSettings.Application.Application ThirdPartyGetApplication(string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.SiteSettings.Application.Application> response;
-			var client = Mozu.Api.Clients.Commerce.Settings.ApplicationClient.ThirdPartyGetApplicationClient( responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieve the settings of a third-party application.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.SiteSettings.Application.Application"/>
 		/// </returns>
@@ -74,46 +52,22 @@ public virtual Mozu.Api.Contracts.SiteSettings.Application.Application ThirdPart
 		///   var application = await application.ThirdPartyGetApplicationAsync( responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.SiteSettings.Application.Application> ThirdPartyGetApplicationAsync(string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.SiteSettings.Application.Application> ThirdPartyGetApplicationAsync(string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.SiteSettings.Application.Application> response;
 			var client = Mozu.Api.Clients.Commerce.Settings.ApplicationClient.ThirdPartyGetApplicationClient( responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Initializes an application with the necessary configured settings.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="application">Properties of an application installed in a tenant.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.SiteSettings.Application.Application"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var application = new Application();
-		///   var application = application.ThirdPartyUpdateApplication( application,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.SiteSettings.Application.Application ThirdPartyUpdateApplication(Mozu.Api.Contracts.SiteSettings.Application.Application application, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.SiteSettings.Application.Application> response;
-			var client = Mozu.Api.Clients.Commerce.Settings.ApplicationClient.ThirdPartyUpdateApplicationClient( application,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Initializes an application with the necessary configured settings.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="application">Properties of an application installed in a tenant.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="application">Properties of the application to update.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.SiteSettings.Application.Application"/>
 		/// </returns>
@@ -123,12 +77,12 @@ public virtual Mozu.Api.Contracts.SiteSettings.Application.Application ThirdPart
 		///   var application = await application.ThirdPartyUpdateApplicationAsync( application,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.SiteSettings.Application.Application> ThirdPartyUpdateApplicationAsync(Mozu.Api.Contracts.SiteSettings.Application.Application application, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.SiteSettings.Application.Application> ThirdPartyUpdateApplicationAsync(Mozu.Api.Contracts.SiteSettings.Application.Application application, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.SiteSettings.Application.Application> response;
 			var client = Mozu.Api.Clients.Commerce.Settings.ApplicationClient.ThirdPartyUpdateApplicationClient( application,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
diff --git a/Mozu.Api/Resources/Commerce/Settings/CartSettingsResource.cs b/Mozu.Api/Resources/Commerce/Settings/CartSettingsResource.cs
old mode 100644
new mode 100755
index cd8bbd14..c64813d3
--- a/Mozu.Api/Resources/Commerce/Settings/CartSettingsResource.cs
+++ b/Mozu.Api/Resources/Commerce/Settings/CartSettingsResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Settings
 {
 	/// <summary>
-	/// Use the cart subresource to manage settings for the cart, such as whether to include handling fees in the cost calculations.
+	/// 
 	/// </summary>
 	public partial class CartSettingsResource  	{
 		///
@@ -37,34 +38,11 @@ public CartSettingsResource CloneWithApiContext(Action<IApiContext> contextModif
 		}
 
 				
-		/// <summary>
-		/// Retrieves cart settings.
-		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.SiteSettings.Order.CartSettings"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var cartsettings = new CartSettings();
-		///   var cartSettings = cartsettings.GetCartSettings( responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.SiteSettings.Order.CartSettings GetCartSettings(string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.SiteSettings.Order.CartSettings> response;
-			var client = Mozu.Api.Clients.Commerce.Settings.CartSettingsClient.GetCartSettingsClient( responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves cart settings.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.SiteSettings.Order.CartSettings"/>
 		/// </returns>
@@ -74,45 +52,21 @@ public virtual Mozu.Api.Contracts.SiteSettings.Order.CartSettings GetCartSetting
 		///   var cartSettings = await cartsettings.GetCartSettingsAsync( responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.SiteSettings.Order.CartSettings> GetCartSettingsAsync(string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.SiteSettings.Order.CartSettings> GetCartSettingsAsync(string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.SiteSettings.Order.CartSettings> response;
 			var client = Mozu.Api.Clients.Commerce.Settings.CartSettingsClient.GetCartSettingsClient( responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Creates cart settings.
-		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="cartSettings"></param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.SiteSettings.Order.CartSettings"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var cartsettings = new CartSettings();
-		///   var cartSettings = cartsettings.CreateCartSettings( cartSettings,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.SiteSettings.Order.CartSettings CreateCartSettings(Mozu.Api.Contracts.SiteSettings.Order.CartSettings cartSettings, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.SiteSettings.Order.CartSettings> response;
-			var client = Mozu.Api.Clients.Commerce.Settings.CartSettingsClient.CreateCartSettingsClient( cartSettings,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Creates cart settings.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="cartSettings"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.SiteSettings.Order.CartSettings"/>
@@ -123,45 +77,21 @@ public virtual Mozu.Api.Contracts.SiteSettings.Order.CartSettings CreateCartSett
 		///   var cartSettings = await cartsettings.CreateCartSettingsAsync( cartSettings,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.SiteSettings.Order.CartSettings> CreateCartSettingsAsync(Mozu.Api.Contracts.SiteSettings.Order.CartSettings cartSettings, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.SiteSettings.Order.CartSettings> CreateCartSettingsAsync(Mozu.Api.Contracts.SiteSettings.Order.CartSettings cartSettings, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.SiteSettings.Order.CartSettings> response;
 			var client = Mozu.Api.Clients.Commerce.Settings.CartSettingsClient.CreateCartSettingsClient( cartSettings,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates cart settings.
-		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="cartSettings"></param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.SiteSettings.Order.CartSettings"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var cartsettings = new CartSettings();
-		///   var cartSettings = cartsettings.UpdateCartSettings( cartSettings,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.SiteSettings.Order.CartSettings UpdateCartSettings(Mozu.Api.Contracts.SiteSettings.Order.CartSettings cartSettings, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.SiteSettings.Order.CartSettings> response;
-			var client = Mozu.Api.Clients.Commerce.Settings.CartSettingsClient.UpdateCartSettingsClient( cartSettings,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates cart settings.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="cartSettings"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.SiteSettings.Order.CartSettings"/>
@@ -172,12 +102,12 @@ public virtual Mozu.Api.Contracts.SiteSettings.Order.CartSettings UpdateCartSett
 		///   var cartSettings = await cartsettings.UpdateCartSettingsAsync( cartSettings,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.SiteSettings.Order.CartSettings> UpdateCartSettingsAsync(Mozu.Api.Contracts.SiteSettings.Order.CartSettings cartSettings, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.SiteSettings.Order.CartSettings> UpdateCartSettingsAsync(Mozu.Api.Contracts.SiteSettings.Order.CartSettings cartSettings, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.SiteSettings.Order.CartSettings> response;
 			var client = Mozu.Api.Clients.Commerce.Settings.CartSettingsClient.UpdateCartSettingsClient( cartSettings,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
diff --git a/Mozu.Api/Resources/Commerce/Settings/Checkout/CustomerCheckoutSettingsResource.cs b/Mozu.Api/Resources/Commerce/Settings/Checkout/CustomerCheckoutSettingsResource.cs
old mode 100644
new mode 100755
index 44a7ba70..d130f9b0
--- a/Mozu.Api/Resources/Commerce/Settings/Checkout/CustomerCheckoutSettingsResource.cs
+++ b/Mozu.Api/Resources/Commerce/Settings/Checkout/CustomerCheckoutSettingsResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Settings.Checkout
 {
@@ -37,34 +38,11 @@ public CustomerCheckoutSettingsResource CloneWithApiContext(Action<IApiContext>
 		}
 
 				
-		/// <summary>
-		/// Retrieves all checkout settings defined for the site: Payment settings, such as the payment gateway ID and credentials, supported credit cards, and more; Customer Checkout settings, such as whether login is required, and any custom attributes; and Order Processing settings, such as when payment is authorized and captured, and any custom attributes.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.SiteSettings.Order.CustomerCheckoutSettings"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var customercheckoutsettings = new CustomerCheckoutSettings();
-		///   var customerCheckoutSettings = customercheckoutsettings.GetCustomerCheckoutSettings( responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.SiteSettings.Order.CustomerCheckoutSettings GetCustomerCheckoutSettings(string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.SiteSettings.Order.CustomerCheckoutSettings> response;
-			var client = Mozu.Api.Clients.Commerce.Settings.Checkout.CustomerCheckoutSettingsClient.GetCustomerCheckoutSettingsClient( responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves all checkout settings defined for the site: Payment settings, such as the payment gateway ID and credentials, supported credit cards, and more; Customer Checkout settings, such as whether login is required, and any custom attributes; and Order Processing settings, such as when payment is authorized and captured, and any custom attributes.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.SiteSettings.Order.CustomerCheckoutSettings"/>
 		/// </returns>
@@ -74,46 +52,22 @@ public virtual Mozu.Api.Contracts.SiteSettings.Order.CustomerCheckoutSettings Ge
 		///   var customerCheckoutSettings = await customercheckoutsettings.GetCustomerCheckoutSettingsAsync( responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.SiteSettings.Order.CustomerCheckoutSettings> GetCustomerCheckoutSettingsAsync(string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.SiteSettings.Order.CustomerCheckoutSettings> GetCustomerCheckoutSettingsAsync(string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.SiteSettings.Order.CustomerCheckoutSettings> response;
 			var client = Mozu.Api.Clients.Commerce.Settings.Checkout.CustomerCheckoutSettingsClient.GetCustomerCheckoutSettingsClient( responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Modifies existing site checkout settings. Modify Payment, Customer Checkout, and Order Processing settings in one PUT.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="customerCheckoutSettings">The properties of the customer checkout settings such as whether shoppers must be logged in.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.SiteSettings.Order.CustomerCheckoutSettings"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var customercheckoutsettings = new CustomerCheckoutSettings();
-		///   var customerCheckoutSettings = customercheckoutsettings.UpdateCustomerCheckoutSettings( customerCheckoutSettings,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.SiteSettings.Order.CustomerCheckoutSettings UpdateCustomerCheckoutSettings(Mozu.Api.Contracts.SiteSettings.Order.CustomerCheckoutSettings customerCheckoutSettings, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.SiteSettings.Order.CustomerCheckoutSettings> response;
-			var client = Mozu.Api.Clients.Commerce.Settings.Checkout.CustomerCheckoutSettingsClient.UpdateCustomerCheckoutSettingsClient( customerCheckoutSettings,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Modifies existing site checkout settings. Modify Payment, Customer Checkout, and Order Processing settings in one PUT.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="customerCheckoutSettings">The properties of the customer checkout settings such as whether shoppers must be logged in.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="customerCheckoutSettings">All the properties to update in the checkout settings.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.SiteSettings.Order.CustomerCheckoutSettings"/>
 		/// </returns>
@@ -123,12 +77,12 @@ public virtual Mozu.Api.Contracts.SiteSettings.Order.CustomerCheckoutSettings Up
 		///   var customerCheckoutSettings = await customercheckoutsettings.UpdateCustomerCheckoutSettingsAsync( customerCheckoutSettings,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.SiteSettings.Order.CustomerCheckoutSettings> UpdateCustomerCheckoutSettingsAsync(Mozu.Api.Contracts.SiteSettings.Order.CustomerCheckoutSettings customerCheckoutSettings, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.SiteSettings.Order.CustomerCheckoutSettings> UpdateCustomerCheckoutSettingsAsync(Mozu.Api.Contracts.SiteSettings.Order.CustomerCheckoutSettings customerCheckoutSettings, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.SiteSettings.Order.CustomerCheckoutSettings> response;
 			var client = Mozu.Api.Clients.Commerce.Settings.Checkout.CustomerCheckoutSettingsClient.UpdateCustomerCheckoutSettingsClient( customerCheckoutSettings,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
diff --git a/Mozu.Api/Resources/Commerce/Settings/Checkout/PaymentSettingsResource.cs b/Mozu.Api/Resources/Commerce/Settings/Checkout/PaymentSettingsResource.cs
old mode 100644
new mode 100755
index ed04524d..dee4642b
--- a/Mozu.Api/Resources/Commerce/Settings/Checkout/PaymentSettingsResource.cs
+++ b/Mozu.Api/Resources/Commerce/Settings/Checkout/PaymentSettingsResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Settings.Checkout
 {
@@ -37,36 +38,12 @@ public PaymentSettingsResource CloneWithApiContext(Action<IApiContext> contextMo
 		}
 
 				
-		/// <summary>
-		/// Retrieves the schema and definition along with the actual instance values of the third-party payment service workflow configured for the corresponding fully qualified name.
-		/// </summary>
-		/// <param name="fullyQualifiedName">Fully qualified name of the attribute for the third-party payment workflow.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.SiteSettings.Order.ExternalPaymentWorkflowDefinition"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var paymentsettings = new PaymentSettings();
-		///   var externalPaymentWorkflowDefinition = paymentsettings.GetThirdPartyPaymentWorkflowWithValues( fullyQualifiedName,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.SiteSettings.Order.ExternalPaymentWorkflowDefinition GetThirdPartyPaymentWorkflowWithValues(string fullyQualifiedName, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.SiteSettings.Order.ExternalPaymentWorkflowDefinition> response;
-			var client = Mozu.Api.Clients.Commerce.Settings.Checkout.PaymentSettingsClient.GetThirdPartyPaymentWorkflowWithValuesClient( fullyQualifiedName,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the schema and definition along with the actual instance values of the third-party payment service workflow configured for the corresponding fully qualified name.
+		/// 
 		/// </summary>
-		/// <param name="fullyQualifiedName">Fully qualified name of the attribute for the third-party payment workflow.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="fullyQualifiedName"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.SiteSettings.Order.ExternalPaymentWorkflowDefinition"/>
 		/// </returns>
@@ -76,41 +53,19 @@ public virtual Mozu.Api.Contracts.SiteSettings.Order.ExternalPaymentWorkflowDefi
 		///   var externalPaymentWorkflowDefinition = await paymentsettings.GetThirdPartyPaymentWorkflowWithValuesAsync( fullyQualifiedName,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.SiteSettings.Order.ExternalPaymentWorkflowDefinition> GetThirdPartyPaymentWorkflowWithValuesAsync(string fullyQualifiedName, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.SiteSettings.Order.ExternalPaymentWorkflowDefinition> GetThirdPartyPaymentWorkflowWithValuesAsync(string fullyQualifiedName, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.SiteSettings.Order.ExternalPaymentWorkflowDefinition> response;
 			var client = Mozu.Api.Clients.Commerce.Settings.Checkout.PaymentSettingsClient.GetThirdPartyPaymentWorkflowWithValuesClient( fullyQualifiedName,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the schema and definition of all third-party payment service workflows configured for the site.
-		/// </summary>
-		/// <returns>
-		/// List{<see cref="Mozu.Api.Contracts.SiteSettings.Order.ExternalPaymentWorkflowDefinition"/>}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var paymentsettings = new PaymentSettings();
-		///   var externalPaymentWorkflowDefinition = paymentsettings.GetThirdPartyPaymentWorkflows();
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<Mozu.Api.Contracts.SiteSettings.Order.ExternalPaymentWorkflowDefinition> GetThirdPartyPaymentWorkflows()
-		{
-			MozuClient<List<Mozu.Api.Contracts.SiteSettings.Order.ExternalPaymentWorkflowDefinition>> response;
-			var client = Mozu.Api.Clients.Commerce.Settings.Checkout.PaymentSettingsClient.GetThirdPartyPaymentWorkflowsClient();
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the schema and definition of all third-party payment service workflows configured for the site.
+		/// 
 		/// </summary>
 		/// <returns>
 		/// List{<see cref="Mozu.Api.Contracts.SiteSettings.Order.ExternalPaymentWorkflowDefinition"/>}
@@ -121,43 +76,21 @@ public virtual Mozu.Api.Contracts.SiteSettings.Order.ExternalPaymentWorkflowDefi
 		///   var externalPaymentWorkflowDefinition = await paymentsettings.GetThirdPartyPaymentWorkflowsAsync();
 		/// </code>
 		/// </example>
-		public virtual async Task<List<Mozu.Api.Contracts.SiteSettings.Order.ExternalPaymentWorkflowDefinition>> GetThirdPartyPaymentWorkflowsAsync()
+		public virtual async Task<List<Mozu.Api.Contracts.SiteSettings.Order.ExternalPaymentWorkflowDefinition>> GetThirdPartyPaymentWorkflowsAsync(CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<Mozu.Api.Contracts.SiteSettings.Order.ExternalPaymentWorkflowDefinition>> response;
 			var client = Mozu.Api.Clients.Commerce.Settings.Checkout.PaymentSettingsClient.GetThirdPartyPaymentWorkflowsClient();
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Adds a third-party payment workflow to the site. A third-party payment workflow is a definition of a process by which a third-party payment provider (such as Amazon Payments or PayPal Express) interacts with the  platform.
-		/// </summary>
-		/// <param name="definition">Properties of an external payment processing workflow defined for the site. At this time, only PayPal Express is supported.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var paymentsettings = new PaymentSettings();
-		///   paymentsettings.AddThirdPartyPaymentWorkflow( definition);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void AddThirdPartyPaymentWorkflow(Mozu.Api.Contracts.SiteSettings.Order.ExternalPaymentWorkflowDefinition definition)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Settings.Checkout.PaymentSettingsClient.AddThirdPartyPaymentWorkflowClient( definition);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Adds a third-party payment workflow to the site. A third-party payment workflow is a definition of a process by which a third-party payment provider (such as Amazon Payments or PayPal Express) interacts with the  platform.
+		/// 
 		/// </summary>
-		/// <param name="definition">Properties of an external payment processing workflow defined for the site. At this time, only PayPal Express is supported.</param>
+		/// <param name="definition"></param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -167,42 +100,20 @@ public virtual void AddThirdPartyPaymentWorkflow(Mozu.Api.Contracts.SiteSettings
 		///   await paymentsettings.AddThirdPartyPaymentWorkflowAsync( definition);
 		/// </code>
 		/// </example>
-		public virtual async Task AddThirdPartyPaymentWorkflowAsync(Mozu.Api.Contracts.SiteSettings.Order.ExternalPaymentWorkflowDefinition definition)
+		public virtual async Task AddThirdPartyPaymentWorkflowAsync(Mozu.Api.Contracts.SiteSettings.Order.ExternalPaymentWorkflowDefinition definition, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Settings.Checkout.PaymentSettingsClient.AddThirdPartyPaymentWorkflowClient( definition);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
-		/// <summary>
-		/// Deletes a third-party payment workflow. A third-party payment workflow is a definition of a process by which a third-party payment provider (such as Amazon Payments or PayPal Express) interacts with the  platform. 
-		/// </summary>
-		/// <param name="fullyQualifiedName">Fully qualified name of the attribute for the third-party payment workflow.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var paymentsettings = new PaymentSettings();
-		///   paymentsettings.DeleteThirdPartyPaymentWorkflow( fullyQualifiedName);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteThirdPartyPaymentWorkflow(string fullyQualifiedName)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Settings.Checkout.PaymentSettingsClient.DeleteThirdPartyPaymentWorkflowClient( fullyQualifiedName);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes a third-party payment workflow. A third-party payment workflow is a definition of a process by which a third-party payment provider (such as Amazon Payments or PayPal Express) interacts with the  platform. 
+		/// 
 		/// </summary>
-		/// <param name="fullyQualifiedName">Fully qualified name of the attribute for the third-party payment workflow.</param>
+		/// <param name="fullyQualifiedName"></param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -212,12 +123,12 @@ public virtual void DeleteThirdPartyPaymentWorkflow(string fullyQualifiedName)
 		///   await paymentsettings.DeleteThirdPartyPaymentWorkflowAsync( fullyQualifiedName);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteThirdPartyPaymentWorkflowAsync(string fullyQualifiedName)
+		public virtual async Task DeleteThirdPartyPaymentWorkflowAsync(string fullyQualifiedName, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Settings.Checkout.PaymentSettingsClient.DeleteThirdPartyPaymentWorkflowClient( fullyQualifiedName);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/Settings/CheckoutSettingsResource.cs b/Mozu.Api/Resources/Commerce/Settings/CheckoutSettingsResource.cs
old mode 100644
new mode 100755
index 15bb05a4..06f57272
--- a/Mozu.Api/Resources/Commerce/Settings/CheckoutSettingsResource.cs
+++ b/Mozu.Api/Resources/Commerce/Settings/CheckoutSettingsResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Settings
 {
@@ -37,34 +38,11 @@ public CheckoutSettingsResource CloneWithApiContext(Action<IApiContext> contextM
 		}
 
 				
-		/// <summary>
-		/// Retrieves all checkout settings defined for the site including payment settings (payment gateway ID and credentials), shopper checkout settings (login requirement or guest mode and custom attributes), and order processing settings (when payment is authorized and captured plus any custom attributes).
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.SiteSettings.Order.CheckoutSettings"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var checkoutsettings = new CheckoutSettings();
-		///   var checkoutSettings = checkoutsettings.GetCheckoutSettings( responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.SiteSettings.Order.CheckoutSettings GetCheckoutSettings(string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.SiteSettings.Order.CheckoutSettings> response;
-			var client = Mozu.Api.Clients.Commerce.Settings.CheckoutSettingsClient.GetCheckoutSettingsClient( responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves all checkout settings defined for the site including payment settings (payment gateway ID and credentials), shopper checkout settings (login requirement or guest mode and custom attributes), and order processing settings (when payment is authorized and captured plus any custom attributes).
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.SiteSettings.Order.CheckoutSettings"/>
 		/// </returns>
@@ -74,12 +52,12 @@ public virtual Mozu.Api.Contracts.SiteSettings.Order.CheckoutSettings GetCheckou
 		///   var checkoutSettings = await checkoutsettings.GetCheckoutSettingsAsync( responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.SiteSettings.Order.CheckoutSettings> GetCheckoutSettingsAsync(string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.SiteSettings.Order.CheckoutSettings> GetCheckoutSettingsAsync(string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.SiteSettings.Order.CheckoutSettings> response;
 			var client = Mozu.Api.Clients.Commerce.Settings.CheckoutSettingsClient.GetCheckoutSettingsClient( responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
diff --git a/Mozu.Api/Resources/Commerce/Settings/General/CustomRouteSettingsResource.cs b/Mozu.Api/Resources/Commerce/Settings/General/CustomRouteSettingsResource.cs
old mode 100644
new mode 100755
index 2810131e..818f0a3f
--- a/Mozu.Api/Resources/Commerce/Settings/General/CustomRouteSettingsResource.cs
+++ b/Mozu.Api/Resources/Commerce/Settings/General/CustomRouteSettingsResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Settings.General
 {
 	/// <summary>
-	/// Use the Custom Routes resource to manage your custom route settings. Custom routing allows you to display SEO-friendly URLs on your site that map behind-the-scenes to conventional  resources such as a product page or a search results page. With custom routing, you gain advanced control over the URL structures on your site and can more visibly highlight the products or categories your shoppers are interested in purchasing.To learn more about custom routing, refer to the [Custom Route Settings](../../../guides/settings/custom-routes.htm) topic.
+	/// 
 	/// </summary>
 	public partial class CustomRouteSettingsResource  	{
 		///
@@ -37,34 +38,11 @@ public CustomRouteSettingsResource CloneWithApiContext(Action<IApiContext> conte
 		}
 
 				
-		/// <summary>
-		/// Retrieves the custom route settings configured for a site. These are the same settings configured through  in the Custom Routing JSON Editor.
-		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.SiteSettings.General.General.Routing.CustomRouteSettings"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var customroutesettings = new CustomRouteSettings();
-		///   var customRouteSettings = customroutesettings.GetCustomRouteSettings( responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.SiteSettings.General.General.Routing.CustomRouteSettings GetCustomRouteSettings(string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.SiteSettings.General.General.Routing.CustomRouteSettings> response;
-			var client = Mozu.Api.Clients.Commerce.Settings.General.CustomRouteSettingsClient.GetCustomRouteSettingsClient( responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the custom route settings configured for a site. These are the same settings configured through  in the Custom Routing JSON Editor.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.SiteSettings.General.General.Routing.CustomRouteSettings"/>
 		/// </returns>
@@ -74,46 +52,22 @@ public virtual Mozu.Api.Contracts.SiteSettings.General.General.Routing.CustomRou
 		///   var customRouteSettings = await customroutesettings.GetCustomRouteSettingsAsync( responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.SiteSettings.General.General.Routing.CustomRouteSettings> GetCustomRouteSettingsAsync(string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.SiteSettings.General.General.Routing.CustomRouteSettings> GetCustomRouteSettingsAsync(string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.SiteSettings.General.General.Routing.CustomRouteSettings> response;
 			var client = Mozu.Api.Clients.Commerce.Settings.General.CustomRouteSettingsClient.GetCustomRouteSettingsClient( responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Create new custom route settings.
-		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="settings">The details of the new custom route setting.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.SiteSettings.General.General.Routing.CustomRouteSettings"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var customroutesettings = new CustomRouteSettings();
-		///   var customRouteSettings = customroutesettings.CreateCustomRouteSettings( settings,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.SiteSettings.General.General.Routing.CustomRouteSettings CreateCustomRouteSettings(Mozu.Api.Contracts.SiteSettings.General.General.Routing.CustomRouteSettings settings, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.SiteSettings.General.General.Routing.CustomRouteSettings> response;
-			var client = Mozu.Api.Clients.Commerce.Settings.General.CustomRouteSettingsClient.CreateCustomRouteSettingsClient( settings,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Create new custom route settings.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="settings">The details of the new custom route setting.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="settings"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.SiteSettings.General.General.Routing.CustomRouteSettings"/>
 		/// </returns>
@@ -123,46 +77,22 @@ public virtual Mozu.Api.Contracts.SiteSettings.General.General.Routing.CustomRou
 		///   var customRouteSettings = await customroutesettings.CreateCustomRouteSettingsAsync( settings,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.SiteSettings.General.General.Routing.CustomRouteSettings> CreateCustomRouteSettingsAsync(Mozu.Api.Contracts.SiteSettings.General.General.Routing.CustomRouteSettings settings, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.SiteSettings.General.General.Routing.CustomRouteSettings> CreateCustomRouteSettingsAsync(Mozu.Api.Contracts.SiteSettings.General.General.Routing.CustomRouteSettings settings, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.SiteSettings.General.General.Routing.CustomRouteSettings> response;
 			var client = Mozu.Api.Clients.Commerce.Settings.General.CustomRouteSettingsClient.CreateCustomRouteSettingsClient( settings,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates custom route settings.
-		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="settings">The updated details of the custom route settings.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.SiteSettings.General.General.Routing.CustomRouteSettings"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var customroutesettings = new CustomRouteSettings();
-		///   var customRouteSettings = customroutesettings.UpdateCustomRouteSettings( settings,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.SiteSettings.General.General.Routing.CustomRouteSettings UpdateCustomRouteSettings(Mozu.Api.Contracts.SiteSettings.General.General.Routing.CustomRouteSettings settings, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.SiteSettings.General.General.Routing.CustomRouteSettings> response;
-			var client = Mozu.Api.Clients.Commerce.Settings.General.CustomRouteSettingsClient.UpdateCustomRouteSettingsClient( settings,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates custom route settings.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="settings">The updated details of the custom route settings.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="settings"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.SiteSettings.General.General.Routing.CustomRouteSettings"/>
 		/// </returns>
@@ -172,40 +102,19 @@ public virtual Mozu.Api.Contracts.SiteSettings.General.General.Routing.CustomRou
 		///   var customRouteSettings = await customroutesettings.UpdateCustomRouteSettingsAsync( settings,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.SiteSettings.General.General.Routing.CustomRouteSettings> UpdateCustomRouteSettingsAsync(Mozu.Api.Contracts.SiteSettings.General.General.Routing.CustomRouteSettings settings, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.SiteSettings.General.General.Routing.CustomRouteSettings> UpdateCustomRouteSettingsAsync(Mozu.Api.Contracts.SiteSettings.General.General.Routing.CustomRouteSettings settings, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.SiteSettings.General.General.Routing.CustomRouteSettings> response;
 			var client = Mozu.Api.Clients.Commerce.Settings.General.CustomRouteSettingsClient.UpdateCustomRouteSettingsClient( settings,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Deletes all the custom route settings for a site, returning all routes to their  defaults.
-		/// </summary>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var customroutesettings = new CustomRouteSettings();
-		///   customroutesettings.DeleteCustomRouteSettings();
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteCustomRouteSettings()
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Settings.General.CustomRouteSettingsClient.DeleteCustomRouteSettingsClient();
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes all the custom route settings for a site, returning all routes to their  defaults.
+		/// 
 		/// </summary>
 		/// <returns>
 		/// 
@@ -216,12 +125,12 @@ public virtual void DeleteCustomRouteSettings()
 		///   await customroutesettings.DeleteCustomRouteSettingsAsync();
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteCustomRouteSettingsAsync()
+		public virtual async Task DeleteCustomRouteSettingsAsync(CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Settings.General.CustomRouteSettingsClient.DeleteCustomRouteSettingsClient();
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/Settings/General/TaxableTerritoryResource.cs b/Mozu.Api/Resources/Commerce/Settings/General/TaxableTerritoryResource.cs
old mode 100644
new mode 100755
index 32a30684..9279bda9
--- a/Mozu.Api/Resources/Commerce/Settings/General/TaxableTerritoryResource.cs
+++ b/Mozu.Api/Resources/Commerce/Settings/General/TaxableTerritoryResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Settings.General
 {
@@ -37,31 +38,9 @@ public TaxableTerritoryResource CloneWithApiContext(Action<IApiContext> contextM
 		}
 
 				
-		/// <summary>
-		/// Retrieves a list of the taxable territories configured for the site.
-		/// </summary>
-		/// <returns>
-		/// List{<see cref="Mozu.Api.Contracts.SiteSettings.General.TaxableTerritory"/>}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var taxableterritory = new TaxableTerritory();
-		///   var taxableTerritory = taxableterritory.GetTaxableTerritories();
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<Mozu.Api.Contracts.SiteSettings.General.TaxableTerritory> GetTaxableTerritories()
-		{
-			MozuClient<List<Mozu.Api.Contracts.SiteSettings.General.TaxableTerritory>> response;
-			var client = Mozu.Api.Clients.Commerce.Settings.General.TaxableTerritoryClient.GetTaxableTerritoriesClient();
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of the taxable territories configured for the site.
+		/// 
 		/// </summary>
 		/// <returns>
 		/// List{<see cref="Mozu.Api.Contracts.SiteSettings.General.TaxableTerritory"/>}
@@ -72,46 +51,22 @@ public TaxableTerritoryResource CloneWithApiContext(Action<IApiContext> contextM
 		///   var taxableTerritory = await taxableterritory.GetTaxableTerritoriesAsync();
 		/// </code>
 		/// </example>
-		public virtual async Task<List<Mozu.Api.Contracts.SiteSettings.General.TaxableTerritory>> GetTaxableTerritoriesAsync()
+		public virtual async Task<List<Mozu.Api.Contracts.SiteSettings.General.TaxableTerritory>> GetTaxableTerritoriesAsync(CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<Mozu.Api.Contracts.SiteSettings.General.TaxableTerritory>> response;
 			var client = Mozu.Api.Clients.Commerce.Settings.General.TaxableTerritoryClient.GetTaxableTerritoriesClient();
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Creates a new territory for which to calculate sales tax.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="taxableTerritory">Properties of the territory which is subject to sales tax.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.SiteSettings.General.TaxableTerritory"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var taxableterritory = new TaxableTerritory();
-		///   var taxableTerritory = taxableterritory.AddTaxableTerritory( taxableTerritory,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.SiteSettings.General.TaxableTerritory AddTaxableTerritory(Mozu.Api.Contracts.SiteSettings.General.TaxableTerritory taxableTerritory, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.SiteSettings.General.TaxableTerritory> response;
-			var client = Mozu.Api.Clients.Commerce.Settings.General.TaxableTerritoryClient.AddTaxableTerritoryClient( taxableTerritory,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Creates a new territory for which to calculate sales tax.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="taxableTerritory">Properties of the territory which is subject to sales tax.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="taxableTerritory">Properties of the taxable territory to create.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.SiteSettings.General.TaxableTerritory"/>
 		/// </returns>
@@ -121,44 +76,21 @@ public virtual Mozu.Api.Contracts.SiteSettings.General.TaxableTerritory AddTaxab
 		///   var taxableTerritory = await taxableterritory.AddTaxableTerritoryAsync( taxableTerritory,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.SiteSettings.General.TaxableTerritory> AddTaxableTerritoryAsync(Mozu.Api.Contracts.SiteSettings.General.TaxableTerritory taxableTerritory, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.SiteSettings.General.TaxableTerritory> AddTaxableTerritoryAsync(Mozu.Api.Contracts.SiteSettings.General.TaxableTerritory taxableTerritory, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.SiteSettings.General.TaxableTerritory> response;
 			var client = Mozu.Api.Clients.Commerce.Settings.General.TaxableTerritoryClient.AddTaxableTerritoryClient( taxableTerritory,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates one or more taxable territories configured for a site.
-		/// </summary>
-		/// <param name="taxableterritories">Properties of the territory which is subject to sales tax.</param>
-		/// <returns>
-		/// List{<see cref="Mozu.Api.Contracts.SiteSettings.General.TaxableTerritory"/>}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var taxableterritory = new TaxableTerritory();
-		///   var taxableTerritory = taxableterritory.UpdateTaxableTerritories( taxableterritories);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<Mozu.Api.Contracts.SiteSettings.General.TaxableTerritory> UpdateTaxableTerritories(List<Mozu.Api.Contracts.SiteSettings.General.TaxableTerritory> taxableterritories)
-		{
-			MozuClient<List<Mozu.Api.Contracts.SiteSettings.General.TaxableTerritory>> response;
-			var client = Mozu.Api.Clients.Commerce.Settings.General.TaxableTerritoryClient.UpdateTaxableTerritoriesClient( taxableterritories);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates one or more taxable territories configured for a site.
+		/// 
 		/// </summary>
-		/// <param name="taxableterritories">Properties of the territory which is subject to sales tax.</param>
+		/// <param name="taxableterritories">Properties of the taxable territories to update.</param>
 		/// <returns>
 		/// List{<see cref="Mozu.Api.Contracts.SiteSettings.General.TaxableTerritory"/>}
 		/// </returns>
@@ -168,12 +100,12 @@ public virtual Mozu.Api.Contracts.SiteSettings.General.TaxableTerritory AddTaxab
 		///   var taxableTerritory = await taxableterritory.UpdateTaxableTerritoriesAsync( taxableterritories);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<Mozu.Api.Contracts.SiteSettings.General.TaxableTerritory>> UpdateTaxableTerritoriesAsync(List<Mozu.Api.Contracts.SiteSettings.General.TaxableTerritory> taxableterritories)
+		public virtual async Task<List<Mozu.Api.Contracts.SiteSettings.General.TaxableTerritory>> UpdateTaxableTerritoriesAsync(List<Mozu.Api.Contracts.SiteSettings.General.TaxableTerritory> taxableterritories, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<Mozu.Api.Contracts.SiteSettings.General.TaxableTerritory>> response;
 			var client = Mozu.Api.Clients.Commerce.Settings.General.TaxableTerritoryClient.UpdateTaxableTerritoriesClient( taxableterritories);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
diff --git a/Mozu.Api/Resources/Commerce/Settings/GeneralSettingsResource.cs b/Mozu.Api/Resources/Commerce/Settings/GeneralSettingsResource.cs
old mode 100644
new mode 100755
index 2aa7626b..cf5e5b8a
--- a/Mozu.Api/Resources/Commerce/Settings/GeneralSettingsResource.cs
+++ b/Mozu.Api/Resources/Commerce/Settings/GeneralSettingsResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Settings
 {
@@ -37,34 +38,11 @@ public GeneralSettingsResource CloneWithApiContext(Action<IApiContext> contextMo
 		}
 
 				
-		/// <summary>
-		/// Retrieve a site's general global settings.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.SiteSettings.General.GeneralSettings"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var generalsettings = new GeneralSettings();
-		///   var generalSettings = generalsettings.GetGeneralSettings( responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.SiteSettings.General.GeneralSettings GetGeneralSettings(string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.SiteSettings.General.GeneralSettings> response;
-			var client = Mozu.Api.Clients.Commerce.Settings.GeneralSettingsClient.GetGeneralSettingsClient( responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieve a site's general global settings.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.SiteSettings.General.GeneralSettings"/>
 		/// </returns>
@@ -74,46 +52,22 @@ public virtual Mozu.Api.Contracts.SiteSettings.General.GeneralSettings GetGenera
 		///   var generalSettings = await generalsettings.GetGeneralSettingsAsync( responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.SiteSettings.General.GeneralSettings> GetGeneralSettingsAsync(string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.SiteSettings.General.GeneralSettings> GetGeneralSettingsAsync(string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.SiteSettings.General.GeneralSettings> response;
 			var client = Mozu.Api.Clients.Commerce.Settings.GeneralSettingsClient.GetGeneralSettingsClient( responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates a site's general global settings.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="generalSettings">General settings used on the storefront site.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.SiteSettings.General.GeneralSettings"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var generalsettings = new GeneralSettings();
-		///   var generalSettings = generalsettings.UpdateGeneralSettings( generalSettings,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.SiteSettings.General.GeneralSettings UpdateGeneralSettings(Mozu.Api.Contracts.SiteSettings.General.GeneralSettings generalSettings, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.SiteSettings.General.GeneralSettings> response;
-			var client = Mozu.Api.Clients.Commerce.Settings.GeneralSettingsClient.UpdateGeneralSettingsClient( generalSettings,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates a site's general global settings.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="generalSettings">General settings used on the storefront site.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="generalSettings">The properties of the site's general settings to update.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.SiteSettings.General.GeneralSettings"/>
 		/// </returns>
@@ -123,12 +77,12 @@ public virtual Mozu.Api.Contracts.SiteSettings.General.GeneralSettings UpdateGen
 		///   var generalSettings = await generalsettings.UpdateGeneralSettingsAsync( generalSettings,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.SiteSettings.General.GeneralSettings> UpdateGeneralSettingsAsync(Mozu.Api.Contracts.SiteSettings.General.GeneralSettings generalSettings, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.SiteSettings.General.GeneralSettings> UpdateGeneralSettingsAsync(Mozu.Api.Contracts.SiteSettings.General.GeneralSettings generalSettings, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.SiteSettings.General.GeneralSettings> response;
 			var client = Mozu.Api.Clients.Commerce.Settings.GeneralSettingsClient.UpdateGeneralSettingsClient( generalSettings,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
diff --git a/Mozu.Api/Resources/Commerce/Settings/LocationUsageResource.cs b/Mozu.Api/Resources/Commerce/Settings/LocationUsageResource.cs
old mode 100644
new mode 100755
index 8633a936..11216b52
--- a/Mozu.Api/Resources/Commerce/Settings/LocationUsageResource.cs
+++ b/Mozu.Api/Resources/Commerce/Settings/LocationUsageResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Settings
 {
@@ -37,34 +38,11 @@ public LocationUsageResource CloneWithApiContext(Action<IApiContext> contextModi
 		}
 
 				
-		/// <summary>
-		/// Retrieves the configured site location usages for the location usage code specified in the request.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Location.LocationUsageCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var locationusage = new LocationUsage();
-		///   var locationUsageCollection = locationusage.GetLocationUsages( responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Location.LocationUsageCollection GetLocationUsages(string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Location.LocationUsageCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Settings.LocationUsageClient.GetLocationUsagesClient( responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the configured site location usages for the location usage code specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Location.LocationUsageCollection"/>
 		/// </returns>
@@ -74,46 +52,22 @@ public virtual Mozu.Api.Contracts.Location.LocationUsageCollection GetLocationUs
 		///   var locationUsageCollection = await locationusage.GetLocationUsagesAsync( responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Location.LocationUsageCollection> GetLocationUsagesAsync(string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Location.LocationUsageCollection> GetLocationUsagesAsync(string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Location.LocationUsageCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Settings.LocationUsageClient.GetLocationUsagesClient( responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the location usages for the site specified in the request header.
-		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Location.LocationUsage"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var locationusage = new LocationUsage();
-		///   var locationUsage = locationusage.GetLocationUsage( code,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Location.LocationUsage GetLocationUsage(string code, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Location.LocationUsage> response;
-			var client = Mozu.Api.Clients.Commerce.Settings.LocationUsageClient.GetLocationUsageClient( code,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the location usages for the site specified in the request header.
+		/// 
 		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="code">Code that identifies the location usage type, which is "DS" for direct ship, "SP" for in-store pickup, or "storeFinder" for store finder.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Location.LocationUsage"/>
 		/// </returns>
@@ -123,48 +77,23 @@ public virtual Mozu.Api.Contracts.Location.LocationUsage GetLocationUsage(string
 		///   var locationUsage = await locationusage.GetLocationUsageAsync( code,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Location.LocationUsage> GetLocationUsageAsync(string code, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Location.LocationUsage> GetLocationUsageAsync(string code, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Location.LocationUsage> response;
 			var client = Mozu.Api.Clients.Commerce.Settings.LocationUsageClient.GetLocationUsageClient( code,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates the location usage for the site based on the location usage code specified in the request.
-		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="usage">Configuration properties of a location usage type for a specified site. The direct ship location usage type consists of a single location that represents location that supports direct ship (DS) fulfillment. The in-store pickup location usage type consists of a list of location types that represent locations that support in-store pickup (SP) fulfillment. The store finder location usage type consists of a list of location codes, location types, or both.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Location.LocationUsage"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var locationusage = new LocationUsage();
-		///   var locationUsage = locationusage.UpdateLocationUsage( usage,  code,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Location.LocationUsage UpdateLocationUsage(Mozu.Api.Contracts.Location.LocationUsage usage, string code, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Location.LocationUsage> response;
-			var client = Mozu.Api.Clients.Commerce.Settings.LocationUsageClient.UpdateLocationUsageClient( usage,  code,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates the location usage for the site based on the location usage code specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="usage">Configuration properties of a location usage type for a specified site. The direct ship location usage type consists of a single location that represents location that supports direct ship (DS) fulfillment. The in-store pickup location usage type consists of a list of location types that represent locations that support in-store pickup (SP) fulfillment. The store finder location usage type consists of a list of location codes, location types, or both.</param>
+		/// <param name="code">Code that identifies the location usage type, which is "DS" for direct ship, "SP" for in-store pickup, or "storeFinder" for store finder.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="usage">Properties of the location usage type to update.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Location.LocationUsage"/>
 		/// </returns>
@@ -174,12 +103,12 @@ public virtual Mozu.Api.Contracts.Location.LocationUsage UpdateLocationUsage(Moz
 		///   var locationUsage = await locationusage.UpdateLocationUsageAsync( usage,  code,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Location.LocationUsage> UpdateLocationUsageAsync(Mozu.Api.Contracts.Location.LocationUsage usage, string code, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Location.LocationUsage> UpdateLocationUsageAsync(Mozu.Api.Contracts.Location.LocationUsage usage, string code, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Location.LocationUsage> response;
 			var client = Mozu.Api.Clients.Commerce.Settings.LocationUsageClient.UpdateLocationUsageClient( usage,  code,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
diff --git a/Mozu.Api/Resources/Commerce/Settings/Shipping/SiteShippingHandlingFeeResource.cs b/Mozu.Api/Resources/Commerce/Settings/Shipping/SiteShippingHandlingFeeResource.cs
old mode 100644
new mode 100755
index 05a1d616..46118cba
--- a/Mozu.Api/Resources/Commerce/Settings/Shipping/SiteShippingHandlingFeeResource.cs
+++ b/Mozu.Api/Resources/Commerce/Settings/Shipping/SiteShippingHandlingFeeResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Settings.Shipping
 {
@@ -37,34 +38,11 @@ public SiteShippingHandlingFeeResource CloneWithApiContext(Action<IApiContext> c
 		}
 
 				
-		/// <summary>
-		/// Retrieves the details of the order handling fee configured for the site.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.SiteSettings.Shipping.SiteShippingHandlingFee"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var siteshippinghandlingfee = new SiteShippingHandlingFee();
-		///   var siteShippingHandlingFee = siteshippinghandlingfee.GetOrderHandlingFee( responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.SiteSettings.Shipping.SiteShippingHandlingFee GetOrderHandlingFee(string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.SiteSettings.Shipping.SiteShippingHandlingFee> response;
-			var client = Mozu.Api.Clients.Commerce.Settings.Shipping.SiteShippingHandlingFeeClient.GetOrderHandlingFeeClient( responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of the order handling fee configured for the site.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.SiteSettings.Shipping.SiteShippingHandlingFee"/>
 		/// </returns>
@@ -74,46 +52,22 @@ public virtual Mozu.Api.Contracts.SiteSettings.Shipping.SiteShippingHandlingFee
 		///   var siteShippingHandlingFee = await siteshippinghandlingfee.GetOrderHandlingFeeAsync( responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.SiteSettings.Shipping.SiteShippingHandlingFee> GetOrderHandlingFeeAsync(string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.SiteSettings.Shipping.SiteShippingHandlingFee> GetOrderHandlingFeeAsync(string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.SiteSettings.Shipping.SiteShippingHandlingFee> response;
 			var client = Mozu.Api.Clients.Commerce.Settings.Shipping.SiteShippingHandlingFeeClient.GetOrderHandlingFeeClient( responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Creates a new order handling fee for the site.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="orderHandlingFee">Properties of the handling fee to apply to order shipments for the site.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.SiteSettings.Shipping.SiteShippingHandlingFee"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var siteshippinghandlingfee = new SiteShippingHandlingFee();
-		///   var siteShippingHandlingFee = siteshippinghandlingfee.CreateOrderHandlingFee( orderHandlingFee,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.SiteSettings.Shipping.SiteShippingHandlingFee CreateOrderHandlingFee(Mozu.Api.Contracts.SiteSettings.Shipping.SiteShippingHandlingFee orderHandlingFee, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.SiteSettings.Shipping.SiteShippingHandlingFee> response;
-			var client = Mozu.Api.Clients.Commerce.Settings.Shipping.SiteShippingHandlingFeeClient.CreateOrderHandlingFeeClient( orderHandlingFee,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Creates a new order handling fee for the site.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="orderHandlingFee">Properties of the handling fee to apply to order shipments for the site.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="orderHandlingFee">Properties of the order handling fee to assess for order shipment.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.SiteSettings.Shipping.SiteShippingHandlingFee"/>
 		/// </returns>
@@ -123,46 +77,22 @@ public virtual Mozu.Api.Contracts.SiteSettings.Shipping.SiteShippingHandlingFee
 		///   var siteShippingHandlingFee = await siteshippinghandlingfee.CreateOrderHandlingFeeAsync( orderHandlingFee,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.SiteSettings.Shipping.SiteShippingHandlingFee> CreateOrderHandlingFeeAsync(Mozu.Api.Contracts.SiteSettings.Shipping.SiteShippingHandlingFee orderHandlingFee, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.SiteSettings.Shipping.SiteShippingHandlingFee> CreateOrderHandlingFeeAsync(Mozu.Api.Contracts.SiteSettings.Shipping.SiteShippingHandlingFee orderHandlingFee, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.SiteSettings.Shipping.SiteShippingHandlingFee> response;
 			var client = Mozu.Api.Clients.Commerce.Settings.Shipping.SiteShippingHandlingFeeClient.CreateOrderHandlingFeeClient( orderHandlingFee,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates the order handling fee amount for the site.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="orderHandlingFee">Properties of the handling fee to apply to order shipments for the site.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.SiteSettings.Shipping.SiteShippingHandlingFee"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var siteshippinghandlingfee = new SiteShippingHandlingFee();
-		///   var siteShippingHandlingFee = siteshippinghandlingfee.UpdateOrderHandlingFee( orderHandlingFee,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.SiteSettings.Shipping.SiteShippingHandlingFee UpdateOrderHandlingFee(Mozu.Api.Contracts.SiteSettings.Shipping.SiteShippingHandlingFee orderHandlingFee, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.SiteSettings.Shipping.SiteShippingHandlingFee> response;
-			var client = Mozu.Api.Clients.Commerce.Settings.Shipping.SiteShippingHandlingFeeClient.UpdateOrderHandlingFeeClient( orderHandlingFee,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates the order handling fee amount for the site.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="orderHandlingFee">Properties of the handling fee to apply to order shipments for the site.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="orderHandlingFee">The combined price for all items in the order, including all selected options but excluding any discounts.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.SiteSettings.Shipping.SiteShippingHandlingFee"/>
 		/// </returns>
@@ -172,12 +102,12 @@ public virtual Mozu.Api.Contracts.SiteSettings.Shipping.SiteShippingHandlingFee
 		///   var siteShippingHandlingFee = await siteshippinghandlingfee.UpdateOrderHandlingFeeAsync( orderHandlingFee,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.SiteSettings.Shipping.SiteShippingHandlingFee> UpdateOrderHandlingFeeAsync(Mozu.Api.Contracts.SiteSettings.Shipping.SiteShippingHandlingFee orderHandlingFee, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.SiteSettings.Shipping.SiteShippingHandlingFee> UpdateOrderHandlingFeeAsync(Mozu.Api.Contracts.SiteSettings.Shipping.SiteShippingHandlingFee orderHandlingFee, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.SiteSettings.Shipping.SiteShippingHandlingFee> response;
 			var client = Mozu.Api.Clients.Commerce.Settings.Shipping.SiteShippingHandlingFeeClient.UpdateOrderHandlingFeeClient( orderHandlingFee,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
diff --git a/Mozu.Api/Resources/Commerce/Settings/SiteShippingSettingsResource.cs b/Mozu.Api/Resources/Commerce/Settings/SiteShippingSettingsResource.cs
old mode 100644
new mode 100755
index e2996961..22cd4a4e
--- a/Mozu.Api/Resources/Commerce/Settings/SiteShippingSettingsResource.cs
+++ b/Mozu.Api/Resources/Commerce/Settings/SiteShippingSettingsResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Settings
 {
@@ -37,34 +38,11 @@ public SiteShippingSettingsResource CloneWithApiContext(Action<IApiContext> cont
 		}
 
 				
-		/// <summary>
-		/// Retrieves a list of the shipping settings configured for a site.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.SiteSettings.Shipping.SiteShippingSettings"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var siteshippingsettings = new SiteShippingSettings();
-		///   var siteShippingSettings = siteshippingsettings.GetSiteShippingSettings( responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.SiteSettings.Shipping.SiteShippingSettings GetSiteShippingSettings(string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.SiteSettings.Shipping.SiteShippingSettings> response;
-			var client = Mozu.Api.Clients.Commerce.Settings.SiteShippingSettingsClient.GetSiteShippingSettingsClient( responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of the shipping settings configured for a site.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.SiteSettings.Shipping.SiteShippingSettings"/>
 		/// </returns>
@@ -74,12 +52,12 @@ public virtual Mozu.Api.Contracts.SiteSettings.Shipping.SiteShippingSettings Get
 		///   var siteShippingSettings = await siteshippingsettings.GetSiteShippingSettingsAsync( responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.SiteSettings.Shipping.SiteShippingSettings> GetSiteShippingSettingsAsync(string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.SiteSettings.Shipping.SiteShippingSettings> GetSiteShippingSettingsAsync(string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.SiteSettings.Shipping.SiteShippingSettings> response;
 			var client = Mozu.Api.Clients.Commerce.Settings.SiteShippingSettingsClient.GetSiteShippingSettingsClient( responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
diff --git a/Mozu.Api/Resources/Commerce/Shipping/Admin/CarrierConfigurationResource.cs b/Mozu.Api/Resources/Commerce/Shipping/Admin/CarrierConfigurationResource.cs
old mode 100644
new mode 100755
index ef28e3ca..927e7d97
--- a/Mozu.Api/Resources/Commerce/Shipping/Admin/CarrierConfigurationResource.cs
+++ b/Mozu.Api/Resources/Commerce/Shipping/Admin/CarrierConfigurationResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Shipping.Admin
 {
 	/// <summary>
-	/// Use the Carriers resource to configure and manage your supported shipping carrier configurations.
+	/// 
 	/// </summary>
 	public partial class CarrierConfigurationResource  	{
 		///
@@ -37,42 +38,15 @@ public CarrierConfigurationResource CloneWithApiContext(Action<IApiContext> cont
 		}
 
 				
-		/// <summary>
-		/// Retrieves a list of carrier configurations and their details according to any specified facets, filter criteria, and sort options.
-		/// </summary>
-		/// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ShippingAdmin.CarrierConfigurationCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var carrierconfiguration = new CarrierConfiguration();
-		///   var carrierConfigurationCollection = carrierconfiguration.GetConfigurations( startIndex,  pageSize,  sortBy,  filter,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ShippingAdmin.CarrierConfigurationCollection GetConfigurations(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ShippingAdmin.CarrierConfigurationCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Shipping.Admin.CarrierConfigurationClient.GetConfigurationsClient( startIndex,  pageSize,  sortBy,  filter,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of carrier configurations and their details according to any specified facets, filter criteria, and sort options.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ShippingAdmin.CarrierConfigurationCollection"/>
 		/// </returns>
@@ -82,46 +56,22 @@ public virtual Mozu.Api.Contracts.ShippingAdmin.CarrierConfigurationCollection G
 		///   var carrierConfigurationCollection = await carrierconfiguration.GetConfigurationsAsync( startIndex,  pageSize,  sortBy,  filter,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ShippingAdmin.CarrierConfigurationCollection> GetConfigurationsAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ShippingAdmin.CarrierConfigurationCollection> GetConfigurationsAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ShippingAdmin.CarrierConfigurationCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Shipping.Admin.CarrierConfigurationClient.GetConfigurationsClient( startIndex,  pageSize,  sortBy,  filter,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the details of the specified carrier configuration.
-		/// </summary>
-		/// <param name="carrierId">The unique identifier of the carrier.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ShippingAdmin.CarrierConfiguration"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var carrierconfiguration = new CarrierConfiguration();
-		///   var carrierConfiguration = carrierconfiguration.GetConfiguration( carrierId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ShippingAdmin.CarrierConfiguration GetConfiguration(string carrierId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ShippingAdmin.CarrierConfiguration> response;
-			var client = Mozu.Api.Clients.Commerce.Shipping.Admin.CarrierConfigurationClient.GetConfigurationClient( carrierId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of the specified carrier configuration.
+		/// 
 		/// </summary>
-		/// <param name="carrierId">The unique identifier of the carrier.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="carrierId"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ShippingAdmin.CarrierConfiguration"/>
 		/// </returns>
@@ -131,48 +81,23 @@ public virtual Mozu.Api.Contracts.ShippingAdmin.CarrierConfiguration GetConfigur
 		///   var carrierConfiguration = await carrierconfiguration.GetConfigurationAsync( carrierId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ShippingAdmin.CarrierConfiguration> GetConfigurationAsync(string carrierId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ShippingAdmin.CarrierConfiguration> GetConfigurationAsync(string carrierId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ShippingAdmin.CarrierConfiguration> response;
 			var client = Mozu.Api.Clients.Commerce.Shipping.Admin.CarrierConfigurationClient.GetConfigurationClient( carrierId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Creates a new carrier configuration.
-		/// </summary>
-		/// <param name="carrierId">The unique identifier of the carrier.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="carrierConfiguration">Properties of a carrier configured in the shipping admin.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ShippingAdmin.CarrierConfiguration"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var carrierconfiguration = new CarrierConfiguration();
-		///   var carrierConfiguration = carrierconfiguration.CreateConfiguration( carrierConfiguration,  carrierId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ShippingAdmin.CarrierConfiguration CreateConfiguration(Mozu.Api.Contracts.ShippingAdmin.CarrierConfiguration carrierConfiguration, string carrierId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ShippingAdmin.CarrierConfiguration> response;
-			var client = Mozu.Api.Clients.Commerce.Shipping.Admin.CarrierConfigurationClient.CreateConfigurationClient( carrierConfiguration,  carrierId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Creates a new carrier configuration.
+		/// 
 		/// </summary>
-		/// <param name="carrierId">The unique identifier of the carrier.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="carrierConfiguration">Properties of a carrier configured in the shipping admin.</param>
+		/// <param name="carrierId"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="carrierConfiguration"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ShippingAdmin.CarrierConfiguration"/>
 		/// </returns>
@@ -182,48 +107,23 @@ public virtual Mozu.Api.Contracts.ShippingAdmin.CarrierConfiguration CreateConfi
 		///   var carrierConfiguration = await carrierconfiguration.CreateConfigurationAsync( carrierConfiguration,  carrierId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ShippingAdmin.CarrierConfiguration> CreateConfigurationAsync(Mozu.Api.Contracts.ShippingAdmin.CarrierConfiguration carrierConfiguration, string carrierId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ShippingAdmin.CarrierConfiguration> CreateConfigurationAsync(Mozu.Api.Contracts.ShippingAdmin.CarrierConfiguration carrierConfiguration, string carrierId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ShippingAdmin.CarrierConfiguration> response;
 			var client = Mozu.Api.Clients.Commerce.Shipping.Admin.CarrierConfigurationClient.CreateConfigurationClient( carrierConfiguration,  carrierId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates the details of the specified carrier configuration.
-		/// </summary>
-		/// <param name="carrierId">The unique identifier of the carrier.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="carrierConfiguration">Properties of a carrier configured in the shipping admin.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ShippingAdmin.CarrierConfiguration"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var carrierconfiguration = new CarrierConfiguration();
-		///   var carrierConfiguration = carrierconfiguration.UpdateConfiguration( carrierConfiguration,  carrierId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ShippingAdmin.CarrierConfiguration UpdateConfiguration(Mozu.Api.Contracts.ShippingAdmin.CarrierConfiguration carrierConfiguration, string carrierId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ShippingAdmin.CarrierConfiguration> response;
-			var client = Mozu.Api.Clients.Commerce.Shipping.Admin.CarrierConfigurationClient.UpdateConfigurationClient( carrierConfiguration,  carrierId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates the details of the specified carrier configuration.
+		/// 
 		/// </summary>
-		/// <param name="carrierId">The unique identifier of the carrier.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="carrierConfiguration">Properties of a carrier configured in the shipping admin.</param>
+		/// <param name="carrierId"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="carrierConfiguration"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ShippingAdmin.CarrierConfiguration"/>
 		/// </returns>
@@ -233,43 +133,21 @@ public virtual Mozu.Api.Contracts.ShippingAdmin.CarrierConfiguration UpdateConfi
 		///   var carrierConfiguration = await carrierconfiguration.UpdateConfigurationAsync( carrierConfiguration,  carrierId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ShippingAdmin.CarrierConfiguration> UpdateConfigurationAsync(Mozu.Api.Contracts.ShippingAdmin.CarrierConfiguration carrierConfiguration, string carrierId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ShippingAdmin.CarrierConfiguration> UpdateConfigurationAsync(Mozu.Api.Contracts.ShippingAdmin.CarrierConfiguration carrierConfiguration, string carrierId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ShippingAdmin.CarrierConfiguration> response;
 			var client = Mozu.Api.Clients.Commerce.Shipping.Admin.CarrierConfigurationClient.UpdateConfigurationClient( carrierConfiguration,  carrierId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Deletes the specified carrier configuration.
-		/// </summary>
-		/// <param name="carrierId">The unique identifier of the carrier configuration.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var carrierconfiguration = new CarrierConfiguration();
-		///   carrierconfiguration.DeleteConfiguration( carrierId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteConfiguration(string carrierId)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Shipping.Admin.CarrierConfigurationClient.DeleteConfigurationClient( carrierId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes the specified carrier configuration.
+		/// 
 		/// </summary>
-		/// <param name="carrierId">The unique identifier of the carrier configuration.</param>
+		/// <param name="carrierId"></param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -279,12 +157,12 @@ public virtual void DeleteConfiguration(string carrierId)
 		///   await carrierconfiguration.DeleteConfigurationAsync( carrierId);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteConfigurationAsync(string carrierId)
+		public virtual async Task DeleteConfigurationAsync(string carrierId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Shipping.Admin.CarrierConfigurationClient.DeleteConfigurationClient( carrierId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/Shipping/Admin/Profiles/HandlingFeeRuleResource.cs b/Mozu.Api/Resources/Commerce/Shipping/Admin/Profiles/HandlingFeeRuleResource.cs
deleted file mode 100644
index f8b19f5e..00000000
--- a/Mozu.Api/Resources/Commerce/Shipping/Admin/Profiles/HandlingFeeRuleResource.cs
+++ /dev/null
@@ -1,313 +0,0 @@
-
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by Codezu.     
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Collections.Generic;
-using Mozu.Api.Security;
-using System.Threading.Tasks;
-using Newtonsoft.Json.Linq;
-
-namespace Mozu.Api.Resources.Commerce.Shipping.Admin.Profiles
-{
-	/// <summary>
-	/// Use the ProductHandlingFeeRules sub-resource to manage your product handling fee rules that are associated with a specific shipping profile.
-	/// </summary>
-	public partial class HandlingFeeRuleResource  	{
-		///
-		/// <see cref="Mozu.Api.ApiContext"/>
-		///
-		private readonly IApiContext _apiContext;
-
-		private readonly DataViewMode _dataViewMode;
-		
-		public HandlingFeeRuleResource(IApiContext apiContext) 
-		{
-			_apiContext = apiContext;
-			_dataViewMode = DataViewMode.Live;
-		}
-
-		public HandlingFeeRuleResource CloneWithApiContext(Action<IApiContext> contextModification) 
-		{
-			return new HandlingFeeRuleResource(_apiContext.CloneWith(contextModification), _dataViewMode);
-		}
-
-		public HandlingFeeRuleResource(IApiContext apiContext, DataViewMode dataViewMode) 
-		{
-			_apiContext = apiContext;
-			_dataViewMode = dataViewMode;
-		}
-				
-		/// <summary>
-		/// Retrieves the details of the specified product handling fee rule.
-		/// </summary>
-		/// <param name="id">Unique identifier of the customer segment to retrieve.</param>
-		/// <param name="profilecode">The unique, user-defined code of the profile with which the product handling fee rule is associated.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var handlingfeerule = new HandlingFeeRule();
-		///   var handlingFeeRule = handlingfeerule.GetProductHandlingFeeRule(_dataViewMode,  profilecode,  id,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule GetProductHandlingFeeRule(string profilecode, string id, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule> response;
-			var client = Mozu.Api.Clients.Commerce.Shipping.Admin.Profiles.HandlingFeeRuleClient.GetProductHandlingFeeRuleClient(_dataViewMode,  profilecode,  id,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
-
-		/// <summary>
-		/// Retrieves the details of the specified product handling fee rule.
-		/// </summary>
-		/// <param name="id">Unique identifier of the customer segment to retrieve.</param>
-		/// <param name="profilecode">The unique, user-defined code of the profile with which the product handling fee rule is associated.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var handlingfeerule = new HandlingFeeRule();
-		///   var handlingFeeRule = await handlingfeerule.GetProductHandlingFeeRuleAsync(_dataViewMode,  profilecode,  id,  responseFields);
-		/// </code>
-		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule> GetProductHandlingFeeRuleAsync(string profilecode, string id, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule> response;
-			var client = Mozu.Api.Clients.Commerce.Shipping.Admin.Profiles.HandlingFeeRuleClient.GetProductHandlingFeeRuleClient(_dataViewMode,  profilecode,  id,  responseFields);
-			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
-			return await response.ResultAsync();
-
-		}
-
-		/// <summary>
-		/// Retrieves a list of product handling fee rules and their details.
-		/// </summary>
-		/// <param name="profilecode">The unique, user-defined code of the profile with which the product handling fee rule is associated.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRuleCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var handlingfeerule = new HandlingFeeRule();
-		///   var handlingFeeRuleCollection = handlingfeerule.GetProductHandlingFeeRules(_dataViewMode,  profilecode,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRuleCollection GetProductHandlingFeeRules(string profilecode, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRuleCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Shipping.Admin.Profiles.HandlingFeeRuleClient.GetProductHandlingFeeRulesClient(_dataViewMode,  profilecode,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
-
-		/// <summary>
-		/// Retrieves a list of product handling fee rules and their details.
-		/// </summary>
-		/// <param name="profilecode">The unique, user-defined code of the profile with which the product handling fee rule is associated.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRuleCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var handlingfeerule = new HandlingFeeRule();
-		///   var handlingFeeRuleCollection = await handlingfeerule.GetProductHandlingFeeRulesAsync(_dataViewMode,  profilecode,  responseFields);
-		/// </code>
-		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRuleCollection> GetProductHandlingFeeRulesAsync(string profilecode, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRuleCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Shipping.Admin.Profiles.HandlingFeeRuleClient.GetProductHandlingFeeRulesClient(_dataViewMode,  profilecode,  responseFields);
-			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
-			return await response.ResultAsync();
-
-		}
-
-		/// <summary>
-		/// Creates a new product handling fee rule.
-		/// </summary>
-		/// <param name="profilecode">The unique, user-defined code of the profile with which the product handling fee rule is associated.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="rule">The details of the new product handling fee rule.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var handlingfeerule = new HandlingFeeRule();
-		///   var handlingFeeRule = handlingfeerule.CreateProductHandlingFeeRule( rule,  profilecode,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule CreateProductHandlingFeeRule(Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule rule, string profilecode, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule> response;
-			var client = Mozu.Api.Clients.Commerce.Shipping.Admin.Profiles.HandlingFeeRuleClient.CreateProductHandlingFeeRuleClient( rule,  profilecode,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
-
-		/// <summary>
-		/// Creates a new product handling fee rule.
-		/// </summary>
-		/// <param name="profilecode">The unique, user-defined code of the profile with which the product handling fee rule is associated.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="rule">The details of the new product handling fee rule.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var handlingfeerule = new HandlingFeeRule();
-		///   var handlingFeeRule = await handlingfeerule.CreateProductHandlingFeeRuleAsync( rule,  profilecode,  responseFields);
-		/// </code>
-		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule> CreateProductHandlingFeeRuleAsync(Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule rule, string profilecode, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule> response;
-			var client = Mozu.Api.Clients.Commerce.Shipping.Admin.Profiles.HandlingFeeRuleClient.CreateProductHandlingFeeRuleClient( rule,  profilecode,  responseFields);
-			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
-			return await response.ResultAsync();
-
-		}
-
-		/// <summary>
-		/// Updates the details of the specified product handling fee rule.
-		/// </summary>
-		/// <param name="id">Unique identifier of the customer segment to retrieve.</param>
-		/// <param name="profilecode">The unique, user-defined code of the profile with which the product handling fee rule is associated.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="rule">The updated details of the product handling fee rule.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var handlingfeerule = new HandlingFeeRule();
-		///   var handlingFeeRule = handlingfeerule.UpdateProductHandlingFeeRule(_dataViewMode,  rule,  profilecode,  id,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule UpdateProductHandlingFeeRule(Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule rule, string profilecode, string id, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule> response;
-			var client = Mozu.Api.Clients.Commerce.Shipping.Admin.Profiles.HandlingFeeRuleClient.UpdateProductHandlingFeeRuleClient(_dataViewMode,  rule,  profilecode,  id,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
-
-		/// <summary>
-		/// Updates the details of the specified product handling fee rule.
-		/// </summary>
-		/// <param name="id">Unique identifier of the customer segment to retrieve.</param>
-		/// <param name="profilecode">The unique, user-defined code of the profile with which the product handling fee rule is associated.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="rule">The updated details of the product handling fee rule.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var handlingfeerule = new HandlingFeeRule();
-		///   var handlingFeeRule = await handlingfeerule.UpdateProductHandlingFeeRuleAsync(_dataViewMode,  rule,  profilecode,  id,  responseFields);
-		/// </code>
-		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule> UpdateProductHandlingFeeRuleAsync(Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule rule, string profilecode, string id, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule> response;
-			var client = Mozu.Api.Clients.Commerce.Shipping.Admin.Profiles.HandlingFeeRuleClient.UpdateProductHandlingFeeRuleClient(_dataViewMode,  rule,  profilecode,  id,  responseFields);
-			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
-			return await response.ResultAsync();
-
-		}
-
-		/// <summary>
-		/// Deletes the specified product handling fee rule.
-		/// </summary>
-		/// <param name="id">Unique identifier of the customer segment to retrieve.</param>
-		/// <param name="profilecode">The unique, user-defined code of the profile with which the product handling fee rule is associated.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var handlingfeerule = new HandlingFeeRule();
-		///   handlingfeerule.DeleteProductHandlingFeeRule(_dataViewMode,  profilecode,  id);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteProductHandlingFeeRule(string profilecode, string id)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Shipping.Admin.Profiles.HandlingFeeRuleClient.DeleteProductHandlingFeeRuleClient(_dataViewMode,  profilecode,  id);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
-
-		/// <summary>
-		/// Deletes the specified product handling fee rule.
-		/// </summary>
-		/// <param name="id">Unique identifier of the customer segment to retrieve.</param>
-		/// <param name="profilecode">The unique, user-defined code of the profile with which the product handling fee rule is associated.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var handlingfeerule = new HandlingFeeRule();
-		///   await handlingfeerule.DeleteProductHandlingFeeRuleAsync(_dataViewMode,  profilecode,  id);
-		/// </code>
-		/// </example>
-		public virtual async Task DeleteProductHandlingFeeRuleAsync(string profilecode, string id)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Shipping.Admin.Profiles.HandlingFeeRuleClient.DeleteProductHandlingFeeRuleClient(_dataViewMode,  profilecode,  id);
-			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
-
-		}
-
-
-	}
-
-}
-
-
diff --git a/Mozu.Api/Resources/Commerce/Shipping/Admin/Profiles/OrderHandlingFeeRulesResource.cs b/Mozu.Api/Resources/Commerce/Shipping/Admin/Profiles/OrderHandlingFeeRulesResource.cs
new file mode 100755
index 00000000..5f01abd9
--- /dev/null
+++ b/Mozu.Api/Resources/Commerce/Shipping/Admin/Profiles/OrderHandlingFeeRulesResource.cs
@@ -0,0 +1,179 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using Mozu.Api.Security;
+using System.Threading.Tasks;
+using Newtonsoft.Json.Linq;
+using System.Threading;
+
+namespace Mozu.Api.Resources.Commerce.Shipping.Admin.Profiles
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	public partial class OrderHandlingFeeRulesResource  	{
+		///
+		/// <see cref="Mozu.Api.ApiContext"/>
+		///
+		private readonly IApiContext _apiContext;
+
+		
+		public OrderHandlingFeeRulesResource(IApiContext apiContext) 
+		{
+			_apiContext = apiContext;
+		}
+
+		public OrderHandlingFeeRulesResource CloneWithApiContext(Action<IApiContext> contextModification) 
+		{
+			return new OrderHandlingFeeRulesResource(_apiContext.CloneWith(contextModification));
+		}
+
+				
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="id"></param>
+		/// <param name="profilecode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
+		/// <returns>
+		/// <see cref="Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule"/>
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var orderhandlingfeerules = new OrderHandlingFeeRules();
+		///   var handlingFeeRule = await orderhandlingfeerules.GetOrderHandlingFeeRuleAsync( profilecode,  id,  responseFields);
+		/// </code>
+		/// </example>
+		public virtual async Task<Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule> GetOrderHandlingFeeRuleAsync(string profilecode, string id, string responseFields =  null, CancellationToken ct = default(CancellationToken))
+		{
+			MozuClient<Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule> response;
+			var client = Mozu.Api.Clients.Commerce.Shipping.Admin.Profiles.OrderHandlingFeeRulesClient.GetOrderHandlingFeeRuleClient( profilecode,  id,  responseFields);
+			client.WithContext(_apiContext);
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+			return await response.ResultAsync();
+
+		}
+
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="profilecode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
+		/// <returns>
+		/// <see cref="Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRuleCollection"/>
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var orderhandlingfeerules = new OrderHandlingFeeRules();
+		///   var handlingFeeRuleCollection = await orderhandlingfeerules.GetOrderHandlingFeeRulesAsync( profilecode,  responseFields);
+		/// </code>
+		/// </example>
+		public virtual async Task<Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRuleCollection> GetOrderHandlingFeeRulesAsync(string profilecode, string responseFields =  null, CancellationToken ct = default(CancellationToken))
+		{
+			MozuClient<Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRuleCollection> response;
+			var client = Mozu.Api.Clients.Commerce.Shipping.Admin.Profiles.OrderHandlingFeeRulesClient.GetOrderHandlingFeeRulesClient( profilecode,  responseFields);
+			client.WithContext(_apiContext);
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+			return await response.ResultAsync();
+
+		}
+
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="profilecode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
+		/// <param name="rule"></param>
+		/// <returns>
+		/// <see cref="Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule"/>
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var orderhandlingfeerules = new OrderHandlingFeeRules();
+		///   var handlingFeeRule = await orderhandlingfeerules.CreateOrderHandlingFeeRuleAsync( rule,  profilecode,  responseFields);
+		/// </code>
+		/// </example>
+		public virtual async Task<Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule> CreateOrderHandlingFeeRuleAsync(Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule rule, string profilecode, string responseFields =  null, CancellationToken ct = default(CancellationToken))
+		{
+			MozuClient<Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule> response;
+			var client = Mozu.Api.Clients.Commerce.Shipping.Admin.Profiles.OrderHandlingFeeRulesClient.CreateOrderHandlingFeeRuleClient( rule,  profilecode,  responseFields);
+			client.WithContext(_apiContext);
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+			return await response.ResultAsync();
+
+		}
+
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="id"></param>
+		/// <param name="profilecode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
+		/// <param name="rule"></param>
+		/// <returns>
+		/// <see cref="Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule"/>
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var orderhandlingfeerules = new OrderHandlingFeeRules();
+		///   var handlingFeeRule = await orderhandlingfeerules.UpdateOrderHandlingFeeRuleAsync( rule,  profilecode,  id,  responseFields);
+		/// </code>
+		/// </example>
+		public virtual async Task<Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule> UpdateOrderHandlingFeeRuleAsync(Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule rule, string profilecode, string id, string responseFields =  null, CancellationToken ct = default(CancellationToken))
+		{
+			MozuClient<Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule> response;
+			var client = Mozu.Api.Clients.Commerce.Shipping.Admin.Profiles.OrderHandlingFeeRulesClient.UpdateOrderHandlingFeeRuleClient( rule,  profilecode,  id,  responseFields);
+			client.WithContext(_apiContext);
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+			return await response.ResultAsync();
+
+		}
+
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="id"></param>
+		/// <param name="profilecode"></param>
+		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
+		/// <returns>
+		/// 
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var orderhandlingfeerules = new OrderHandlingFeeRules();
+		///   await orderhandlingfeerules.DeleteOrderHandlingFeeRuleAsync( profilecode,  id);
+		/// </code>
+		/// </example>
+		public virtual async Task DeleteOrderHandlingFeeRuleAsync(string profilecode, string id, CancellationToken ct = default(CancellationToken))
+		{
+			MozuClient response;
+			var client = Mozu.Api.Clients.Commerce.Shipping.Admin.Profiles.OrderHandlingFeeRulesClient.DeleteOrderHandlingFeeRuleClient( profilecode,  id);
+			client.WithContext(_apiContext);
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+
+		}
+
+
+	}
+
+}
+
+
diff --git a/Mozu.Api/Resources/Commerce/Shipping/Admin/Profiles/ProductHandlingFeeRulesResource.cs b/Mozu.Api/Resources/Commerce/Shipping/Admin/Profiles/ProductHandlingFeeRulesResource.cs
new file mode 100755
index 00000000..7df95a9b
--- /dev/null
+++ b/Mozu.Api/Resources/Commerce/Shipping/Admin/Profiles/ProductHandlingFeeRulesResource.cs
@@ -0,0 +1,186 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using Mozu.Api.Security;
+using System.Threading.Tasks;
+using Newtonsoft.Json.Linq;
+using System.Threading;
+
+namespace Mozu.Api.Resources.Commerce.Shipping.Admin.Profiles
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	public partial class ProductHandlingFeeRulesResource  	{
+		///
+		/// <see cref="Mozu.Api.ApiContext"/>
+		///
+		private readonly IApiContext _apiContext;
+
+		private readonly DataViewMode _dataViewMode;
+		
+		public ProductHandlingFeeRulesResource(IApiContext apiContext) 
+		{
+			_apiContext = apiContext;
+			_dataViewMode = DataViewMode.Live;
+		}
+
+		public ProductHandlingFeeRulesResource CloneWithApiContext(Action<IApiContext> contextModification) 
+		{
+			return new ProductHandlingFeeRulesResource(_apiContext.CloneWith(contextModification), _dataViewMode);
+		}
+
+		public ProductHandlingFeeRulesResource(IApiContext apiContext, DataViewMode dataViewMode) 
+		{
+			_apiContext = apiContext;
+			_dataViewMode = dataViewMode;
+		}
+				
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="id"></param>
+		/// <param name="profilecode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
+		/// <returns>
+		/// <see cref="Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule"/>
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var producthandlingfeerules = new ProductHandlingFeeRules();
+		///   var handlingFeeRule = await producthandlingfeerules.GetProductHandlingFeeRuleAsync(_dataViewMode,  profilecode,  id,  responseFields);
+		/// </code>
+		/// </example>
+		public virtual async Task<Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule> GetProductHandlingFeeRuleAsync(string profilecode, string id, string responseFields =  null, CancellationToken ct = default(CancellationToken))
+		{
+			MozuClient<Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule> response;
+			var client = Mozu.Api.Clients.Commerce.Shipping.Admin.Profiles.ProductHandlingFeeRulesClient.GetProductHandlingFeeRuleClient(_dataViewMode,  profilecode,  id,  responseFields);
+			client.WithContext(_apiContext);
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+			return await response.ResultAsync();
+
+		}
+
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="profilecode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
+		/// <returns>
+		/// <see cref="Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRuleCollection"/>
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var producthandlingfeerules = new ProductHandlingFeeRules();
+		///   var handlingFeeRuleCollection = await producthandlingfeerules.GetProductHandlingFeeRulesAsync(_dataViewMode,  profilecode,  responseFields);
+		/// </code>
+		/// </example>
+		public virtual async Task<Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRuleCollection> GetProductHandlingFeeRulesAsync(string profilecode, string responseFields =  null, CancellationToken ct = default(CancellationToken))
+		{
+			MozuClient<Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRuleCollection> response;
+			var client = Mozu.Api.Clients.Commerce.Shipping.Admin.Profiles.ProductHandlingFeeRulesClient.GetProductHandlingFeeRulesClient(_dataViewMode,  profilecode,  responseFields);
+			client.WithContext(_apiContext);
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+			return await response.ResultAsync();
+
+		}
+
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="profilecode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
+		/// <param name="rule"></param>
+		/// <returns>
+		/// <see cref="Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule"/>
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var producthandlingfeerules = new ProductHandlingFeeRules();
+		///   var handlingFeeRule = await producthandlingfeerules.CreateProductHandlingFeeRuleAsync( rule,  profilecode,  responseFields);
+		/// </code>
+		/// </example>
+		public virtual async Task<Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule> CreateProductHandlingFeeRuleAsync(Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule rule, string profilecode, string responseFields =  null, CancellationToken ct = default(CancellationToken))
+		{
+			MozuClient<Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule> response;
+			var client = Mozu.Api.Clients.Commerce.Shipping.Admin.Profiles.ProductHandlingFeeRulesClient.CreateProductHandlingFeeRuleClient( rule,  profilecode,  responseFields);
+			client.WithContext(_apiContext);
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+			return await response.ResultAsync();
+
+		}
+
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="id"></param>
+		/// <param name="profilecode"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
+		/// <param name="rule"></param>
+		/// <returns>
+		/// <see cref="Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule"/>
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var producthandlingfeerules = new ProductHandlingFeeRules();
+		///   var handlingFeeRule = await producthandlingfeerules.UpdateProductHandlingFeeRuleAsync(_dataViewMode,  rule,  profilecode,  id,  responseFields);
+		/// </code>
+		/// </example>
+		public virtual async Task<Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule> UpdateProductHandlingFeeRuleAsync(Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule rule, string profilecode, string id, string responseFields =  null, CancellationToken ct = default(CancellationToken))
+		{
+			MozuClient<Mozu.Api.Contracts.ShippingAdmin.Profile.HandlingFeeRule> response;
+			var client = Mozu.Api.Clients.Commerce.Shipping.Admin.Profiles.ProductHandlingFeeRulesClient.UpdateProductHandlingFeeRuleClient(_dataViewMode,  rule,  profilecode,  id,  responseFields);
+			client.WithContext(_apiContext);
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+			return await response.ResultAsync();
+
+		}
+
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="id"></param>
+		/// <param name="profilecode"></param>
+		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
+		/// <returns>
+		/// 
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var producthandlingfeerules = new ProductHandlingFeeRules();
+		///   await producthandlingfeerules.DeleteProductHandlingFeeRuleAsync(_dataViewMode,  profilecode,  id);
+		/// </code>
+		/// </example>
+		public virtual async Task DeleteProductHandlingFeeRuleAsync(string profilecode, string id, CancellationToken ct = default(CancellationToken))
+		{
+			MozuClient response;
+			var client = Mozu.Api.Clients.Commerce.Shipping.Admin.Profiles.ProductHandlingFeeRulesClient.DeleteProductHandlingFeeRuleClient(_dataViewMode,  profilecode,  id);
+			client.WithContext(_apiContext);
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+
+		}
+
+
+	}
+
+}
+
+
diff --git a/Mozu.Api/Resources/Commerce/Shipping/Admin/Profiles/ShippingInclusionRuleResource.cs b/Mozu.Api/Resources/Commerce/Shipping/Admin/Profiles/ShippingInclusionRuleResource.cs
old mode 100644
new mode 100755
index b3619bb0..c111ee6f
--- a/Mozu.Api/Resources/Commerce/Shipping/Admin/Profiles/ShippingInclusionRuleResource.cs
+++ b/Mozu.Api/Resources/Commerce/Shipping/Admin/Profiles/ShippingInclusionRuleResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Shipping.Admin.Profiles
 {
 	/// <summary>
-	/// Use the ShippingInclusionRules sub-resource to manage your shipping inclusion rules that are associated with a specific shipping profile.
+	/// 
 	/// </summary>
 	public partial class ShippingInclusionRuleResource  	{
 		///
@@ -37,39 +38,13 @@ public ShippingInclusionRuleResource CloneWithApiContext(Action<IApiContext> con
 		}
 
 				
-		/// <summary>
-		/// Retrieves the details of the specified shipping inclusion rule.
-		/// </summary>
-		/// <param name="id">Unique identifier of the customer segment to retrieve.</param>
-		/// <param name="profilecode">The unique, user-defined code of the profile with which the shipping inclusion rule is associated.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingInclusionRule"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var shippinginclusionrule = new ShippingInclusionRule();
-		///   var shippingInclusionRule = shippinginclusionrule.GetShippingInclusionRule( profilecode,  id,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingInclusionRule GetShippingInclusionRule(string profilecode, string id, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingInclusionRule> response;
-			var client = Mozu.Api.Clients.Commerce.Shipping.Admin.Profiles.ShippingInclusionRuleClient.GetShippingInclusionRuleClient( profilecode,  id,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of the specified shipping inclusion rule.
+		/// 
 		/// </summary>
-		/// <param name="id">Unique identifier of the customer segment to retrieve.</param>
-		/// <param name="profilecode">The unique, user-defined code of the profile with which the shipping inclusion rule is associated.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="id"></param>
+		/// <param name="profilecode"></param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingInclusionRule"/>
@@ -80,47 +55,22 @@ public virtual Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingInclusionRule Ge
 		///   var shippingInclusionRule = await shippinginclusionrule.GetShippingInclusionRuleAsync( profilecode,  id,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingInclusionRule> GetShippingInclusionRuleAsync(string profilecode, string id, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingInclusionRule> GetShippingInclusionRuleAsync(string profilecode, string id, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingInclusionRule> response;
 			var client = Mozu.Api.Clients.Commerce.Shipping.Admin.Profiles.ShippingInclusionRuleClient.GetShippingInclusionRuleClient( profilecode,  id,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves a list of shipping inclusion rules and their details.
-		/// </summary>
-		/// <param name="profilecode">The unique, user-defined code of the profile with which the shipping inclusion rule is associated.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingInclusionRuleCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var shippinginclusionrule = new ShippingInclusionRule();
-		///   var shippingInclusionRuleCollection = shippinginclusionrule.GetShippingInclusionRules( profilecode,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingInclusionRuleCollection GetShippingInclusionRules(string profilecode, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingInclusionRuleCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Shipping.Admin.Profiles.ShippingInclusionRuleClient.GetShippingInclusionRulesClient( profilecode,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of shipping inclusion rules and their details.
+		/// 
 		/// </summary>
-		/// <param name="profilecode">The unique, user-defined code of the profile with which the shipping inclusion rule is associated.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="profilecode"></param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingInclusionRuleCollection"/>
@@ -131,50 +81,24 @@ public virtual Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingInclusionRuleCol
 		///   var shippingInclusionRuleCollection = await shippinginclusionrule.GetShippingInclusionRulesAsync( profilecode,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingInclusionRuleCollection> GetShippingInclusionRulesAsync(string profilecode, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingInclusionRuleCollection> GetShippingInclusionRulesAsync(string profilecode, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingInclusionRuleCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Shipping.Admin.Profiles.ShippingInclusionRuleClient.GetShippingInclusionRulesClient( profilecode,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Creates a new shipping inclusion rule.
-		/// </summary>
-		/// <param name="profilecode">The unique, user-defined code of the profile with which the shipping inclusion rule is associated.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="rule">The details of the new shipping inclusion rule.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingInclusionRule"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var shippinginclusionrule = new ShippingInclusionRule();
-		///   var shippingInclusionRule = shippinginclusionrule.CreateShippingInclusionRule( rule,  profilecode,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingInclusionRule CreateShippingInclusionRule(Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingInclusionRule rule, string profilecode, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingInclusionRule> response;
-			var client = Mozu.Api.Clients.Commerce.Shipping.Admin.Profiles.ShippingInclusionRuleClient.CreateShippingInclusionRuleClient( rule,  profilecode,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Creates a new shipping inclusion rule.
+		/// 
 		/// </summary>
-		/// <param name="profilecode">The unique, user-defined code of the profile with which the shipping inclusion rule is associated.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="profilecode"></param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="rule">The details of the new shipping inclusion rule.</param>
+		/// <param name="rule"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingInclusionRule"/>
 		/// </returns>
@@ -184,52 +108,25 @@ public virtual Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingInclusionRule Cr
 		///   var shippingInclusionRule = await shippinginclusionrule.CreateShippingInclusionRuleAsync( rule,  profilecode,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingInclusionRule> CreateShippingInclusionRuleAsync(Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingInclusionRule rule, string profilecode, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingInclusionRule> CreateShippingInclusionRuleAsync(Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingInclusionRule rule, string profilecode, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingInclusionRule> response;
 			var client = Mozu.Api.Clients.Commerce.Shipping.Admin.Profiles.ShippingInclusionRuleClient.CreateShippingInclusionRuleClient( rule,  profilecode,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates the details of the specified shipping inclusion rule.
-		/// </summary>
-		/// <param name="id">Unique identifier of the customer segment to retrieve.</param>
-		/// <param name="profilecode">The unique, user-defined code of the profile with which the shipping inclusion rule is associated.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="rule">The updated details of the shipping inclusion rule.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingInclusionRule"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var shippinginclusionrule = new ShippingInclusionRule();
-		///   var shippingInclusionRule = shippinginclusionrule.UpdateShippingInclusionRule( rule,  profilecode,  id,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingInclusionRule UpdateShippingInclusionRule(Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingInclusionRule rule, string profilecode, string id, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingInclusionRule> response;
-			var client = Mozu.Api.Clients.Commerce.Shipping.Admin.Profiles.ShippingInclusionRuleClient.UpdateShippingInclusionRuleClient( rule,  profilecode,  id,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates the details of the specified shipping inclusion rule.
+		/// 
 		/// </summary>
-		/// <param name="id">Unique identifier of the customer segment to retrieve.</param>
-		/// <param name="profilecode">The unique, user-defined code of the profile with which the shipping inclusion rule is associated.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="id"></param>
+		/// <param name="profilecode"></param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="rule">The updated details of the shipping inclusion rule.</param>
+		/// <param name="rule"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingInclusionRule"/>
 		/// </returns>
@@ -239,46 +136,22 @@ public virtual Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingInclusionRule Up
 		///   var shippingInclusionRule = await shippinginclusionrule.UpdateShippingInclusionRuleAsync( rule,  profilecode,  id,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingInclusionRule> UpdateShippingInclusionRuleAsync(Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingInclusionRule rule, string profilecode, string id, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingInclusionRule> UpdateShippingInclusionRuleAsync(Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingInclusionRule rule, string profilecode, string id, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingInclusionRule> response;
 			var client = Mozu.Api.Clients.Commerce.Shipping.Admin.Profiles.ShippingInclusionRuleClient.UpdateShippingInclusionRuleClient( rule,  profilecode,  id,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Deletes the specified shipping inclusion rule.
-		/// </summary>
-		/// <param name="id">Unique identifier of the customer segment to retrieve.</param>
-		/// <param name="profilecode">The unique, user-defined code of the profile with which the shipping inclusion rule is associated.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var shippinginclusionrule = new ShippingInclusionRule();
-		///   shippinginclusionrule.DeleteShippingInclusionRule( profilecode,  id);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteShippingInclusionRule(string profilecode, string id)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Shipping.Admin.Profiles.ShippingInclusionRuleClient.DeleteShippingInclusionRuleClient( profilecode,  id);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes the specified shipping inclusion rule.
+		/// 
 		/// </summary>
-		/// <param name="id">Unique identifier of the customer segment to retrieve.</param>
-		/// <param name="profilecode">The unique, user-defined code of the profile with which the shipping inclusion rule is associated.</param>
+		/// <param name="id"></param>
+		/// <param name="profilecode"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		/// 
@@ -289,12 +162,12 @@ public virtual void DeleteShippingInclusionRule(string profilecode, string id)
 		///   await shippinginclusionrule.DeleteShippingInclusionRuleAsync( profilecode,  id);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteShippingInclusionRuleAsync(string profilecode, string id)
+		public virtual async Task DeleteShippingInclusionRuleAsync(string profilecode, string id, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Shipping.Admin.Profiles.ShippingInclusionRuleClient.DeleteShippingInclusionRuleClient( profilecode,  id);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/Shipping/Admin/Profiles/ShippingStatesResource.cs b/Mozu.Api/Resources/Commerce/Shipping/Admin/Profiles/ShippingStatesResource.cs
old mode 100644
new mode 100755
index b355a167..0be1402d
--- a/Mozu.Api/Resources/Commerce/Shipping/Admin/Profiles/ShippingStatesResource.cs
+++ b/Mozu.Api/Resources/Commerce/Shipping/Admin/Profiles/ShippingStatesResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Shipping.Admin.Profiles
 {
 	/// <summary>
-	/// Use the ShippingStates sub-resource to manage the states your shipping profile supports. For example, you can specify one of your shipping profiles to only support Texas, Oklahoma, Arkansas, Louisiana, and New Mexico.Each shipping state is composed of a user-definied code and name.
+	/// 
 	/// </summary>
 	public partial class ShippingStatesResource  	{
 		///
@@ -37,35 +38,11 @@ public ShippingStatesResource CloneWithApiContext(Action<IApiContext> contextMod
 		}
 
 				
-		/// <summary>
-		/// Retrieves a list of shipping states and their details.
-		/// </summary>
-		/// <param name="profileCode">The unique, user-defined code of the profile with which the shipping state is associated.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <returns>
-		/// List{<see cref="Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingStates"/>}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var shippingstates = new ShippingStates();
-		///   var shippingStates = shippingstates.GetStates( profileCode);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingStates> GetStates(string profileCode)
-		{
-			MozuClient<List<Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingStates>> response;
-			var client = Mozu.Api.Clients.Commerce.Shipping.Admin.Profiles.ShippingStatesClient.GetStatesClient( profileCode);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of shipping states and their details.
+		/// 
 		/// </summary>
-		/// <param name="profileCode">The unique, user-defined code of the profile with which the shipping state is associated.</param>
+		/// <param name="profileCode"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		/// List{<see cref="Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingStates"/>}
@@ -76,48 +53,23 @@ public ShippingStatesResource CloneWithApiContext(Action<IApiContext> contextMod
 		///   var shippingStates = await shippingstates.GetStatesAsync( profileCode);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingStates>> GetStatesAsync(string profileCode)
+		public virtual async Task<List<Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingStates>> GetStatesAsync(string profileCode, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingStates>> response;
 			var client = Mozu.Api.Clients.Commerce.Shipping.Admin.Profiles.ShippingStatesClient.GetStatesClient( profileCode);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates the details of the shipping states.
-		/// </summary>
-		/// <param name="profilecode">The unique, user-defined code of the profile with which the shipping state is associated.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="states">The updated details of the shipping states associated with the specified profilecode.</param>
-		/// <returns>
-		/// List{<see cref="Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingStates"/>}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var shippingstates = new ShippingStates();
-		///   var shippingStates = shippingstates.UpdateStates( states,  profilecode);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingStates> UpdateStates(List<Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingStates> states, string profilecode)
-		{
-			MozuClient<List<Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingStates>> response;
-			var client = Mozu.Api.Clients.Commerce.Shipping.Admin.Profiles.ShippingStatesClient.UpdateStatesClient( states,  profilecode);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates the details of the shipping states.
+		/// 
 		/// </summary>
-		/// <param name="profilecode">The unique, user-defined code of the profile with which the shipping state is associated.</param>
+		/// <param name="profilecode"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="states">The updated details of the shipping states associated with the specified profilecode.</param>
+		/// <param name="states"></param>
 		/// <returns>
 		/// List{<see cref="Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingStates"/>}
 		/// </returns>
@@ -127,12 +79,12 @@ public ShippingStatesResource CloneWithApiContext(Action<IApiContext> contextMod
 		///   var shippingStates = await shippingstates.UpdateStatesAsync( states,  profilecode);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingStates>> UpdateStatesAsync(List<Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingStates> states, string profilecode)
+		public virtual async Task<List<Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingStates>> UpdateStatesAsync(List<Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingStates> states, string profilecode, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingStates>> response;
 			var client = Mozu.Api.Clients.Commerce.Shipping.Admin.Profiles.ShippingStatesClient.UpdateStatesClient( states,  profilecode);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
diff --git a/Mozu.Api/Resources/Commerce/Shipping/Admin/ShippingProfileResource.cs b/Mozu.Api/Resources/Commerce/Shipping/Admin/ShippingProfileResource.cs
old mode 100644
new mode 100755
index a74fe2d2..77b7423f
--- a/Mozu.Api/Resources/Commerce/Shipping/Admin/ShippingProfileResource.cs
+++ b/Mozu.Api/Resources/Commerce/Shipping/Admin/ShippingProfileResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Shipping.Admin
 {
 	/// <summary>
-	/// Use the Profiles resource to manage your shipping profiles.
+	/// 
 	/// </summary>
 	public partial class ShippingProfileResource  	{
 		///
@@ -37,35 +38,11 @@ public ShippingProfileResource CloneWithApiContext(Action<IApiContext> contextMo
 		}
 
 				
-		/// <summary>
-		/// Retrieves a list of shipping profiles.
-		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingProfileCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var shippingprofile = new ShippingProfile();
-		///   var shippingProfileCollection = shippingprofile.GetProfiles( responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingProfileCollection GetProfiles(string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingProfileCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Shipping.Admin.ShippingProfileClient.GetProfilesClient( responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of shipping profiles.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingProfileCollection"/>
@@ -76,12 +53,12 @@ public virtual Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingProfileCollectio
 		///   var shippingProfileCollection = await shippingprofile.GetProfilesAsync( responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingProfileCollection> GetProfilesAsync(string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingProfileCollection> GetProfilesAsync(string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ShippingAdmin.Profile.ShippingProfileCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Shipping.Admin.ShippingProfileClient.GetProfilesClient( responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
diff --git a/Mozu.Api/Resources/Commerce/TargetRuleResource.cs b/Mozu.Api/Resources/Commerce/TargetRuleResource.cs
old mode 100644
new mode 100755
index 3155b5b6..5d37c470
--- a/Mozu.Api/Resources/Commerce/TargetRuleResource.cs
+++ b/Mozu.Api/Resources/Commerce/TargetRuleResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce
 {
 	/// <summary>
-	/// Use the TargetRules resource to manage your target rules for products and zones. For example, you can set specific rules that dictate shipping options for specific products.
+	/// 
 	/// </summary>
 	public partial class TargetRuleResource  	{
 		///
@@ -37,43 +38,15 @@ public TargetRuleResource CloneWithApiContext(Action<IApiContext> contextModific
 		}
 
 				
-		/// <summary>
-		/// Retrieves a list of target rules and their details according to any specified facets, filter criteria, and sort options.
-		/// </summary>
-		/// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ShippingAdmin.TargetRuleCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var targetrule = new TargetRule();
-		///   var targetRuleCollection = targetrule.GetTargetRules( startIndex,  pageSize,  sortBy,  filter,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ShippingAdmin.TargetRuleCollection GetTargetRules(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ShippingAdmin.TargetRuleCollection> response;
-			var client = Mozu.Api.Clients.Commerce.TargetRuleClient.GetTargetRulesClient( startIndex,  pageSize,  sortBy,  filter,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of target rules and their details according to any specified facets, filter criteria, and sort options.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ShippingAdmin.TargetRuleCollection"/>
@@ -84,47 +57,22 @@ public virtual Mozu.Api.Contracts.ShippingAdmin.TargetRuleCollection GetTargetRu
 		///   var targetRuleCollection = await targetrule.GetTargetRulesAsync( startIndex,  pageSize,  sortBy,  filter,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ShippingAdmin.TargetRuleCollection> GetTargetRulesAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ShippingAdmin.TargetRuleCollection> GetTargetRulesAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ShippingAdmin.TargetRuleCollection> response;
 			var client = Mozu.Api.Clients.Commerce.TargetRuleClient.GetTargetRulesClient( startIndex,  pageSize,  sortBy,  filter,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the details of the specified target rule.
-		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ShippingAdmin.TargetRule"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var targetrule = new TargetRule();
-		///   var targetRule = targetrule.GetTargetRule( code,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ShippingAdmin.TargetRule GetTargetRule(string code, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ShippingAdmin.TargetRule> response;
-			var client = Mozu.Api.Clients.Commerce.TargetRuleClient.GetTargetRuleClient( code,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of the specified target rule.
+		/// 
 		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="code"></param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ShippingAdmin.TargetRule"/>
@@ -135,48 +83,23 @@ public virtual Mozu.Api.Contracts.ShippingAdmin.TargetRule GetTargetRule(string
 		///   var targetRule = await targetrule.GetTargetRuleAsync( code,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ShippingAdmin.TargetRule> GetTargetRuleAsync(string code, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ShippingAdmin.TargetRule> GetTargetRuleAsync(string code, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ShippingAdmin.TargetRule> response;
 			var client = Mozu.Api.Clients.Commerce.TargetRuleClient.GetTargetRuleClient( code,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Creates a new target rule.
-		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="targetRule">The details of the new target rule.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ShippingAdmin.TargetRule"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var targetrule = new TargetRule();
-		///   var targetRule = targetrule.CreateTargetRule( targetRule,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ShippingAdmin.TargetRule CreateTargetRule(Mozu.Api.Contracts.ShippingAdmin.TargetRule targetRule, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ShippingAdmin.TargetRule> response;
-			var client = Mozu.Api.Clients.Commerce.TargetRuleClient.CreateTargetRuleClient( targetRule,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Creates a new target rule.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="targetRule">The details of the new target rule.</param>
+		/// <param name="targetRule"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ShippingAdmin.TargetRule"/>
 		/// </returns>
@@ -186,45 +109,22 @@ public virtual Mozu.Api.Contracts.ShippingAdmin.TargetRule CreateTargetRule(Mozu
 		///   var targetRule = await targetrule.CreateTargetRuleAsync( targetRule,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ShippingAdmin.TargetRule> CreateTargetRuleAsync(Mozu.Api.Contracts.ShippingAdmin.TargetRule targetRule, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ShippingAdmin.TargetRule> CreateTargetRuleAsync(Mozu.Api.Contracts.ShippingAdmin.TargetRule targetRule, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ShippingAdmin.TargetRule> response;
 			var client = Mozu.Api.Clients.Commerce.TargetRuleClient.CreateTargetRuleClient( targetRule,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Validates the details of a target rule.
-		/// </summary>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="targetRule">The details of the target rule you want to validate.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var targetrule = new TargetRule();
-		///   targetrule.ValidateTargetRule( targetRule);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void ValidateTargetRule(Mozu.Api.Contracts.ShippingAdmin.TargetRule targetRule)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.TargetRuleClient.ValidateTargetRuleClient( targetRule);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Validates the details of a target rule.
+		/// 
 		/// </summary>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="targetRule">The details of the target rule you want to validate.</param>
+		/// <param name="targetRule"></param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -234,49 +134,23 @@ public virtual void ValidateTargetRule(Mozu.Api.Contracts.ShippingAdmin.TargetRu
 		///   await targetrule.ValidateTargetRuleAsync( targetRule);
 		/// </code>
 		/// </example>
-		public virtual async Task ValidateTargetRuleAsync(Mozu.Api.Contracts.ShippingAdmin.TargetRule targetRule)
+		public virtual async Task ValidateTargetRuleAsync(Mozu.Api.Contracts.ShippingAdmin.TargetRule targetRule, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.TargetRuleClient.ValidateTargetRuleClient( targetRule);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
-		/// <summary>
-		/// Updates the details of the specified target rule.
-		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="targetRule">The details of the updated target rule.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.ShippingAdmin.TargetRule"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var targetrule = new TargetRule();
-		///   var targetRule = targetrule.UpdateTargetRule( targetRule,  code,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.ShippingAdmin.TargetRule UpdateTargetRule(Mozu.Api.Contracts.ShippingAdmin.TargetRule targetRule, string code, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.ShippingAdmin.TargetRule> response;
-			var client = Mozu.Api.Clients.Commerce.TargetRuleClient.UpdateTargetRuleClient( targetRule,  code,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates the details of the specified target rule.
+		/// 
 		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="code"></param>
+		/// <param name="responseFields"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <param name="targetRule">The details of the updated target rule.</param>
+		/// <param name="targetRule"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.ShippingAdmin.TargetRule"/>
 		/// </returns>
@@ -286,44 +160,21 @@ public virtual Mozu.Api.Contracts.ShippingAdmin.TargetRule UpdateTargetRule(Mozu
 		///   var targetRule = await targetrule.UpdateTargetRuleAsync( targetRule,  code,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.ShippingAdmin.TargetRule> UpdateTargetRuleAsync(Mozu.Api.Contracts.ShippingAdmin.TargetRule targetRule, string code, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.ShippingAdmin.TargetRule> UpdateTargetRuleAsync(Mozu.Api.Contracts.ShippingAdmin.TargetRule targetRule, string code, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.ShippingAdmin.TargetRule> response;
 			var client = Mozu.Api.Clients.Commerce.TargetRuleClient.UpdateTargetRuleClient( targetRule,  code,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Deletes the specified target rule.
-		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var targetrule = new TargetRule();
-		///   targetrule.DeleteTargetRule( code);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteTargetRule(string code)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.TargetRuleClient.DeleteTargetRuleClient( code);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes the specified target rule.
+		/// 
 		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
+		/// <param name="code"></param>
 		/// <param name="dataViewMode">{<see cref="Mozu.Api.DataViewMode"/>}</param>
 		/// <returns>
 		/// 
@@ -334,12 +185,12 @@ public virtual void DeleteTargetRule(string code)
 		///   await targetrule.DeleteTargetRuleAsync( code);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteTargetRuleAsync(string code)
+		public virtual async Task DeleteTargetRuleAsync(string code, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.TargetRuleClient.DeleteTargetRuleClient( code);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/WishlistResource.cs b/Mozu.Api/Resources/Commerce/WishlistResource.cs
old mode 100644
new mode 100755
index c0d363e0..8024d44f
--- a/Mozu.Api/Resources/Commerce/WishlistResource.cs
+++ b/Mozu.Api/Resources/Commerce/WishlistResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce
 {
@@ -37,46 +38,17 @@ public WishlistResource CloneWithApiContext(Action<IApiContext> contextModificat
 		}
 
 				
-		/// <summary>
-		/// Retrieves a list of shopper wish lists according to any filter and sort criteria.
-		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="q">A list of order search terms (not phrases) to use in the query when searching across order number and the name or email of the billing contact. When entering, separate multiple search terms with a space character.</param>
-		/// <param name="qLimit">The maximum number of search results to return in the response. You can limit any range between 1-100.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var wishlist = new Wishlist();
-		///   var wishlistCollection = wishlist.GetWishlists( startIndex,  pageSize,  sortBy,  filter,  q,  qLimit,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistCollection GetWishlists(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string q =  null, int? qLimit =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistCollection> response;
-			var client = Mozu.Api.Clients.Commerce.WishlistClient.GetWishlistsClient( startIndex,  pageSize,  sortBy,  filter,  q,  qLimit,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of shopper wish lists according to any filter and sort criteria.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="q">A list of order search terms (not phrases) to use in the query when searching across order number and the name or email of the billing contact. When entering, separate multiple search terms with a space character.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="q">A list of search terms to use in the query when searching across wish list name. Separate multiple search terms with a space character.</param>
 		/// <param name="qLimit">The maximum number of search results to return in the response. You can limit any range between 1-100.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistCollection"/>
 		/// </returns>
@@ -86,46 +58,22 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistCollection G
 		///   var wishlistCollection = await wishlist.GetWishlistsAsync( startIndex,  pageSize,  sortBy,  filter,  q,  qLimit,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistCollection> GetWishlistsAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string q =  null, int? qLimit =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistCollection> GetWishlistsAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string q =  null, int? qLimit =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistCollection> response;
 			var client = Mozu.Api.Clients.Commerce.WishlistClient.GetWishlistsClient( startIndex,  pageSize,  sortBy,  filter,  q,  qLimit,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the details of the shopper wish list specified in the request.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="wishlistId">Unique identifier of the wish list.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var wishlist = new Wishlist();
-		///   var wishlist = wishlist.GetWishlist( wishlistId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist GetWishlist(string wishlistId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist> response;
-			var client = Mozu.Api.Clients.Commerce.WishlistClient.GetWishlistClient( wishlistId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of the shopper wish list specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="wishlistId">Unique identifier of the wish list.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="wishlistId">Unique identifier of the shopper wish list to retrieve.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist"/>
 		/// </returns>
@@ -135,47 +83,22 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist GetWishlist
 		///   var wishlist = await wishlist.GetWishlistAsync( wishlistId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist> GetWishlistAsync(string wishlistId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist> GetWishlistAsync(string wishlistId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist> response;
 			var client = Mozu.Api.Clients.Commerce.WishlistClient.GetWishlistClient( wishlistId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the details of a wish list by supplying the wish list name.
-		/// </summary>
-		/// <param name="customerAccountId">The unique identifier of the customer account for which to retrieve wish lists.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="wishlistName">The name of the wish list to retrieve.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var wishlist = new Wishlist();
-		///   var wishlist = wishlist.GetWishlistByName( customerAccountId,  wishlistName,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist GetWishlistByName(int customerAccountId, string wishlistName, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist> response;
-			var client = Mozu.Api.Clients.Commerce.WishlistClient.GetWishlistByNameClient( customerAccountId,  wishlistName,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of a wish list by supplying the wish list name.
+		/// 
 		/// </summary>
 		/// <param name="customerAccountId">The unique identifier of the customer account for which to retrieve wish lists.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="wishlistName">The name of the wish list to retrieve.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist"/>
@@ -186,46 +109,22 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist GetWishlist
 		///   var wishlist = await wishlist.GetWishlistByNameAsync( customerAccountId,  wishlistName,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist> GetWishlistByNameAsync(int customerAccountId, string wishlistName, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist> GetWishlistByNameAsync(int customerAccountId, string wishlistName, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist> response;
 			var client = Mozu.Api.Clients.Commerce.WishlistClient.GetWishlistByNameClient( customerAccountId,  wishlistName,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Creates a new shopper wish list for the associated customer account. Although customer accounts are maintained at the tenant level, the system stores wish lists at the site level. Newly created wish lists do not have any items.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="wishlist">Properties of a shopper wish list defined for a site, associated with a customer account.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var wishlist = new Wishlist();
-		///   var wishlist = wishlist.CreateWishlist( wishlist,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist CreateWishlist(Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist wishlist, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist> response;
-			var client = Mozu.Api.Clients.Commerce.WishlistClient.CreateWishlistClient( wishlist,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Creates a new shopper wish list for the associated customer account. Although customer accounts are maintained at the tenant level, the system stores wish lists at the site level. Newly created wish lists do not have any items.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="wishlist">Properties of a shopper wish list defined for a site, associated with a customer account.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="wishlist">Properties of the wish list to create.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist"/>
 		/// </returns>
@@ -235,48 +134,23 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist CreateWishl
 		///   var wishlist = await wishlist.CreateWishlistAsync( wishlist,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist> CreateWishlistAsync(Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist wishlist, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist> CreateWishlistAsync(Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist wishlist, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist> response;
 			var client = Mozu.Api.Clients.Commerce.WishlistClient.CreateWishlistClient( wishlist,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates one or more properties of a shopper wish list defined for a customer account.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="wishlistId">Unique identifier of the wish list.</param>
-		/// <param name="wishlist">Properties of a shopper wish list defined for a site, associated with a customer account.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var wishlist = new Wishlist();
-		///   var wishlist = wishlist.UpdateWishlist( wishlist,  wishlistId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist UpdateWishlist(Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist wishlist, string wishlistId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist> response;
-			var client = Mozu.Api.Clients.Commerce.WishlistClient.UpdateWishlistClient( wishlist,  wishlistId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates one or more properties of a shopper wish list defined for a customer account.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="wishlistId">Unique identifier of the wish list.</param>
-		/// <param name="wishlist">Properties of a shopper wish list defined for a site, associated with a customer account.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="wishlistId">Unique identifier of the shopper wish list to update.</param>
+		/// <param name="wishlist">Properties of the shopper wish list to update.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist"/>
 		/// </returns>
@@ -286,43 +160,21 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist UpdateWishl
 		///   var wishlist = await wishlist.UpdateWishlistAsync( wishlist,  wishlistId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist> UpdateWishlistAsync(Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist wishlist, string wishlistId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist> UpdateWishlistAsync(Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist wishlist, string wishlistId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist> response;
 			var client = Mozu.Api.Clients.Commerce.WishlistClient.UpdateWishlistClient( wishlist,  wishlistId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Deletes the shopper wish list specified in the request and all items associated with it.
-		/// </summary>
-		/// <param name="wishlistId">Unique identifier of the wish list.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var wishlist = new Wishlist();
-		///   wishlist.DeleteWishlist( wishlistId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteWishlist(string wishlistId)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.WishlistClient.DeleteWishlistClient( wishlistId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes the shopper wish list specified in the request and all items associated with it.
+		/// 
 		/// </summary>
-		/// <param name="wishlistId">Unique identifier of the wish list.</param>
+		/// <param name="wishlistId">Unique identifier of the wish list to delete.</param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -332,12 +184,12 @@ public virtual void DeleteWishlist(string wishlistId)
 		///   await wishlist.DeleteWishlistAsync( wishlistId);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteWishlistAsync(string wishlistId)
+		public virtual async Task DeleteWishlistAsync(string wishlistId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.WishlistClient.DeleteWishlistClient( wishlistId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Commerce/Wishlists/WishlistItemResource.cs b/Mozu.Api/Resources/Commerce/Wishlists/WishlistItemResource.cs
old mode 100644
new mode 100755
index d2d4b83e..8200b040
--- a/Mozu.Api/Resources/Commerce/Wishlists/WishlistItemResource.cs
+++ b/Mozu.Api/Resources/Commerce/Wishlists/WishlistItemResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Commerce.Wishlists
 {
@@ -37,38 +38,13 @@ public WishlistItemResource CloneWithApiContext(Action<IApiContext> contextModif
 		}
 
 				
-		/// <summary>
-		/// Retrieves the details of an item in a shopper wish list.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="wishlistId">Unique identifier of the wish list.</param>
-		/// <param name="wishlistItemId">Unique identifier of the item to remove from the shopper wish list.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItem"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var wishlistitem = new WishlistItem();
-		///   var wishlistItem = wishlistitem.GetWishlistItem( wishlistId,  wishlistItemId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItem GetWishlistItem(string wishlistId, string wishlistItemId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItem> response;
-			var client = Mozu.Api.Clients.Commerce.Wishlists.WishlistItemClient.GetWishlistItemClient( wishlistId,  wishlistItemId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of an item in a shopper wish list.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="wishlistId">Unique identifier of the wish list.</param>
-		/// <param name="wishlistItemId">Unique identifier of the item to remove from the shopper wish list.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="wishlistId">Unique identifier of the wish list item to retrieve.</param>
+		/// <param name="wishlistItemId">Unique identifier of the wish list associated with the item to retrieve.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItem"/>
 		/// </returns>
@@ -78,54 +54,26 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItem GetWish
 		///   var wishlistItem = await wishlistitem.GetWishlistItemAsync( wishlistId,  wishlistItemId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItem> GetWishlistItemAsync(string wishlistId, string wishlistItemId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItem> GetWishlistItemAsync(string wishlistId, string wishlistItemId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItem> response;
 			var client = Mozu.Api.Clients.Commerce.Wishlists.WishlistItemClient.GetWishlistItemClient( wishlistId,  wishlistItemId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves a list of items in a shopper wish list according to any specified filter and sort criteria.
-		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
-		/// <param name="wishlistId">Unique identifier of the wish list.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItemCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var wishlistitem = new WishlistItem();
-		///   var wishlistItemCollection = wishlistitem.GetWishlistItems( wishlistId,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItemCollection GetWishlistItems(string wishlistId, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItemCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Wishlists.WishlistItemClient.GetWishlistItemsClient( wishlistId,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of items in a shopper wish list according to any specified filter and sort criteria.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
-		/// <param name="wishlistId">Unique identifier of the wish list.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
+		/// <param name="wishlistId">Unique identifier of the wish list associated with the items to retrieve.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItemCollection"/>
 		/// </returns>
@@ -135,56 +83,27 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItemCollecti
 		///   var wishlistItemCollection = await wishlistitem.GetWishlistItemsAsync( wishlistId,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItemCollection> GetWishlistItemsAsync(string wishlistId, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItemCollection> GetWishlistItemsAsync(string wishlistId, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItemCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Wishlists.WishlistItemClient.GetWishlistItemsClient( wishlistId,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieve a list of items in a customer wish list by supplying the wish list name.
-		/// </summary>
-		/// <param name="customerAccountId">The unique identifier of the customer account for which to retrieve wish lists.</param>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
-		/// <param name="wishlistName">The name of the wish list to retrieve.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItemCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var wishlistitem = new WishlistItem();
-		///   var wishlistItemCollection = wishlistitem.GetWishlistItemsByWishlistName( customerAccountId,  wishlistName,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItemCollection GetWishlistItemsByWishlistName(int customerAccountId, string wishlistName, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItemCollection> response;
-			var client = Mozu.Api.Clients.Commerce.Wishlists.WishlistItemClient.GetWishlistItemsByWishlistNameClient( customerAccountId,  wishlistName,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieve a list of items in a customer wish list by supplying the wish list name.
+		/// 
 		/// </summary>
-		/// <param name="customerAccountId">The unique identifier of the customer account for which to retrieve wish lists.</param>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
-		/// <param name="wishlistName">The name of the wish list to retrieve.</param>
+		/// <param name="customerAccountId">The unique identifier of the customer account associated with the wish list.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
+		/// <param name="wishlistName">The name of the wish list that contains the items to retrieve.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItemCollection"/>
 		/// </returns>
@@ -194,48 +113,23 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItemCollecti
 		///   var wishlistItemCollection = await wishlistitem.GetWishlistItemsByWishlistNameAsync( customerAccountId,  wishlistName,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItemCollection> GetWishlistItemsByWishlistNameAsync(int customerAccountId, string wishlistName, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItemCollection> GetWishlistItemsByWishlistNameAsync(int customerAccountId, string wishlistName, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItemCollection> response;
 			var client = Mozu.Api.Clients.Commerce.Wishlists.WishlistItemClient.GetWishlistItemsByWishlistNameClient( customerAccountId,  wishlistName,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Adds a product in a site's catalog as an item in a shopper wish list.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="wishlistId">Unique identifier of the wish list.</param>
-		/// <param name="wishlistItem">Properties of an item in a shopper wish list.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItem"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var wishlistitem = new WishlistItem();
-		///   var wishlistItem = wishlistitem.AddItemToWishlist( wishlistItem,  wishlistId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItem AddItemToWishlist(Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItem wishlistItem, string wishlistId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItem> response;
-			var client = Mozu.Api.Clients.Commerce.Wishlists.WishlistItemClient.AddItemToWishlistClient( wishlistItem,  wishlistId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Adds a product in a site's catalog as an item in a shopper wish list.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="wishlistId">Unique identifier of the wish list.</param>
-		/// <param name="wishlistItem">Properties of an item in a shopper wish list.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="wishlistId">Unique identifier of the wish list associated with the item to add.</param>
+		/// <param name="wishlistItem">Properties of the item to add to the wish list.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItem"/>
 		/// </returns>
@@ -245,50 +139,24 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItem AddItem
 		///   var wishlistItem = await wishlistitem.AddItemToWishlistAsync( wishlistItem,  wishlistId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItem> AddItemToWishlistAsync(Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItem wishlistItem, string wishlistId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItem> AddItemToWishlistAsync(Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItem wishlistItem, string wishlistId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItem> response;
 			var client = Mozu.Api.Clients.Commerce.Wishlists.WishlistItemClient.AddItemToWishlistClient( wishlistItem,  wishlistId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates the quantity of an item in a shopper wish list.
-		/// </summary>
-		/// <param name="quantity">The number of cart items in the shopper's active cart.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="wishlistId">Unique identifier of the wish list.</param>
-		/// <param name="wishlistItemId">Unique identifier of the item to remove from the shopper wish list.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItem"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var wishlistitem = new WishlistItem();
-		///   var wishlistItem = wishlistitem.UpdateWishlistItemQuantity( wishlistId,  wishlistItemId,  quantity,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItem UpdateWishlistItemQuantity(string wishlistId, string wishlistItemId, int quantity, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItem> response;
-			var client = Mozu.Api.Clients.Commerce.Wishlists.WishlistItemClient.UpdateWishlistItemQuantityClient( wishlistId,  wishlistItemId,  quantity,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates the quantity of an item in a shopper wish list.
+		/// 
 		/// </summary>
-		/// <param name="quantity">The number of cart items in the shopper's active cart.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="wishlistId">Unique identifier of the wish list.</param>
-		/// <param name="wishlistItemId">Unique identifier of the item to remove from the shopper wish list.</param>
+		/// <param name="quantity">The quantity of the item in the wish list.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="wishlistId">Unique identifier of the wish list associated with the item quantity to update.</param>
+		/// <param name="wishlistItemId">Unique identifier of the item in the wish list to update quantity.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItem"/>
 		/// </returns>
@@ -298,50 +166,24 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItem UpdateW
 		///   var wishlistItem = await wishlistitem.UpdateWishlistItemQuantityAsync( wishlistId,  wishlistItemId,  quantity,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItem> UpdateWishlistItemQuantityAsync(string wishlistId, string wishlistItemId, int quantity, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItem> UpdateWishlistItemQuantityAsync(string wishlistId, string wishlistItemId, int quantity, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItem> response;
 			var client = Mozu.Api.Clients.Commerce.Wishlists.WishlistItemClient.UpdateWishlistItemQuantityClient( wishlistId,  wishlistItemId,  quantity,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates the details of an item in a shopper wish list.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="wishlistId">Unique identifier of the wish list.</param>
-		/// <param name="wishlistItemId">Unique identifier of the item to remove from the shopper wish list.</param>
-		/// <param name="wishlistItem">Properties of an item in a shopper wish list.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItem"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var wishlistitem = new WishlistItem();
-		///   var wishlistItem = wishlistitem.UpdateWishlistItem( wishlistItem,  wishlistId,  wishlistItemId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItem UpdateWishlistItem(Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItem wishlistItem, string wishlistId, string wishlistItemId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItem> response;
-			var client = Mozu.Api.Clients.Commerce.Wishlists.WishlistItemClient.UpdateWishlistItemClient( wishlistItem,  wishlistId,  wishlistItemId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates the details of an item in a shopper wish list.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="wishlistId">Unique identifier of the wish list.</param>
-		/// <param name="wishlistItemId">Unique identifier of the item to remove from the shopper wish list.</param>
-		/// <param name="wishlistItem">Properties of an item in a shopper wish list.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="wishlistId">Unique identifier of the wish list associated with the item to update.</param>
+		/// <param name="wishlistItemId">Unique identifier of the item in the shopper wish list to update.</param>
+		/// <param name="wishlistItem">Properties of the shopper wish list item to update.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItem"/>
 		/// </returns>
@@ -351,44 +193,21 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItem UpdateW
 		///   var wishlistItem = await wishlistitem.UpdateWishlistItemAsync( wishlistItem,  wishlistId,  wishlistItemId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItem> UpdateWishlistItemAsync(Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItem wishlistItem, string wishlistId, string wishlistItemId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItem> UpdateWishlistItemAsync(Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItem wishlistItem, string wishlistId, string wishlistItemId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Wishlists.WishlistItem> response;
 			var client = Mozu.Api.Clients.Commerce.Wishlists.WishlistItemClient.UpdateWishlistItemClient( wishlistItem,  wishlistId,  wishlistItemId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Removes all items associated with a shopper wish list.
-		/// </summary>
-		/// <param name="wishlistId">Unique identifier of the wish list.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var wishlistitem = new WishlistItem();
-		///   var wishlist = wishlistitem.RemoveAllWishlistItems( wishlistId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist RemoveAllWishlistItems(string wishlistId)
-		{
-			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist> response;
-			var client = Mozu.Api.Clients.Commerce.Wishlists.WishlistItemClient.RemoveAllWishlistItemsClient( wishlistId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Removes all items associated with a shopper wish list.
+		/// 
 		/// </summary>
-		/// <param name="wishlistId">Unique identifier of the wish list.</param>
+		/// <param name="wishlistId">Unique identifier of the wish list associated with the items to remove.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist"/>
 		/// </returns>
@@ -398,44 +217,21 @@ public virtual Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist RemoveAllWi
 		///   var wishlist = await wishlistitem.RemoveAllWishlistItemsAsync( wishlistId);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist> RemoveAllWishlistItemsAsync(string wishlistId)
+		public virtual async Task<Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist> RemoveAllWishlistItemsAsync(string wishlistId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.CommerceRuntime.Wishlists.Wishlist> response;
 			var client = Mozu.Api.Clients.Commerce.Wishlists.WishlistItemClient.RemoveAllWishlistItemsClient( wishlistId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Removes an item from the wish list specified in the request.
-		/// </summary>
-		/// <param name="wishlistId">Unique identifier of the wish list.</param>
-		/// <param name="wishlistItemId">Unique identifier of the item to remove from the shopper wish list.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var wishlistitem = new WishlistItem();
-		///   wishlistitem.DeleteWishlistItem( wishlistId,  wishlistItemId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteWishlistItem(string wishlistId, string wishlistItemId)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Commerce.Wishlists.WishlistItemClient.DeleteWishlistItemClient( wishlistId,  wishlistItemId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Removes an item from the wish list specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="wishlistId">Unique identifier of the wish list.</param>
+		/// <param name="wishlistId">Unique identifier of the wish list associated with the item to remove.</param>
 		/// <param name="wishlistItemId">Unique identifier of the item to remove from the shopper wish list.</param>
 		/// <returns>
 		/// 
@@ -446,12 +242,12 @@ public virtual void DeleteWishlistItem(string wishlistId, string wishlistItemId)
 		///   await wishlistitem.DeleteWishlistItemAsync( wishlistId,  wishlistItemId);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteWishlistItemAsync(string wishlistId, string wishlistItemId)
+		public virtual async Task DeleteWishlistItemAsync(string wishlistId, string wishlistItemId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Commerce.Wishlists.WishlistItemClient.DeleteWishlistItemClient( wishlistId,  wishlistItemId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Content/DocumentDraftSummaryResource.cs b/Mozu.Api/Resources/Content/DocumentDraftSummaryResource.cs
old mode 100644
new mode 100755
index e8b0f4d9..cded823f
--- a/Mozu.Api/Resources/Content/DocumentDraftSummaryResource.cs
+++ b/Mozu.Api/Resources/Content/DocumentDraftSummaryResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Content
 {
@@ -37,40 +38,14 @@ public DocumentDraftSummaryResource CloneWithApiContext(Action<IApiContext> cont
 		}
 
 				
-		/// <summary>
-		/// Retrieves a list of the documents currently in draft state, according to any defined filter and sort criteria.
-		/// </summary>
-		/// <param name="documentLists">List of document lists that contain documents to delete.</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Content.DocumentDraftSummaryPagedCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var documentdraftsummary = new DocumentDraftSummary();
-		///   var documentDraftSummaryPagedCollection = documentdraftsummary.ListDocumentDraftSummaries( pageSize,  startIndex,  documentLists,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Content.DocumentDraftSummaryPagedCollection ListDocumentDraftSummaries(int? pageSize =  null, int? startIndex =  null, string documentLists =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Content.DocumentDraftSummaryPagedCollection> response;
-			var client = Mozu.Api.Clients.Content.DocumentDraftSummaryClient.ListDocumentDraftSummariesClient( pageSize,  startIndex,  documentLists,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of the documents currently in draft state, according to any defined filter and sort criteria.
+		/// 
 		/// </summary>
-		/// <param name="documentLists">List of document lists that contain documents to delete.</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+		/// <param name="documentLists">Lists that contain the document drafts.</param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Content.DocumentDraftSummaryPagedCollection"/>
 		/// </returns>
@@ -80,42 +55,19 @@ public virtual Mozu.Api.Contracts.Content.DocumentDraftSummaryPagedCollection Li
 		///   var documentDraftSummaryPagedCollection = await documentdraftsummary.ListDocumentDraftSummariesAsync( pageSize,  startIndex,  documentLists,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Content.DocumentDraftSummaryPagedCollection> ListDocumentDraftSummariesAsync(int? pageSize =  null, int? startIndex =  null, string documentLists =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Content.DocumentDraftSummaryPagedCollection> ListDocumentDraftSummariesAsync(int? pageSize =  null, int? startIndex =  null, string documentLists =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Content.DocumentDraftSummaryPagedCollection> response;
 			var client = Mozu.Api.Clients.Content.DocumentDraftSummaryClient.ListDocumentDraftSummariesClient( pageSize,  startIndex,  documentLists,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Deletes the drafts of the specified documents. Published documents cannot be deleted.
-		/// </summary>
-		/// <param name="documentLists">List of document lists that contain documents to delete.</param>
-		/// <param name="documentIds">Unique identifiers of the documents to delete.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var documentdraftsummary = new DocumentDraftSummary();
-		///   documentdraftsummary.DeleteDocumentDrafts( documentIds,  documentLists);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteDocumentDrafts(List<string> documentIds, string documentLists =  null)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Content.DocumentDraftSummaryClient.DeleteDocumentDraftsClient( documentIds,  documentLists);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes the drafts of the specified documents. Published documents cannot be deleted.
+		/// 
 		/// </summary>
 		/// <param name="documentLists">List of document lists that contain documents to delete.</param>
 		/// <param name="documentIds">Unique identifiers of the documents to delete.</param>
@@ -128,44 +80,21 @@ public virtual void DeleteDocumentDrafts(List<string> documentIds, string docume
 		///   await documentdraftsummary.DeleteDocumentDraftsAsync( documentIds,  documentLists);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteDocumentDraftsAsync(List<string> documentIds, string documentLists =  null)
+		public virtual async Task DeleteDocumentDraftsAsync(List<string> documentIds, string documentLists =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Content.DocumentDraftSummaryClient.DeleteDocumentDraftsClient( documentIds,  documentLists);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
-		/// <summary>
-		/// Publish one or more document drafts to live content on the site.
-		/// </summary>
-		/// <param name="documentLists">List of document lists that contain documents to delete.</param>
-		/// <param name="documentIds">Unique identifiers of the documents to delete.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var documentdraftsummary = new DocumentDraftSummary();
-		///   documentdraftsummary.PublishDocuments( documentIds,  documentLists);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void PublishDocuments(List<string> documentIds, string documentLists =  null)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Content.DocumentDraftSummaryClient.PublishDocumentsClient( documentIds,  documentLists);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Publish one or more document drafts to live content on the site.
+		/// 
 		/// </summary>
-		/// <param name="documentLists">List of document lists that contain documents to delete.</param>
-		/// <param name="documentIds">Unique identifiers of the documents to delete.</param>
+		/// <param name="documentLists">List of document lists that contain documents to publish.</param>
+		/// <param name="documentIds">List of unique identifiers of the document drafts to publish.</param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -175,12 +104,12 @@ public virtual void PublishDocuments(List<string> documentIds, string documentLi
 		///   await documentdraftsummary.PublishDocumentsAsync( documentIds,  documentLists);
 		/// </code>
 		/// </example>
-		public virtual async Task PublishDocumentsAsync(List<string> documentIds, string documentLists =  null)
+		public virtual async Task PublishDocumentsAsync(List<string> documentIds, string documentLists =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Content.DocumentDraftSummaryClient.PublishDocumentsClient( documentIds,  documentLists);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Content/DocumentListResource.cs b/Mozu.Api/Resources/Content/DocumentListResource.cs
old mode 100644
new mode 100755
index f797869b..fe9b8282
--- a/Mozu.Api/Resources/Content/DocumentListResource.cs
+++ b/Mozu.Api/Resources/Content/DocumentListResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Content
 {
@@ -44,37 +45,12 @@ public DocumentListResource(IApiContext apiContext, DataViewMode dataViewMode)
 			_dataViewMode = dataViewMode;
 		}
 				
-		/// <summary>
-		/// Retrieves a collection of document lists.
-		/// </summary>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="startIndex"></param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Content.DocumentListCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var documentlist = new DocumentList();
-		///   var documentListCollection = documentlist.GetDocumentLists(_dataViewMode,  pageSize,  startIndex,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Content.DocumentListCollection GetDocumentLists(int? pageSize =  null, int? startIndex =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Content.DocumentListCollection> response;
-			var client = Mozu.Api.Clients.Content.DocumentListClient.GetDocumentListsClient(_dataViewMode,  pageSize,  startIndex,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a collection of document lists.
+		/// 
 		/// </summary>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
 		/// <param name="startIndex"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Content.DocumentListCollection"/>
@@ -85,46 +61,22 @@ public virtual Mozu.Api.Contracts.Content.DocumentListCollection GetDocumentList
 		///   var documentListCollection = await documentlist.GetDocumentListsAsync(_dataViewMode,  pageSize,  startIndex,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Content.DocumentListCollection> GetDocumentListsAsync(int? pageSize =  null, int? startIndex =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Content.DocumentListCollection> GetDocumentListsAsync(int? pageSize =  null, int? startIndex =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Content.DocumentListCollection> response;
 			var client = Mozu.Api.Clients.Content.DocumentListClient.GetDocumentListsClient(_dataViewMode,  pageSize,  startIndex,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieve the details of a document list by providing the list name.
-		/// </summary>
-		/// <param name="documentListName">Name of content documentListName to delete</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Content.DocumentList"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var documentlist = new DocumentList();
-		///   var documentList = documentlist.GetDocumentList(_dataViewMode,  documentListName,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Content.DocumentList GetDocumentList(string documentListName, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Content.DocumentList> response;
-			var client = Mozu.Api.Clients.Content.DocumentListClient.GetDocumentListClient(_dataViewMode,  documentListName,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieve the details of a document list by providing the list name.
+		/// 
 		/// </summary>
-		/// <param name="documentListName">Name of content documentListName to delete</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="documentListName">The name of the document list.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Content.DocumentList"/>
 		/// </returns>
@@ -134,46 +86,22 @@ public virtual Mozu.Api.Contracts.Content.DocumentList GetDocumentList(string do
 		///   var documentList = await documentlist.GetDocumentListAsync(_dataViewMode,  documentListName,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Content.DocumentList> GetDocumentListAsync(string documentListName, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Content.DocumentList> GetDocumentListAsync(string documentListName, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Content.DocumentList> response;
 			var client = Mozu.Api.Clients.Content.DocumentListClient.GetDocumentListClient(_dataViewMode,  documentListName,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Creates a new documentList
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="list">The list of document types and related properties that define content used by the content management system (CMS).</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Content.DocumentList"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var documentlist = new DocumentList();
-		///   var documentList = documentlist.CreateDocumentList(_dataViewMode,  list,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Content.DocumentList CreateDocumentList(Mozu.Api.Contracts.Content.DocumentList list, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Content.DocumentList> response;
-			var client = Mozu.Api.Clients.Content.DocumentListClient.CreateDocumentListClient(_dataViewMode,  list,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Creates a new documentList
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="list">The list of document types and related properties that define content used by the content management system (CMS).</param>
+		/// <param name="responseFields"></param>
+		/// <param name="list"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Content.DocumentList"/>
 		/// </returns>
@@ -183,48 +111,23 @@ public virtual Mozu.Api.Contracts.Content.DocumentList CreateDocumentList(Mozu.A
 		///   var documentList = await documentlist.CreateDocumentListAsync(_dataViewMode,  list,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Content.DocumentList> CreateDocumentListAsync(Mozu.Api.Contracts.Content.DocumentList list, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Content.DocumentList> CreateDocumentListAsync(Mozu.Api.Contracts.Content.DocumentList list, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Content.DocumentList> response;
 			var client = Mozu.Api.Clients.Content.DocumentListClient.CreateDocumentListClient(_dataViewMode,  list,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates a `DocumentListName`.
-		/// </summary>
-		/// <param name="documentListName">Name of content documentListName to delete</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="list">The list of document types and related properties that define content used by the content management system (CMS).</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Content.DocumentList"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var documentlist = new DocumentList();
-		///   var documentList = documentlist.UpdateDocumentList( list,  documentListName,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Content.DocumentList UpdateDocumentList(Mozu.Api.Contracts.Content.DocumentList list, string documentListName, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Content.DocumentList> response;
-			var client = Mozu.Api.Clients.Content.DocumentListClient.UpdateDocumentListClient( list,  documentListName,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates a `DocumentListName`.
+		/// 
 		/// </summary>
-		/// <param name="documentListName">Name of content documentListName to delete</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="list">The list of document types and related properties that define content used by the content management system (CMS).</param>
+		/// <param name="documentListName"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="list"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Content.DocumentList"/>
 		/// </returns>
@@ -234,43 +137,21 @@ public virtual Mozu.Api.Contracts.Content.DocumentList UpdateDocumentList(Mozu.A
 		///   var documentList = await documentlist.UpdateDocumentListAsync( list,  documentListName,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Content.DocumentList> UpdateDocumentListAsync(Mozu.Api.Contracts.Content.DocumentList list, string documentListName, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Content.DocumentList> UpdateDocumentListAsync(Mozu.Api.Contracts.Content.DocumentList list, string documentListName, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Content.DocumentList> response;
 			var client = Mozu.Api.Clients.Content.DocumentListClient.UpdateDocumentListClient( list,  documentListName,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Deletes the specified `DocumentListName`.
-		/// </summary>
-		/// <param name="documentListName">Name of content documentListName to delete</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var documentlist = new DocumentList();
-		///   documentlist.DeleteDocumentList( documentListName);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteDocumentList(string documentListName)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Content.DocumentListClient.DeleteDocumentListClient( documentListName);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes the specified `DocumentListName`.
+		/// 
 		/// </summary>
-		/// <param name="documentListName">Name of content documentListName to delete</param>
+		/// <param name="documentListName"></param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -280,12 +161,12 @@ public virtual void DeleteDocumentList(string documentListName)
 		///   await documentlist.DeleteDocumentListAsync( documentListName);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteDocumentListAsync(string documentListName)
+		public virtual async Task DeleteDocumentListAsync(string documentListName, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Content.DocumentListClient.DeleteDocumentListClient( documentListName);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Content/DocumentListTypeResource.cs b/Mozu.Api/Resources/Content/DocumentListTypeResource.cs
old mode 100644
new mode 100755
index 65a50a54..daa38d14
--- a/Mozu.Api/Resources/Content/DocumentListTypeResource.cs
+++ b/Mozu.Api/Resources/Content/DocumentListTypeResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Content
 {
 	/// <summary>
-	/// Use the Document List Types resource to manage the types of document lists in your site's document hierarchy. The type denotes a content type for that list of folders, sub-folders, and documents such as `web_pages`.
+	/// 
 	/// </summary>
 	public partial class DocumentListTypeResource  	{
 		///
@@ -44,38 +45,13 @@ public DocumentListTypeResource(IApiContext apiContext, DataViewMode dataViewMod
 			_dataViewMode = dataViewMode;
 		}
 				
-		/// <summary>
-		/// Gets all the available documentListTypes.
-		/// </summary>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Content.DocumentListTypeCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var documentlisttype = new DocumentListType();
-		///   var documentListTypeCollection = documentlisttype.GetDocumentListTypes(_dataViewMode,  pageSize,  startIndex,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Content.DocumentListTypeCollection GetDocumentListTypes(int? pageSize =  null, int? startIndex =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Content.DocumentListTypeCollection> response;
-			var client = Mozu.Api.Clients.Content.DocumentListTypeClient.GetDocumentListTypesClient(_dataViewMode,  pageSize,  startIndex,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Gets all the available documentListTypes.
+		/// 
 		/// </summary>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Content.DocumentListTypeCollection"/>
 		/// </returns>
@@ -85,46 +61,22 @@ public virtual Mozu.Api.Contracts.Content.DocumentListTypeCollection GetDocument
 		///   var documentListTypeCollection = await documentlisttype.GetDocumentListTypesAsync(_dataViewMode,  pageSize,  startIndex,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Content.DocumentListTypeCollection> GetDocumentListTypesAsync(int? pageSize =  null, int? startIndex =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Content.DocumentListTypeCollection> GetDocumentListTypesAsync(int? pageSize =  null, int? startIndex =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Content.DocumentListTypeCollection> response;
 			var client = Mozu.Api.Clients.Content.DocumentListTypeClient.GetDocumentListTypesClient(_dataViewMode,  pageSize,  startIndex,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Gets a documentListType.
-		/// </summary>
-		/// <param name="documentListTypeFQN"></param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Content.DocumentListType"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var documentlisttype = new DocumentListType();
-		///   var documentListType = documentlisttype.GetDocumentListType(_dataViewMode,  documentListTypeFQN,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Content.DocumentListType GetDocumentListType(string documentListTypeFQN, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Content.DocumentListType> response;
-			var client = Mozu.Api.Clients.Content.DocumentListTypeClient.GetDocumentListTypeClient(_dataViewMode,  documentListTypeFQN,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Gets a documentListType.
+		/// 
 		/// </summary>
 		/// <param name="documentListTypeFQN"></param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Content.DocumentListType"/>
 		/// </returns>
@@ -134,46 +86,22 @@ public virtual Mozu.Api.Contracts.Content.DocumentListType GetDocumentListType(s
 		///   var documentListType = await documentlisttype.GetDocumentListTypeAsync(_dataViewMode,  documentListTypeFQN,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Content.DocumentListType> GetDocumentListTypeAsync(string documentListTypeFQN, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Content.DocumentListType> GetDocumentListTypeAsync(string documentListTypeFQN, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Content.DocumentListType> response;
 			var client = Mozu.Api.Clients.Content.DocumentListTypeClient.GetDocumentListTypeClient(_dataViewMode,  documentListTypeFQN,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Creates a new documentListType.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="list">Properties for the document list type. Document lists contain documents with an associated document type, such as web pages.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Content.DocumentListType"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var documentlisttype = new DocumentListType();
-		///   var documentListType = documentlisttype.CreateDocumentListType(_dataViewMode,  list,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Content.DocumentListType CreateDocumentListType(Mozu.Api.Contracts.Content.DocumentListType list, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Content.DocumentListType> response;
-			var client = Mozu.Api.Clients.Content.DocumentListTypeClient.CreateDocumentListTypeClient(_dataViewMode,  list,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Creates a new documentListType.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="list">Properties for the document list type. Document lists contain documents with an associated document type, such as web pages.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="list"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Content.DocumentListType"/>
 		/// </returns>
@@ -183,48 +111,23 @@ public virtual Mozu.Api.Contracts.Content.DocumentListType CreateDocumentListTyp
 		///   var documentListType = await documentlisttype.CreateDocumentListTypeAsync(_dataViewMode,  list,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Content.DocumentListType> CreateDocumentListTypeAsync(Mozu.Api.Contracts.Content.DocumentListType list, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Content.DocumentListType> CreateDocumentListTypeAsync(Mozu.Api.Contracts.Content.DocumentListType list, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Content.DocumentListType> response;
 			var client = Mozu.Api.Clients.Content.DocumentListTypeClient.CreateDocumentListTypeClient(_dataViewMode,  list,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates a DocumentListType
-		/// </summary>
-		/// <param name="documentListTypeFQN"></param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="list">Properties for the document list type. Document lists contain documents with an associated document type, such as web pages.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Content.DocumentListType"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var documentlisttype = new DocumentListType();
-		///   var documentListType = documentlisttype.UpdateDocumentListType( list,  documentListTypeFQN,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Content.DocumentListType UpdateDocumentListType(Mozu.Api.Contracts.Content.DocumentListType list, string documentListTypeFQN, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Content.DocumentListType> response;
-			var client = Mozu.Api.Clients.Content.DocumentListTypeClient.UpdateDocumentListTypeClient( list,  documentListTypeFQN,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates a DocumentListType
+		/// 
 		/// </summary>
 		/// <param name="documentListTypeFQN"></param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="list">Properties for the document list type. Document lists contain documents with an associated document type, such as web pages.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="list"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Content.DocumentListType"/>
 		/// </returns>
@@ -234,12 +137,12 @@ public virtual Mozu.Api.Contracts.Content.DocumentListType UpdateDocumentListTyp
 		///   var documentListType = await documentlisttype.UpdateDocumentListTypeAsync( list,  documentListTypeFQN,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Content.DocumentListType> UpdateDocumentListTypeAsync(Mozu.Api.Contracts.Content.DocumentListType list, string documentListTypeFQN, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Content.DocumentListType> UpdateDocumentListTypeAsync(Mozu.Api.Contracts.Content.DocumentListType list, string documentListTypeFQN, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Content.DocumentListType> response;
 			var client = Mozu.Api.Clients.Content.DocumentListTypeClient.UpdateDocumentListTypeClient( list,  documentListTypeFQN,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
diff --git a/Mozu.Api/Resources/Content/DocumentTypeResource.cs b/Mozu.Api/Resources/Content/DocumentTypeResource.cs
old mode 100644
new mode 100755
index e5cd665a..cd77d9bf
--- a/Mozu.Api/Resources/Content/DocumentTypeResource.cs
+++ b/Mozu.Api/Resources/Content/DocumentTypeResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Content
 {
@@ -44,38 +45,13 @@ public DocumentTypeResource(IApiContext apiContext, DataViewMode dataViewMode)
 			_dataViewMode = dataViewMode;
 		}
 				
-		/// <summary>
-		/// Retrieves a paged list of the system-defined document types.
-		/// </summary>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Content.DocumentTypeCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var documenttype = new DocumentType();
-		///   var documentTypeCollection = documenttype.GetDocumentTypes(_dataViewMode,  pageSize,  startIndex,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Content.DocumentTypeCollection GetDocumentTypes(int? pageSize =  null, int? startIndex =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Content.DocumentTypeCollection> response;
-			var client = Mozu.Api.Clients.Content.DocumentTypeClient.GetDocumentTypesClient(_dataViewMode,  pageSize,  startIndex,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a paged list of the system-defined document types.
+		/// 
 		/// </summary>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Content.DocumentTypeCollection"/>
 		/// </returns>
@@ -85,46 +61,22 @@ public virtual Mozu.Api.Contracts.Content.DocumentTypeCollection GetDocumentType
 		///   var documentTypeCollection = await documenttype.GetDocumentTypesAsync(_dataViewMode,  pageSize,  startIndex,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Content.DocumentTypeCollection> GetDocumentTypesAsync(int? pageSize =  null, int? startIndex =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Content.DocumentTypeCollection> GetDocumentTypesAsync(int? pageSize =  null, int? startIndex =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Content.DocumentTypeCollection> response;
 			var client = Mozu.Api.Clients.Content.DocumentTypeClient.GetDocumentTypesClient(_dataViewMode,  pageSize,  startIndex,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves a system-defined document type.
-		/// </summary>
-		/// <param name="documentTypeName">The name of the document type to retrieve.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Content.DocumentType"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var documenttype = new DocumentType();
-		///   var documentType = documenttype.GetDocumentType(_dataViewMode,  documentTypeName,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Content.DocumentType GetDocumentType(string documentTypeName, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Content.DocumentType> response;
-			var client = Mozu.Api.Clients.Content.DocumentTypeClient.GetDocumentTypeClient(_dataViewMode,  documentTypeName,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a system-defined document type.
+		/// 
 		/// </summary>
 		/// <param name="documentTypeName">The name of the document type to retrieve.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Content.DocumentType"/>
 		/// </returns>
@@ -134,46 +86,22 @@ public virtual Mozu.Api.Contracts.Content.DocumentType GetDocumentType(string do
 		///   var documentType = await documenttype.GetDocumentTypeAsync(_dataViewMode,  documentTypeName,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Content.DocumentType> GetDocumentTypeAsync(string documentTypeName, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Content.DocumentType> GetDocumentTypeAsync(string documentTypeName, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Content.DocumentType> response;
 			var client = Mozu.Api.Clients.Content.DocumentTypeClient.GetDocumentTypeClient(_dataViewMode,  documentTypeName,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Creates a new DocumentType
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="documentType">The type of documents used in the CMS such as "web_page" or "template" or "image_url".</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Content.DocumentType"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var documenttype = new DocumentType();
-		///   var documentType = documenttype.CreateDocumentType(_dataViewMode,  documentType,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Content.DocumentType CreateDocumentType(Mozu.Api.Contracts.Content.DocumentType documentType, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Content.DocumentType> response;
-			var client = Mozu.Api.Clients.Content.DocumentTypeClient.CreateDocumentTypeClient(_dataViewMode,  documentType,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Creates a new DocumentType
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="documentType">The type of documents used in the CMS such as "web_page" or "template" or "image_url".</param>
+		/// <param name="responseFields"></param>
+		/// <param name="documentType"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Content.DocumentType"/>
 		/// </returns>
@@ -183,48 +111,23 @@ public virtual Mozu.Api.Contracts.Content.DocumentType CreateDocumentType(Mozu.A
 		///   var documentType = await documenttype.CreateDocumentTypeAsync(_dataViewMode,  documentType,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Content.DocumentType> CreateDocumentTypeAsync(Mozu.Api.Contracts.Content.DocumentType documentType, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Content.DocumentType> CreateDocumentTypeAsync(Mozu.Api.Contracts.Content.DocumentType documentType, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Content.DocumentType> response;
 			var client = Mozu.Api.Clients.Content.DocumentTypeClient.CreateDocumentTypeClient(_dataViewMode,  documentType,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates a DocumentType
-		/// </summary>
-		/// <param name="documentTypeName">The name of the document type to retrieve.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="documentType">The type of documents used in the CMS such as "web_page" or "template" or "image_url".</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Content.DocumentType"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var documenttype = new DocumentType();
-		///   var documentType = documenttype.UpdateDocumentType( documentType,  documentTypeName,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Content.DocumentType UpdateDocumentType(Mozu.Api.Contracts.Content.DocumentType documentType, string documentTypeName, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Content.DocumentType> response;
-			var client = Mozu.Api.Clients.Content.DocumentTypeClient.UpdateDocumentTypeClient( documentType,  documentTypeName,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates a DocumentType
+		/// 
 		/// </summary>
-		/// <param name="documentTypeName">The name of the document type to retrieve.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="documentType">The type of documents used in the CMS such as "web_page" or "template" or "image_url".</param>
+		/// <param name="documentTypeName"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="documentType"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Content.DocumentType"/>
 		/// </returns>
@@ -234,12 +137,12 @@ public virtual Mozu.Api.Contracts.Content.DocumentType UpdateDocumentType(Mozu.A
 		///   var documentType = await documenttype.UpdateDocumentTypeAsync( documentType,  documentTypeName,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Content.DocumentType> UpdateDocumentTypeAsync(Mozu.Api.Contracts.Content.DocumentType documentType, string documentTypeName, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Content.DocumentType> UpdateDocumentTypeAsync(Mozu.Api.Contracts.Content.DocumentType documentType, string documentTypeName, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Content.DocumentType> response;
 			var client = Mozu.Api.Clients.Content.DocumentTypeClient.UpdateDocumentTypeClient( documentType,  documentTypeName,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
diff --git a/Mozu.Api/Resources/Content/Documentlists/DocumentResource.cs b/Mozu.Api/Resources/Content/Documentlists/DocumentResource.cs
old mode 100644
new mode 100755
index 7d2e2298..5cc297d6
--- a/Mozu.Api/Resources/Content/Documentlists/DocumentResource.cs
+++ b/Mozu.Api/Resources/Content/Documentlists/DocumentResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Content.Documentlists
 {
@@ -44,36 +45,12 @@ public DocumentResource(IApiContext apiContext, DataViewMode dataViewMode)
 			_dataViewMode = dataViewMode;
 		}
 				
-		/// <summary>
-		/// Retrieve the content associated with a document, such as a product image or PDF specifications file, by supplying the document ID.
-		/// </summary>
-		/// <param name="documentId">Unique identifier for a document, used by content and document calls. Document IDs are associated with document types, document type lists, sites, and tenants.</param>
-		/// <param name="documentListName">Name of content documentListName to delete</param>
-		/// <returns>
-		/// <see cref="System.IO.Stream"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var document = new Document();
-		///   var stream = document.GetDocumentContent(_dataViewMode,  documentListName,  documentId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual System.IO.Stream GetDocumentContent(string documentListName, string documentId)
-		{
-			MozuClient<System.IO.Stream> response;
-			var client = Mozu.Api.Clients.Content.Documentlists.DocumentClient.GetDocumentContentClient(_dataViewMode,  documentListName,  documentId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieve the content associated with a document, such as a product image or PDF specifications file, by supplying the document ID.
+		/// 
 		/// </summary>
-		/// <param name="documentId">Unique identifier for a document, used by content and document calls. Document IDs are associated with document types, document type lists, sites, and tenants.</param>
-		/// <param name="documentListName">Name of content documentListName to delete</param>
+		/// <param name="documentId">Unique identifier of the document.</param>
+		/// <param name="documentListName">The name of the document list associated with the document.</param>
 		/// <returns>
 		/// <see cref="System.IO.Stream"/>
 		/// </returns>
@@ -83,60 +60,29 @@ public virtual System.IO.Stream GetDocumentContent(string documentListName, stri
 		///   var stream = await document.GetDocumentContentAsync(_dataViewMode,  documentListName,  documentId);
 		/// </code>
 		/// </example>
-		public virtual async Task<System.IO.Stream> GetDocumentContentAsync(string documentListName, string documentId)
+		public virtual async Task<System.IO.Stream> GetDocumentContentAsync(string documentListName, string documentId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<System.IO.Stream> response;
 			var client = Mozu.Api.Clients.Content.Documentlists.DocumentClient.GetDocumentContentClient(_dataViewMode,  documentListName,  documentId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Performs transformations on a document. For example, resizing an image.
-		/// </summary>
-		/// <param name="crop">Crops the image based on the specified coordinates. The reference point for positive coordinates is the top-left corner of the image, and the reference point for negative coordinates is the bottom-right corner of the image.Usage: Example:  removes 10 pixels from all edges of the image.  leaves the image uncropped.</param>
-		/// <param name="documentId">Unique identifier for a document, used by content and document calls. Document IDs are associated with document types, document type lists, sites, and tenants.</param>
-		/// <param name="documentListName">Name of content documentListName to delete</param>
-		/// <param name="height">Specifies an exact height dimension for the image, in pixels.</param>
-		/// <param name="max">Specifies a pixel limitation for the largest side of an image.</param>
-		/// <param name="maxHeight">Specifies a pixel limitation for the height of the image, preserving the aspect ratio if the image needs resizing.</param>
-		/// <param name="maxWidth">Specifies a pixel limitation for the width of the image, preserving the aspect ratio if the image needs resizing.</param>
-		/// <param name="quality">Adjusts the image compression. Accepts values from 0-100, where 100 = highest quality, least compression.</param>
-		/// <param name="width">Specifies an exact width dimension for the image, in pixels.</param>
-		/// <returns>
-		/// <see cref="System.IO.Stream"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var document = new Document();
-		///   var stream = document.TransformDocumentContent( documentListName,  documentId,  width,  height,  max,  maxWidth,  maxHeight,  crop,  quality);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual System.IO.Stream TransformDocumentContent(string documentListName, string documentId, int? width =  null, int? height =  null, int? max =  null, int? maxWidth =  null, int? maxHeight =  null, string crop =  null, int? quality =  null)
-		{
-			MozuClient<System.IO.Stream> response;
-			var client = Mozu.Api.Clients.Content.Documentlists.DocumentClient.TransformDocumentContentClient( documentListName,  documentId,  width,  height,  max,  maxWidth,  maxHeight,  crop,  quality);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Performs transformations on a document. For example, resizing an image.
+		/// 
 		/// </summary>
-		/// <param name="crop">Crops the image based on the specified coordinates. The reference point for positive coordinates is the top-left corner of the image, and the reference point for negative coordinates is the bottom-right corner of the image.Usage: Example:  removes 10 pixels from all edges of the image.  leaves the image uncropped.</param>
-		/// <param name="documentId">Unique identifier for a document, used by content and document calls. Document IDs are associated with document types, document type lists, sites, and tenants.</param>
-		/// <param name="documentListName">Name of content documentListName to delete</param>
-		/// <param name="height">Specifies an exact height dimension for the image, in pixels.</param>
-		/// <param name="max">Specifies a pixel limitation for the largest side of an image.</param>
-		/// <param name="maxHeight">Specifies a pixel limitation for the height of the image, preserving the aspect ratio if the image needs resizing.</param>
-		/// <param name="maxWidth">Specifies a pixel limitation for the width of the image, preserving the aspect ratio if the image needs resizing.</param>
-		/// <param name="quality">Adjusts the image compression. Accepts values from 0-100, where 100 = highest quality, least compression.</param>
-		/// <param name="width">Specifies an exact width dimension for the image, in pixels.</param>
+		/// <param name="crop"></param>
+		/// <param name="documentId"></param>
+		/// <param name="documentListName"></param>
+		/// <param name="height"></param>
+		/// <param name="max"></param>
+		/// <param name="maxHeight"></param>
+		/// <param name="maxWidth"></param>
+		/// <param name="quality"></param>
+		/// <param name="width"></param>
 		/// <returns>
 		/// <see cref="System.IO.Stream"/>
 		/// </returns>
@@ -146,50 +92,24 @@ public virtual System.IO.Stream TransformDocumentContent(string documentListName
 		///   var stream = await document.TransformDocumentContentAsync( documentListName,  documentId,  width,  height,  max,  maxWidth,  maxHeight,  crop,  quality);
 		/// </code>
 		/// </example>
-		public virtual async Task<System.IO.Stream> TransformDocumentContentAsync(string documentListName, string documentId, int? width =  null, int? height =  null, int? max =  null, int? maxWidth =  null, int? maxHeight =  null, string crop =  null, int? quality =  null)
+		public virtual async Task<System.IO.Stream> TransformDocumentContentAsync(string documentListName, string documentId, int? width =  null, int? height =  null, int? max =  null, int? maxWidth =  null, int? maxHeight =  null, string crop =  null, int? quality =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<System.IO.Stream> response;
 			var client = Mozu.Api.Clients.Content.Documentlists.DocumentClient.TransformDocumentContentClient( documentListName,  documentId,  width,  height,  max,  maxWidth,  maxHeight,  crop,  quality);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves a document within the specified document list.
-		/// </summary>
-		/// <param name="documentId">Unique identifier for a document, used by content and document calls. Document IDs are associated with document types, document type lists, sites, and tenants.</param>
-		/// <param name="documentListName">Name of content documentListName to delete</param>
-		/// <param name="includeInactive">Include inactive content.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Content.Document"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var document = new Document();
-		///   var document = document.GetDocument(_dataViewMode,  documentListName,  documentId,  includeInactive,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Content.Document GetDocument(string documentListName, string documentId, bool? includeInactive =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Content.Document> response;
-			var client = Mozu.Api.Clients.Content.Documentlists.DocumentClient.GetDocumentClient(_dataViewMode,  documentListName,  documentId,  includeInactive,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a document within the specified document list.
+		/// 
 		/// </summary>
-		/// <param name="documentId">Unique identifier for a document, used by content and document calls. Document IDs are associated with document types, document type lists, sites, and tenants.</param>
-		/// <param name="documentListName">Name of content documentListName to delete</param>
-		/// <param name="includeInactive">Include inactive content.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="documentId">Identifier of the document being retrieved.</param>
+		/// <param name="documentListName">The name of the document list associated with the document to retrieve.</param>
+		/// <param name="includeInactive"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Content.Document"/>
 		/// </returns>
@@ -199,56 +119,27 @@ public virtual Mozu.Api.Contracts.Content.Document GetDocument(string documentLi
 		///   var document = await document.GetDocumentAsync(_dataViewMode,  documentListName,  documentId,  includeInactive,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Content.Document> GetDocumentAsync(string documentListName, string documentId, bool? includeInactive =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Content.Document> GetDocumentAsync(string documentListName, string documentId, bool? includeInactive =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Content.Document> response;
 			var client = Mozu.Api.Clients.Content.Documentlists.DocumentClient.GetDocumentClient(_dataViewMode,  documentListName,  documentId,  includeInactive,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves a collection of documents according to any filter and sort criteria.
-		/// </summary>
-		/// <param name="documentListName">Name of content documentListName to delete</param>
-		/// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-		/// <param name="includeInactive">Include inactive content.</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Content.DocumentCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var document = new Document();
-		///   var documentCollection = document.GetDocuments(_dataViewMode,  documentListName,  filter,  sortBy,  pageSize,  startIndex,  includeInactive,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Content.DocumentCollection GetDocuments(string documentListName, string filter =  null, string sortBy =  null, int? pageSize =  null, int? startIndex =  null, bool? includeInactive =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Content.DocumentCollection> response;
-			var client = Mozu.Api.Clients.Content.Documentlists.DocumentClient.GetDocumentsClient(_dataViewMode,  documentListName,  filter,  sortBy,  pageSize,  startIndex,  includeInactive,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a collection of documents according to any filter and sort criteria.
+		/// 
 		/// </summary>
-		/// <param name="documentListName">Name of content documentListName to delete</param>
-		/// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-		/// <param name="includeInactive">Include inactive content.</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+		/// <param name="documentListName">The name of the document list.</param>
+		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. You can filter a document's search results by any of its properties, including its name or folder path. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=Name+sw+Events"</param>
+		/// <param name="includeInactive"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Content.DocumentCollection"/>
 		/// </returns>
@@ -258,48 +149,23 @@ public virtual Mozu.Api.Contracts.Content.DocumentCollection GetDocuments(string
 		///   var documentCollection = await document.GetDocumentsAsync(_dataViewMode,  documentListName,  filter,  sortBy,  pageSize,  startIndex,  includeInactive,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Content.DocumentCollection> GetDocumentsAsync(string documentListName, string filter =  null, string sortBy =  null, int? pageSize =  null, int? startIndex =  null, bool? includeInactive =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Content.DocumentCollection> GetDocumentsAsync(string documentListName, string filter =  null, string sortBy =  null, int? pageSize =  null, int? startIndex =  null, bool? includeInactive =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Content.DocumentCollection> response;
 			var client = Mozu.Api.Clients.Content.Documentlists.DocumentClient.GetDocumentsClient(_dataViewMode,  documentListName,  filter,  sortBy,  pageSize,  startIndex,  includeInactive,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Creates a new document in an defined document list.
-		/// </summary>
-		/// <param name="documentListName">Name of content documentListName to delete</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="document">The document properties that define the content used by the content management system (CMS).</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Content.Document"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var document = new Document();
-		///   var document = document.CreateDocument(_dataViewMode,  document,  documentListName,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Content.Document CreateDocument(Mozu.Api.Contracts.Content.Document document, string documentListName, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Content.Document> response;
-			var client = Mozu.Api.Clients.Content.Documentlists.DocumentClient.CreateDocumentClient(_dataViewMode,  document,  documentListName,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Creates a new document in an defined document list.
+		/// 
 		/// </summary>
-		/// <param name="documentListName">Name of content documentListName to delete</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="document">The document properties that define the content used by the content management system (CMS).</param>
+		/// <param name="documentListName">The descriptive alphanumeric document list name being created.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="document">The descriptive name of the newly created document.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Content.Document"/>
 		/// </returns>
@@ -309,47 +175,23 @@ public virtual Mozu.Api.Contracts.Content.Document CreateDocument(Mozu.Api.Contr
 		///   var document = await document.CreateDocumentAsync(_dataViewMode,  document,  documentListName,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Content.Document> CreateDocumentAsync(Mozu.Api.Contracts.Content.Document document, string documentListName, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Content.Document> CreateDocumentAsync(Mozu.Api.Contracts.Content.Document document, string documentListName, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Content.Document> response;
 			var client = Mozu.Api.Clients.Content.Documentlists.DocumentClient.CreateDocumentClient(_dataViewMode,  document,  documentListName,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates the binary data or content associated with a document, such as a product image or PDF specifications file, by supplying the document ID.
-		/// </summary>
-		/// <param name="documentId">Unique identifier for a document, used by content and document calls. Document IDs are associated with document types, document type lists, sites, and tenants.</param>
-		/// <param name="documentListName">Name of content documentListName to delete</param>
-		/// <param name="stream">Data stream that delivers information. Used to input and output data.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var document = new Document();
-		///   document.UpdateDocumentContent( stream,  documentListName,  documentId,  contentType);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void UpdateDocumentContent(System.IO.Stream stream, string documentListName, string documentId, String  contentType= null)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Content.Documentlists.DocumentClient.UpdateDocumentContentClient( stream,  documentListName,  documentId,  contentType);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Updates the binary data or content associated with a document, such as a product image or PDF specifications file, by supplying the document ID.
+		/// 
 		/// </summary>
-		/// <param name="documentId">Unique identifier for a document, used by content and document calls. Document IDs are associated with document types, document type lists, sites, and tenants.</param>
-		/// <param name="documentListName">Name of content documentListName to delete</param>
-		/// <param name="stream">Data stream that delivers information. Used to input and output data.</param>
+		/// <param name="documentId">Unique identifier of the document.</param>
+		/// <param name="documentListName">The name of the document list associated with the document.</param>
+		/// <param name="stream">Input output stream that delivers information.</param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -359,49 +201,23 @@ public virtual void UpdateDocumentContent(System.IO.Stream stream, string docume
 		///   await document.UpdateDocumentContentAsync( stream,  documentListName,  documentId,  contentType);
 		/// </code>
 		/// </example>
-		public virtual async Task UpdateDocumentContentAsync(System.IO.Stream stream, string documentListName, string documentId, String  contentType= null)
+		public virtual async Task UpdateDocumentContentAsync(System.IO.Stream stream, string documentListName, string documentId, String  contentType= null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Content.Documentlists.DocumentClient.UpdateDocumentContentClient( stream,  documentListName,  documentId,  contentType);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
-		/// <summary>
-		/// Updates a document in a document list.
-		/// </summary>
-		/// <param name="documentId">Unique identifier for a document, used by content and document calls. Document IDs are associated with document types, document type lists, sites, and tenants.</param>
-		/// <param name="documentListName">Name of content documentListName to delete</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="document">The document properties that define the content used by the content management system (CMS).</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Content.Document"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var document = new Document();
-		///   var document = document.UpdateDocument( document,  documentListName,  documentId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Content.Document UpdateDocument(Mozu.Api.Contracts.Content.Document document, string documentListName, string documentId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Content.Document> response;
-			var client = Mozu.Api.Clients.Content.Documentlists.DocumentClient.UpdateDocumentClient( document,  documentListName,  documentId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates a document in a document list.
+		/// 
 		/// </summary>
-		/// <param name="documentId">Unique identifier for a document, used by content and document calls. Document IDs are associated with document types, document type lists, sites, and tenants.</param>
-		/// <param name="documentListName">Name of content documentListName to delete</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="document">The document properties that define the content used by the content management system (CMS).</param>
+		/// <param name="documentId">Unique identifier of the document to update.</param>
+		/// <param name="documentListName">Name of the document list associated with the document.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="document">Properties of the document to update.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Content.Document"/>
 		/// </returns>
@@ -411,45 +227,22 @@ public virtual Mozu.Api.Contracts.Content.Document UpdateDocument(Mozu.Api.Contr
 		///   var document = await document.UpdateDocumentAsync( document,  documentListName,  documentId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Content.Document> UpdateDocumentAsync(Mozu.Api.Contracts.Content.Document document, string documentListName, string documentId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Content.Document> UpdateDocumentAsync(Mozu.Api.Contracts.Content.Document document, string documentListName, string documentId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Content.Document> response;
 			var client = Mozu.Api.Clients.Content.Documentlists.DocumentClient.UpdateDocumentClient( document,  documentListName,  documentId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Deletes a specific document based on the specified document ID.
-		/// </summary>
-		/// <param name="documentId">Unique identifier for a document, used by content and document calls. Document IDs are associated with document types, document type lists, sites, and tenants.</param>
-		/// <param name="documentListName">Name of content documentListName to delete</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var document = new Document();
-		///   document.DeleteDocument( documentListName,  documentId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteDocument(string documentListName, string documentId)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Content.Documentlists.DocumentClient.DeleteDocumentClient( documentListName,  documentId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes a specific document based on the specified document ID.
+		/// 
 		/// </summary>
-		/// <param name="documentId">Unique identifier for a document, used by content and document calls. Document IDs are associated with document types, document type lists, sites, and tenants.</param>
-		/// <param name="documentListName">Name of content documentListName to delete</param>
+		/// <param name="documentId">Identifier of the document being deleted.</param>
+		/// <param name="documentListName">The name of the document list associated with the document list being deleted.</param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -459,44 +252,21 @@ public virtual void DeleteDocument(string documentListName, string documentId)
 		///   await document.DeleteDocumentAsync( documentListName,  documentId);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteDocumentAsync(string documentListName, string documentId)
+		public virtual async Task DeleteDocumentAsync(string documentListName, string documentId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Content.Documentlists.DocumentClient.DeleteDocumentClient( documentListName,  documentId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
-		/// <summary>
-		/// Deletes the content associated with a document, such as a product image or PDF specification, by supplying the document ID.
-		/// </summary>
-		/// <param name="documentId">Unique identifier for a document, used by content and document calls. Document IDs are associated with document types, document type lists, sites, and tenants.</param>
-		/// <param name="documentListName">Name of content documentListName to delete</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var document = new Document();
-		///   document.DeleteDocumentContent( documentListName,  documentId);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteDocumentContent(string documentListName, string documentId)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Content.Documentlists.DocumentClient.DeleteDocumentContentClient( documentListName,  documentId);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes the content associated with a document, such as a product image or PDF specification, by supplying the document ID.
+		/// 
 		/// </summary>
-		/// <param name="documentId">Unique identifier for a document, used by content and document calls. Document IDs are associated with document types, document type lists, sites, and tenants.</param>
-		/// <param name="documentListName">Name of content documentListName to delete</param>
+		/// <param name="documentId">Unique identifier of the document.</param>
+		/// <param name="documentListName">The name of the document list associated with the document.</param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -506,12 +276,12 @@ public virtual void DeleteDocumentContent(string documentListName, string docume
 		///   await document.DeleteDocumentContentAsync( documentListName,  documentId);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteDocumentContentAsync(string documentListName, string documentId)
+		public virtual async Task DeleteDocumentContentAsync(string documentListName, string documentId, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Content.Documentlists.DocumentClient.DeleteDocumentContentClient( documentListName,  documentId);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Content/Documentlists/DocumentTreeResource.cs b/Mozu.Api/Resources/Content/Documentlists/DocumentTreeResource.cs
old mode 100644
new mode 100755
index e9e071cc..0d57d411
--- a/Mozu.Api/Resources/Content/Documentlists/DocumentTreeResource.cs
+++ b/Mozu.Api/Resources/Content/Documentlists/DocumentTreeResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Content.Documentlists
 {
@@ -44,36 +45,12 @@ public DocumentTreeResource(IApiContext apiContext, DataViewMode dataViewMode)
 			_dataViewMode = dataViewMode;
 		}
 				
-		/// <summary>
-		/// Retrieve the content associated with the document, such as a product image or PDF specifications file.
-		/// </summary>
-		/// <param name="documentListName">Name of content documentListName to delete</param>
-		/// <param name="documentName">The name of the document in the site.</param>
-		/// <returns>
-		/// <see cref="System.IO.Stream"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var documenttree = new DocumentTree();
-		///   var stream = documenttree.GetTreeDocumentContent(_dataViewMode,  documentListName,  documentName);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual System.IO.Stream GetTreeDocumentContent(string documentListName, string documentName)
-		{
-			MozuClient<System.IO.Stream> response;
-			var client = Mozu.Api.Clients.Content.Documentlists.DocumentTreeClient.GetTreeDocumentContentClient(_dataViewMode,  documentListName,  documentName);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieve the content associated with the document, such as a product image or PDF specifications file.
+		/// 
 		/// </summary>
-		/// <param name="documentListName">Name of content documentListName to delete</param>
-		/// <param name="documentName">The name of the document in the site.</param>
+		/// <param name="documentListName">The name of the document list associated with the document.</param>
+		/// <param name="documentName">The name of the document, which is unique within its folder.</param>
 		/// <returns>
 		/// <see cref="System.IO.Stream"/>
 		/// </returns>
@@ -83,60 +60,29 @@ public virtual System.IO.Stream GetTreeDocumentContent(string documentListName,
 		///   var stream = await documenttree.GetTreeDocumentContentAsync(_dataViewMode,  documentListName,  documentName);
 		/// </code>
 		/// </example>
-		public virtual async Task<System.IO.Stream> GetTreeDocumentContentAsync(string documentListName, string documentName)
+		public virtual async Task<System.IO.Stream> GetTreeDocumentContentAsync(string documentListName, string documentName, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<System.IO.Stream> response;
 			var client = Mozu.Api.Clients.Content.Documentlists.DocumentTreeClient.GetTreeDocumentContentClient(_dataViewMode,  documentListName,  documentName);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Performs transformations on a document. For example, resizing an image.
-		/// </summary>
-		/// <param name="crop">Crops the image based on the specified coordinates. The reference point for positive coordinates is the top-left corner of the image, and the reference point for negative coordinates is the bottom-right corner of the image.Usage: Example:  removes 10 pixels from all edges of the image.  leaves the image uncropped.</param>
-		/// <param name="documentListName">Name of content documentListName to delete</param>
-		/// <param name="documentName">The name of the document in the site.</param>
-		/// <param name="height">Specifies an exact height dimension for the image, in pixels.</param>
-		/// <param name="max">Specifies a pixel limitation for the largest side of an image.</param>
-		/// <param name="maxHeight">Specifies a pixel limitation for the height of the image, preserving the aspect ratio if the image needs resizing.</param>
-		/// <param name="maxWidth">Specifies a pixel limitation for the width of the image, preserving the aspect ratio if the image needs resizing.</param>
-		/// <param name="quality">Adjusts the image compression. Accepts values from 0-100, where 100 = highest quality, least compression.</param>
-		/// <param name="width">Specifies an exact width dimension for the image, in pixels.</param>
-		/// <returns>
-		/// <see cref="System.IO.Stream"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var documenttree = new DocumentTree();
-		///   var stream = documenttree.TransformTreeDocumentContent( documentListName,  documentName,  width,  height,  max,  maxWidth,  maxHeight,  crop,  quality);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual System.IO.Stream TransformTreeDocumentContent(string documentListName, string documentName, int? width =  null, int? height =  null, int? max =  null, int? maxWidth =  null, int? maxHeight =  null, string crop =  null, int? quality =  null)
-		{
-			MozuClient<System.IO.Stream> response;
-			var client = Mozu.Api.Clients.Content.Documentlists.DocumentTreeClient.TransformTreeDocumentContentClient( documentListName,  documentName,  width,  height,  max,  maxWidth,  maxHeight,  crop,  quality);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Performs transformations on a document. For example, resizing an image.
+		/// 
 		/// </summary>
-		/// <param name="crop">Crops the image based on the specified coordinates. The reference point for positive coordinates is the top-left corner of the image, and the reference point for negative coordinates is the bottom-right corner of the image.Usage: Example:  removes 10 pixels from all edges of the image.  leaves the image uncropped.</param>
-		/// <param name="documentListName">Name of content documentListName to delete</param>
-		/// <param name="documentName">The name of the document in the site.</param>
-		/// <param name="height">Specifies an exact height dimension for the image, in pixels.</param>
-		/// <param name="max">Specifies a pixel limitation for the largest side of an image.</param>
-		/// <param name="maxHeight">Specifies a pixel limitation for the height of the image, preserving the aspect ratio if the image needs resizing.</param>
-		/// <param name="maxWidth">Specifies a pixel limitation for the width of the image, preserving the aspect ratio if the image needs resizing.</param>
-		/// <param name="quality">Adjusts the image compression. Accepts values from 0-100, where 100 = highest quality, least compression.</param>
-		/// <param name="width">Specifies an exact width dimension for the image, in pixels.</param>
+		/// <param name="crop"></param>
+		/// <param name="documentListName"></param>
+		/// <param name="documentName"></param>
+		/// <param name="height"></param>
+		/// <param name="max"></param>
+		/// <param name="maxHeight"></param>
+		/// <param name="maxWidth"></param>
+		/// <param name="quality"></param>
+		/// <param name="width"></param>
 		/// <returns>
 		/// <see cref="System.IO.Stream"/>
 		/// </returns>
@@ -146,50 +92,24 @@ public virtual System.IO.Stream TransformTreeDocumentContent(string documentList
 		///   var stream = await documenttree.TransformTreeDocumentContentAsync( documentListName,  documentName,  width,  height,  max,  maxWidth,  maxHeight,  crop,  quality);
 		/// </code>
 		/// </example>
-		public virtual async Task<System.IO.Stream> TransformTreeDocumentContentAsync(string documentListName, string documentName, int? width =  null, int? height =  null, int? max =  null, int? maxWidth =  null, int? maxHeight =  null, string crop =  null, int? quality =  null)
+		public virtual async Task<System.IO.Stream> TransformTreeDocumentContentAsync(string documentListName, string documentName, int? width =  null, int? height =  null, int? max =  null, int? maxWidth =  null, int? maxHeight =  null, string crop =  null, int? quality =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<System.IO.Stream> response;
 			var client = Mozu.Api.Clients.Content.Documentlists.DocumentTreeClient.TransformTreeDocumentContentClient( documentListName,  documentName,  width,  height,  max,  maxWidth,  maxHeight,  crop,  quality);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves a document based on its document list and folder path in the document hierarchy.
-		/// </summary>
-		/// <param name="documentListName">Name of content documentListName to delete</param>
-		/// <param name="documentName">The name of the document in the site.</param>
-		/// <param name="includeInactive">Include inactive content.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Content.Document"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var documenttree = new DocumentTree();
-		///   var document = documenttree.GetTreeDocument(_dataViewMode,  documentListName,  documentName,  includeInactive,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Content.Document GetTreeDocument(string documentListName, string documentName, bool? includeInactive =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Content.Document> response;
-			var client = Mozu.Api.Clients.Content.Documentlists.DocumentTreeClient.GetTreeDocumentClient(_dataViewMode,  documentListName,  documentName,  includeInactive,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a document based on its document list and folder path in the document hierarchy.
+		/// 
 		/// </summary>
-		/// <param name="documentListName">Name of content documentListName to delete</param>
-		/// <param name="documentName">The name of the document in the site.</param>
-		/// <param name="includeInactive">Include inactive content.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="documentListName">The name of the document list associated with the document.</param>
+		/// <param name="documentName">The name of the document, which is unique within its folder.</param>
+		/// <param name="includeInactive"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Content.Document"/>
 		/// </returns>
@@ -199,47 +119,23 @@ public virtual Mozu.Api.Contracts.Content.Document GetTreeDocument(string docume
 		///   var document = await documenttree.GetTreeDocumentAsync(_dataViewMode,  documentListName,  documentName,  includeInactive,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Content.Document> GetTreeDocumentAsync(string documentListName, string documentName, bool? includeInactive =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Content.Document> GetTreeDocumentAsync(string documentListName, string documentName, bool? includeInactive =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Content.Document> response;
 			var client = Mozu.Api.Clients.Content.Documentlists.DocumentTreeClient.GetTreeDocumentClient(_dataViewMode,  documentListName,  documentName,  includeInactive,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates the binary data or content associated with a document, such as a product image or PDF specifications file, by supplying the document name.
-		/// </summary>
-		/// <param name="documentListName">Name of content documentListName to delete</param>
-		/// <param name="documentName">The name of the document in the site.</param>
-		/// <param name="stream">Data stream that delivers information. Used to input and output data.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var documenttree = new DocumentTree();
-		///   documenttree.UpdateTreeDocumentContent( stream,  documentListName,  documentName,  contentType);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void UpdateTreeDocumentContent(System.IO.Stream stream, string documentListName, string documentName, String  contentType= null)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Content.Documentlists.DocumentTreeClient.UpdateTreeDocumentContentClient( stream,  documentListName,  documentName,  contentType);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Updates the binary data or content associated with a document, such as a product image or PDF specifications file, by supplying the document name.
+		/// 
 		/// </summary>
-		/// <param name="documentListName">Name of content documentListName to delete</param>
-		/// <param name="documentName">The name of the document in the site.</param>
-		/// <param name="stream">Data stream that delivers information. Used to input and output data.</param>
+		/// <param name="documentListName">The name of the document list associated with the document.</param>
+		/// <param name="documentName">The name of the document, which is unique within its folder.</param>
+		/// <param name="stream">Input output stream that delivers information.</param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -249,46 +145,22 @@ public virtual void UpdateTreeDocumentContent(System.IO.Stream stream, string do
 		///   await documenttree.UpdateTreeDocumentContentAsync( stream,  documentListName,  documentName,  contentType);
 		/// </code>
 		/// </example>
-		public virtual async Task UpdateTreeDocumentContentAsync(System.IO.Stream stream, string documentListName, string documentName, String  contentType= null)
+		public virtual async Task UpdateTreeDocumentContentAsync(System.IO.Stream stream, string documentListName, string documentName, String  contentType= null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Content.Documentlists.DocumentTreeClient.UpdateTreeDocumentContentClient( stream,  documentListName,  documentName,  contentType);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
-		/// <summary>
-		/// Deletes the content associated with a document, such as a product image or PDF specifications file.
-		/// </summary>
-		/// <param name="documentListName">Name of content documentListName to delete</param>
-		/// <param name="documentName">The name of the document in the site.</param>
-		/// <param name="stream">Data stream that delivers information. Used to input and output data.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var documenttree = new DocumentTree();
-		///   documenttree.DeleteTreeDocumentContent( stream,  documentListName,  documentName,  contentType);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteTreeDocumentContent(System.IO.Stream stream, string documentListName, string documentName, String  contentType= null)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Content.Documentlists.DocumentTreeClient.DeleteTreeDocumentContentClient( stream,  documentListName,  documentName,  contentType);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes the content associated with a document, such as a product image or PDF specifications file.
+		/// 
 		/// </summary>
-		/// <param name="documentListName">Name of content documentListName to delete</param>
-		/// <param name="documentName">The name of the document in the site.</param>
-		/// <param name="stream">Data stream that delivers information. Used to input and output data.</param>
+		/// <param name="documentListName">The name of the document list associated with the document.</param>
+		/// <param name="documentName">The name of the document, which is unique within its folder.</param>
+		/// <param name="stream">Input output stream that delivers information.</param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -298,12 +170,12 @@ public virtual void DeleteTreeDocumentContent(System.IO.Stream stream, string do
 		///   await documenttree.DeleteTreeDocumentContentAsync( stream,  documentListName,  documentName,  contentType);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteTreeDocumentContentAsync(System.IO.Stream stream, string documentListName, string documentName, String  contentType= null)
+		public virtual async Task DeleteTreeDocumentContentAsync(System.IO.Stream stream, string documentListName, string documentName, String  contentType= null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Content.Documentlists.DocumentTreeClient.DeleteTreeDocumentContentClient( stream,  documentListName,  documentName,  contentType);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Content/Documentlists/FacetResource.cs b/Mozu.Api/Resources/Content/Documentlists/FacetResource.cs
old mode 100644
new mode 100755
index 68f913cb..dc6540fe
--- a/Mozu.Api/Resources/Content/Documentlists/FacetResource.cs
+++ b/Mozu.Api/Resources/Content/Documentlists/FacetResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Content.Documentlists
 {
@@ -37,35 +38,11 @@ public FacetResource CloneWithApiContext(Action<IApiContext> contextModification
 		}
 
 				
-		/// <summary>
-		/// Retrieves the properties of facets that aid in indexing and searching.
-		/// </summary>
-		/// <param name="documentListName">Name of content documentListName to delete</param>
-		/// <param name="propertyName">The property name associated with the facets to retrieve.</param>
-		/// <returns>
-		/// List{<see cref="Mozu.Api.Contracts.Content.Facet"/>}
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var facet = new Facet();
-		///   var facet = facet.GetFacets( documentListName,  propertyName);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual List<Mozu.Api.Contracts.Content.Facet> GetFacets(string documentListName, string propertyName)
-		{
-			MozuClient<List<Mozu.Api.Contracts.Content.Facet>> response;
-			var client = Mozu.Api.Clients.Content.Documentlists.FacetClient.GetFacetsClient( documentListName,  propertyName);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the properties of facets that aid in indexing and searching.
+		/// 
 		/// </summary>
-		/// <param name="documentListName">Name of content documentListName to delete</param>
+		/// <param name="documentListName">The document list associated with the facets to retrieve.</param>
 		/// <param name="propertyName">The property name associated with the facets to retrieve.</param>
 		/// <returns>
 		/// List{<see cref="Mozu.Api.Contracts.Content.Facet"/>}
@@ -76,12 +53,12 @@ public FacetResource CloneWithApiContext(Action<IApiContext> contextModification
 		///   var facet = await facet.GetFacetsAsync( documentListName,  propertyName);
 		/// </code>
 		/// </example>
-		public virtual async Task<List<Mozu.Api.Contracts.Content.Facet>> GetFacetsAsync(string documentListName, string propertyName)
+		public virtual async Task<List<Mozu.Api.Contracts.Content.Facet>> GetFacetsAsync(string documentListName, string propertyName, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<List<Mozu.Api.Contracts.Content.Facet>> response;
 			var client = Mozu.Api.Clients.Content.Documentlists.FacetClient.GetFacetsClient( documentListName,  propertyName);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
diff --git a/Mozu.Api/Resources/Content/Documentlists/ViewResource.cs b/Mozu.Api/Resources/Content/Documentlists/ViewResource.cs
old mode 100644
new mode 100755
index a4e7fd13..194818a0
--- a/Mozu.Api/Resources/Content/Documentlists/ViewResource.cs
+++ b/Mozu.Api/Resources/Content/Documentlists/ViewResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Content.Documentlists
 {
 	/// <summary>
-	/// Properties and content for views within a site/tenant. Views provide the schema, formatting, and associated content and entities for displaying content within a site/tenant.
+	/// 
 	/// </summary>
 	public partial class ViewResource  	{
 		///
@@ -37,48 +38,18 @@ public ViewResource CloneWithApiContext(Action<IApiContext> contextModification)
 		}
 
 				
-		/// <summary>
-		/// Retrieves a collection of documents associated with a view.
-		/// </summary>
-		/// <param name="documentListName">Name of content documentListName to delete</param>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="includeInactive">Include inactive content.</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
-		/// <param name="viewName">The name for a view. Views are used to render data in , such as document and entity lists. Each view includes a schema, format, name, ID, and associated data types to render.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Content.DocumentCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var view = new View();
-		///   var documentCollection = view.GetViewDocuments( documentListName,  viewName,  filter,  sortBy,  pageSize,  startIndex,  includeInactive,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Content.DocumentCollection GetViewDocuments(string documentListName, string viewName, string filter =  null, string sortBy =  null, int? pageSize =  null, int? startIndex =  null, bool? includeInactive =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Content.DocumentCollection> response;
-			var client = Mozu.Api.Clients.Content.Documentlists.ViewClient.GetViewDocumentsClient( documentListName,  viewName,  filter,  sortBy,  pageSize,  startIndex,  includeInactive,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a collection of documents associated with a view.
+		/// 
 		/// </summary>
-		/// <param name="documentListName">Name of content documentListName to delete</param>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="includeInactive">Include inactive content.</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
-		/// <param name="viewName">The name for a view. Views are used to render data in , such as document and entity lists. Each view includes a schema, format, name, ID, and associated data types to render.</param>
+		/// <param name="documentListName"></param>
+		/// <param name="filter"></param>
+		/// <param name="includeInactive"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
+		/// <param name="viewName"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Content.DocumentCollection"/>
 		/// </returns>
@@ -88,12 +59,12 @@ public virtual Mozu.Api.Contracts.Content.DocumentCollection GetViewDocuments(st
 		///   var documentCollection = await view.GetViewDocumentsAsync( documentListName,  viewName,  filter,  sortBy,  pageSize,  startIndex,  includeInactive,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Content.DocumentCollection> GetViewDocumentsAsync(string documentListName, string viewName, string filter =  null, string sortBy =  null, int? pageSize =  null, int? startIndex =  null, bool? includeInactive =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Content.DocumentCollection> GetViewDocumentsAsync(string documentListName, string viewName, string filter =  null, string sortBy =  null, int? pageSize =  null, int? startIndex =  null, bool? includeInactive =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Content.DocumentCollection> response;
 			var client = Mozu.Api.Clients.Content.Documentlists.ViewClient.GetViewDocumentsClient( documentListName,  viewName,  filter,  sortBy,  pageSize,  startIndex,  includeInactive,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
diff --git a/Mozu.Api/Resources/Content/PropertyTypeResource.cs b/Mozu.Api/Resources/Content/PropertyTypeResource.cs
old mode 100644
new mode 100755
index 14990528..e2989874
--- a/Mozu.Api/Resources/Content/PropertyTypeResource.cs
+++ b/Mozu.Api/Resources/Content/PropertyTypeResource.cs
@@ -13,6 +13,7 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Content
 {
@@ -44,38 +45,13 @@ public PropertyTypeResource(IApiContext apiContext, DataViewMode dataViewMode)
 			_dataViewMode = dataViewMode;
 		}
 				
-		/// <summary>
-		/// Retrieves a list of the content property types.
-		/// </summary>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Content.PropertyTypeCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var propertytype = new PropertyType();
-		///   var propertyTypeCollection = propertytype.GetPropertyTypes(_dataViewMode,  pageSize,  startIndex,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Content.PropertyTypeCollection GetPropertyTypes(int? pageSize =  null, int? startIndex =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Content.PropertyTypeCollection> response;
-			var client = Mozu.Api.Clients.Content.PropertyTypeClient.GetPropertyTypesClient(_dataViewMode,  pageSize,  startIndex,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of the content property types.
+		/// 
 		/// </summary>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Content.PropertyTypeCollection"/>
 		/// </returns>
@@ -85,46 +61,22 @@ public virtual Mozu.Api.Contracts.Content.PropertyTypeCollection GetPropertyType
 		///   var propertyTypeCollection = await propertytype.GetPropertyTypesAsync(_dataViewMode,  pageSize,  startIndex,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Content.PropertyTypeCollection> GetPropertyTypesAsync(int? pageSize =  null, int? startIndex =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Content.PropertyTypeCollection> GetPropertyTypesAsync(int? pageSize =  null, int? startIndex =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Content.PropertyTypeCollection> response;
 			var client = Mozu.Api.Clients.Content.PropertyTypeClient.GetPropertyTypesClient(_dataViewMode,  pageSize,  startIndex,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the details of the content property type.
-		/// </summary>
-		/// <param name="propertyTypeName">The name of the property type.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Content.PropertyType"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var propertytype = new PropertyType();
-		///   var propertyType = propertytype.GetPropertyType(_dataViewMode,  propertyTypeName,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Content.PropertyType GetPropertyType(string propertyTypeName, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Content.PropertyType> response;
-			var client = Mozu.Api.Clients.Content.PropertyTypeClient.GetPropertyTypeClient(_dataViewMode,  propertyTypeName,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of the content property type.
+		/// 
 		/// </summary>
-		/// <param name="propertyTypeName">The name of the property type.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="propertyTypeName">The name of the content property type.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Content.PropertyType"/>
 		/// </returns>
@@ -134,46 +86,22 @@ public virtual Mozu.Api.Contracts.Content.PropertyType GetPropertyType(string pr
 		///   var propertyType = await propertytype.GetPropertyTypeAsync(_dataViewMode,  propertyTypeName,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Content.PropertyType> GetPropertyTypeAsync(string propertyTypeName, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Content.PropertyType> GetPropertyTypeAsync(string propertyTypeName, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Content.PropertyType> response;
 			var client = Mozu.Api.Clients.Content.PropertyTypeClient.GetPropertyTypeClient(_dataViewMode,  propertyTypeName,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Creates a new
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="propertyType">Property type available for content. Property types are like templates that can be reused.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Content.PropertyType"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var propertytype = new PropertyType();
-		///   var propertyType = propertytype.CreatePropertyType( propertyType,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Content.PropertyType CreatePropertyType(Mozu.Api.Contracts.Content.PropertyType propertyType, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Content.PropertyType> response;
-			var client = Mozu.Api.Clients.Content.PropertyTypeClient.CreatePropertyTypeClient( propertyType,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Creates a new
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="propertyType">Property type available for content. Property types are like templates that can be reused.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="propertyType"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Content.PropertyType"/>
 		/// </returns>
@@ -183,48 +111,23 @@ public virtual Mozu.Api.Contracts.Content.PropertyType CreatePropertyType(Mozu.A
 		///   var propertyType = await propertytype.CreatePropertyTypeAsync( propertyType,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Content.PropertyType> CreatePropertyTypeAsync(Mozu.Api.Contracts.Content.PropertyType propertyType, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Content.PropertyType> CreatePropertyTypeAsync(Mozu.Api.Contracts.Content.PropertyType propertyType, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Content.PropertyType> response;
 			var client = Mozu.Api.Clients.Content.PropertyTypeClient.CreatePropertyTypeClient( propertyType,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates a
-		/// </summary>
-		/// <param name="propertyTypeName">The name of the property type.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="propertyType">Property type available for content. Property types are like templates that can be reused.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Content.PropertyType"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var propertytype = new PropertyType();
-		///   var propertyType = propertytype.UpdatePropertyType(_dataViewMode,  propertyType,  propertyTypeName,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Content.PropertyType UpdatePropertyType(Mozu.Api.Contracts.Content.PropertyType propertyType, string propertyTypeName, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Content.PropertyType> response;
-			var client = Mozu.Api.Clients.Content.PropertyTypeClient.UpdatePropertyTypeClient(_dataViewMode,  propertyType,  propertyTypeName,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates a
+		/// 
 		/// </summary>
-		/// <param name="propertyTypeName">The name of the property type.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="propertyType">Property type available for content. Property types are like templates that can be reused.</param>
+		/// <param name="propertyTypeName"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="propertyType"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Content.PropertyType"/>
 		/// </returns>
@@ -234,43 +137,21 @@ public virtual Mozu.Api.Contracts.Content.PropertyType UpdatePropertyType(Mozu.A
 		///   var propertyType = await propertytype.UpdatePropertyTypeAsync(_dataViewMode,  propertyType,  propertyTypeName,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Content.PropertyType> UpdatePropertyTypeAsync(Mozu.Api.Contracts.Content.PropertyType propertyType, string propertyTypeName, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Content.PropertyType> UpdatePropertyTypeAsync(Mozu.Api.Contracts.Content.PropertyType propertyType, string propertyTypeName, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Content.PropertyType> response;
 			var client = Mozu.Api.Clients.Content.PropertyTypeClient.UpdatePropertyTypeClient(_dataViewMode,  propertyType,  propertyTypeName,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Delete a specific
-		/// </summary>
-		/// <param name="propertyTypeName">The name of the property type.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var propertytype = new PropertyType();
-		///   propertytype.DeletePropertyType(_dataViewMode,  propertyTypeName);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeletePropertyType(string propertyTypeName)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Content.PropertyTypeClient.DeletePropertyTypeClient(_dataViewMode,  propertyTypeName);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Delete a specific
+		/// 
 		/// </summary>
-		/// <param name="propertyTypeName">The name of the property type.</param>
+		/// <param name="propertyTypeName"></param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -280,12 +161,12 @@ public virtual void DeletePropertyType(string propertyTypeName)
 		///   await propertytype.DeletePropertyTypeAsync(_dataViewMode,  propertyTypeName);
 		/// </code>
 		/// </example>
-		public virtual async Task DeletePropertyTypeAsync(string propertyTypeName)
+		public virtual async Task DeletePropertyTypeAsync(string propertyTypeName, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Content.PropertyTypeClient.DeletePropertyTypeClient(_dataViewMode,  propertyTypeName);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Content/PublishSetSummaryResource.cs b/Mozu.Api/Resources/Content/PublishSetSummaryResource.cs
old mode 100644
new mode 100755
index 1f7f3079..1f2c96e2
--- a/Mozu.Api/Resources/Content/PublishSetSummaryResource.cs
+++ b/Mozu.Api/Resources/Content/PublishSetSummaryResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Content
 {
 	/// <summary>
-	/// Use the Content Publish Set resource to manage content publish sets and the pending content drafts.You can use content publish sets to group pending content changes together and publish them all at the same time.
+	/// 
 	/// </summary>
 	public partial class PublishSetSummaryResource  	{
 		///
@@ -37,38 +38,13 @@ public PublishSetSummaryResource CloneWithApiContext(Action<IApiContext> context
 		}
 
 				
-		/// <summary>
-		/// Returns a list of content publish sets.
-		/// </summary>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Content.PublishSetSummaryPagedCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var publishsetsummary = new PublishSetSummary();
-		///   var publishSetSummaryPagedCollection = publishsetsummary.GetPublishSets( pageSize,  startIndex,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Content.PublishSetSummaryPagedCollection GetPublishSets(int? pageSize =  null, int? startIndex =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Content.PublishSetSummaryPagedCollection> response;
-			var client = Mozu.Api.Clients.Content.PublishSetSummaryClient.GetPublishSetsClient( pageSize,  startIndex,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Returns a list of content publish sets.
+		/// 
 		/// </summary>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Content.PublishSetSummaryPagedCollection"/>
 		/// </returns>
@@ -78,54 +54,26 @@ public virtual Mozu.Api.Contracts.Content.PublishSetSummaryPagedCollection GetPu
 		///   var publishSetSummaryPagedCollection = await publishsetsummary.GetPublishSetsAsync( pageSize,  startIndex,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Content.PublishSetSummaryPagedCollection> GetPublishSetsAsync(int? pageSize =  null, int? startIndex =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Content.PublishSetSummaryPagedCollection> GetPublishSetsAsync(int? pageSize =  null, int? startIndex =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Content.PublishSetSummaryPagedCollection> response;
 			var client = Mozu.Api.Clients.Content.PublishSetSummaryClient.GetPublishSetsClient( pageSize,  startIndex,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves a list of content publish sets and their properties.
-		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Content.DocumentDraftSummaryPagedCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var publishsetsummary = new PublishSetSummary();
-		///   var documentDraftSummaryPagedCollection = publishsetsummary.GetPublishSetItems( code,  pageSize,  startIndex,  sortBy,  filter,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Content.DocumentDraftSummaryPagedCollection GetPublishSetItems(string code, int? pageSize =  null, int? startIndex =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Content.DocumentDraftSummaryPagedCollection> response;
-			var client = Mozu.Api.Clients.Content.PublishSetSummaryClient.GetPublishSetItemsClient( code,  pageSize,  startIndex,  sortBy,  filter,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of content publish sets and their properties.
+		/// 
 		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
+		/// <param name="code"></param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Content.DocumentDraftSummaryPagedCollection"/>
 		/// </returns>
@@ -135,48 +83,23 @@ public virtual Mozu.Api.Contracts.Content.DocumentDraftSummaryPagedCollection Ge
 		///   var documentDraftSummaryPagedCollection = await publishsetsummary.GetPublishSetItemsAsync( code,  pageSize,  startIndex,  sortBy,  filter,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Content.DocumentDraftSummaryPagedCollection> GetPublishSetItemsAsync(string code, int? pageSize =  null, int? startIndex =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Content.DocumentDraftSummaryPagedCollection> GetPublishSetItemsAsync(string code, int? pageSize =  null, int? startIndex =  null, string sortBy =  null, string filter =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Content.DocumentDraftSummaryPagedCollection> response;
 			var client = Mozu.Api.Clients.Content.PublishSetSummaryClient.GetPublishSetItemsClient( code,  pageSize,  startIndex,  sortBy,  filter,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Deletes the specified content publish set. You can use the shouldDiscard parameter to specify whether to discard the content drafts assigned to the content publish set.
-		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="shouldDiscard">Specifies whether to discard the pending content changes assigned to the content publish set when the publish set is deleted.</param>
-		/// <returns>
-		/// object
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var publishsetsummary = new PublishSetSummary();
-		///   var object = publishsetsummary.DeletePublishSet( code,  shouldDiscard,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual object DeletePublishSet(string code, bool? shouldDiscard =  null, string responseFields =  null)
-		{
-			MozuClient<object> response;
-			var client = Mozu.Api.Clients.Content.PublishSetSummaryClient.DeletePublishSetClient( code,  shouldDiscard,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Deletes the specified content publish set. You can use the shouldDiscard parameter to specify whether to discard the content drafts assigned to the content publish set.
+		/// 
 		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="shouldDiscard">Specifies whether to discard the pending content changes assigned to the content publish set when the publish set is deleted.</param>
+		/// <param name="code"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="shouldDiscard"></param>
 		/// <returns>
 		/// object
 		/// </returns>
@@ -186,48 +109,23 @@ public virtual object DeletePublishSet(string code, bool? shouldDiscard =  null,
 		///   var object = await publishsetsummary.DeletePublishSetAsync( code,  shouldDiscard,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<object> DeletePublishSetAsync(string code, bool? shouldDiscard =  null, string responseFields =  null)
+		public virtual async Task<object> DeletePublishSetAsync(string code, bool? shouldDiscard =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<object> response;
 			var client = Mozu.Api.Clients.Content.PublishSetSummaryClient.DeletePublishSetClient( code,  shouldDiscard,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Adds a set of documents by id to a specified publish set.
-		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="itemsToPublish">The details of the items that you want to add to a specified publish set.</param>
-		/// <returns>
-		/// object
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var publishsetsummary = new PublishSetSummary();
-		///   var object = publishsetsummary.AddPublishSetItems( itemsToPublish,  code,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual object AddPublishSetItems(List<Mozu.Api.Contracts.Content.AddOrDeletePublishItem> itemsToPublish, string code, string responseFields =  null)
-		{
-			MozuClient<object> response;
-			var client = Mozu.Api.Clients.Content.PublishSetSummaryClient.AddPublishSetItemsClient( itemsToPublish,  code,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Adds a set of documents by id to a specified publish set.
+		/// 
 		/// </summary>
-		/// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="itemsToPublish">The details of the items that you want to add to a specified publish set.</param>
+		/// <param name="code"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="itemsToPublish"></param>
 		/// <returns>
 		/// object
 		/// </returns>
@@ -237,12 +135,12 @@ public virtual object AddPublishSetItems(List<Mozu.Api.Contracts.Content.AddOrDe
 		///   var object = await publishsetsummary.AddPublishSetItemsAsync( itemsToPublish,  code,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<object> AddPublishSetItemsAsync(List<Mozu.Api.Contracts.Content.AddOrDeletePublishItem> itemsToPublish, string code, string responseFields =  null)
+		public virtual async Task<object> AddPublishSetItemsAsync(List<Mozu.Api.Contracts.Content.AddOrDeletePublishItem> itemsToPublish, string code, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<object> response;
 			var client = Mozu.Api.Clients.Content.PublishSetSummaryClient.AddPublishSetItemsClient( itemsToPublish,  code,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
diff --git a/Mozu.Api/Resources/Event/EventNotificationResource.cs b/Mozu.Api/Resources/Event/EventNotificationResource.cs
old mode 100644
new mode 100755
index e941c1d2..f72d660a
--- a/Mozu.Api/Resources/Event/EventNotificationResource.cs
+++ b/Mozu.Api/Resources/Event/EventNotificationResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Event
 {
 	/// <summary>
-	/// Events are notifications  publishes to the application when a create, read, update, or delete operation is performed. If the application subscribes to the event, you can use the Events resource to query for recent events  published to your application or events that were not published successfully.
+	/// Events are notifications Mozu publishes to the application when a create, read, update, or delete operation is performed. If the application subscribes to the event, you can use the Events resource to query for recent events Mozu published to your application or events that were not published successfully.
 	/// </summary>
 	public partial class EventNotificationResource  	{
 		///
@@ -41,40 +42,13 @@ public EventNotificationResource CloneWithApiContext(Action<IApiContext> context
 		}
 
 				
-		/// <summary>
-		/// Retrieves a list of events.
-		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy"></param>
-		/// <param name="startIndex"></param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Event.EventCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var eventnotification = new EventNotification();
-		///   var eventCollection = eventnotification.GetEvents( startIndex,  pageSize,  sortBy,  filter,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Event.EventCollection GetEvents(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Event.EventCollection> response;
-			var client = Mozu.Api.Clients.Event.EventNotificationClient.GetEventsClient( startIndex,  pageSize,  sortBy,  filter,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of events.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
 		/// <param name="sortBy"></param>
 		/// <param name="startIndex"></param>
 		/// <returns>
@@ -86,46 +60,22 @@ public virtual Mozu.Api.Contracts.Event.EventCollection GetEvents(int? startInde
 		///   var eventCollection = await eventnotification.GetEventsAsync( startIndex,  pageSize,  sortBy,  filter,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Event.EventCollection> GetEventsAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Event.EventCollection> GetEventsAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Event.EventCollection> response;
 			var client = Mozu.Api.Clients.Event.EventNotificationClient.GetEventsClient( startIndex,  pageSize,  sortBy,  filter,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves an event by providing the event ID.
-		/// </summary>
-		/// <param name="eventId">The unique identifier of the event being retrieved. An event is a notification about a create, read, update, or delete on an order, product, discount or category.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Event.Event"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var eventnotification = new EventNotification();
-		///   var event = eventnotification.GetEvent( eventId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Event.Event GetEvent(string eventId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Event.Event> response;
-			var client = Mozu.Api.Clients.Event.EventNotificationClient.GetEventClient( eventId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves an event by providing the event ID.
+		/// 
 		/// </summary>
 		/// <param name="eventId">The unique identifier of the event being retrieved. An event is a notification about a create, read, update, or delete on an order, product, discount or category.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Event.Event"/>
 		/// </returns>
@@ -135,12 +85,12 @@ public virtual Mozu.Api.Contracts.Event.Event GetEvent(string eventId, string re
 		///   var event = await eventnotification.GetEventAsync( eventId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Event.Event> GetEventAsync(string eventId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Event.Event> GetEventAsync(string eventId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Event.Event> response;
 			var client = Mozu.Api.Clients.Event.EventNotificationClient.GetEventClient( eventId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
diff --git a/Mozu.Api/Resources/Event/Push/SubscriptionResource.cs b/Mozu.Api/Resources/Event/Push/SubscriptionResource.cs
old mode 100644
new mode 100755
index bb983a0b..0da9d770
--- a/Mozu.Api/Resources/Event/Push/SubscriptionResource.cs
+++ b/Mozu.Api/Resources/Event/Push/SubscriptionResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Event.Push
 {
 	/// <summary>
-	/// The Subscriptions resource triggers a push service to sent immediate notifications to the subscribed tenants and applications when triggers. The resource sends messages regarding a subscription event tha occurs in the tenant or site.
+	/// 
 	/// </summary>
 	public partial class SubscriptionResource  	{
 		///
@@ -37,42 +38,15 @@ public SubscriptionResource CloneWithApiContext(Action<IApiContext> contextModif
 		}
 
 				
-		/// <summary>
-		/// Retrieves a list of events according to any specified filter criteria and sort options.
-		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Event.SubscriptionCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var subscription = new Subscription();
-		///   var subscriptionCollection = subscription.GetSubscriptions( startIndex,  pageSize,  sortBy,  filter,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Event.SubscriptionCollection GetSubscriptions(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Event.SubscriptionCollection> response;
-			var client = Mozu.Api.Clients.Event.Push.SubscriptionClient.GetSubscriptionsClient( startIndex,  pageSize,  sortBy,  filter,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of events according to any specified filter criteria and sort options.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Event.SubscriptionCollection"/>
 		/// </returns>
@@ -82,12 +56,12 @@ public virtual Mozu.Api.Contracts.Event.SubscriptionCollection GetSubscriptions(
 		///   var subscriptionCollection = await subscription.GetSubscriptionsAsync( startIndex,  pageSize,  sortBy,  filter,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Event.SubscriptionCollection> GetSubscriptionsAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Event.SubscriptionCollection> GetSubscriptionsAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Event.SubscriptionCollection> response;
 			var client = Mozu.Api.Clients.Event.Push.SubscriptionClient.GetSubscriptionsClient( startIndex,  pageSize,  sortBy,  filter,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
diff --git a/Mozu.Api/Resources/Event/Push/Subscriptions/EventDeliverySummaryResource.cs b/Mozu.Api/Resources/Event/Push/Subscriptions/EventDeliverySummaryResource.cs
old mode 100644
new mode 100755
index 39ea7a92..1a5ef604
--- a/Mozu.Api/Resources/Event/Push/Subscriptions/EventDeliverySummaryResource.cs
+++ b/Mozu.Api/Resources/Event/Push/Subscriptions/EventDeliverySummaryResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Event.Push.Subscriptions
 {
 	/// <summary>
-	/// Provides details for each attempted delivery of the event to the endpoint.
+	/// 
 	/// </summary>
 	public partial class EventDeliverySummaryResource  	{
 		///
@@ -37,95 +38,42 @@ public EventDeliverySummaryResource CloneWithApiContext(Action<IApiContext> cont
 		}
 
 				
-		/// <summary>
-		/// This operation method is the external/public event entity used specifically in pull/poll event scenarios.
-		/// </summary>
-		/// <param name="id">Unique identifier of the customer segment to retrieve.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="subscriptionId">Unique identifier for a subscription, such as subscribing tenants for an event or to receive a notification.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Event.EventDeliverySummary"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var eventdeliverysummary = new EventDeliverySummary();
-		///   var eventDeliverySummary = eventdeliverysummary.GetDeliveryAttemptSummary( subscriptionId,  id,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Event.EventDeliverySummary GetDeliveryAttemptSummary(string subscriptionId, int? id =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Event.EventDeliverySummary> response;
-			var client = Mozu.Api.Clients.Event.Push.Subscriptions.EventDeliverySummaryClient.GetDeliveryAttemptSummaryClient( subscriptionId,  id,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// This operation method is the external/public event entity used specifically in pull/poll event scenarios.
+		/// 
 		/// </summary>
-		/// <param name="id">Unique identifier of the customer segment to retrieve.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="subscriptionId">Unique identifier for a subscription, such as subscribing tenants for an event or to receive a notification.</param>
+		/// <param name="processId"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="subscriptionId">This operation paramenter is the unique identifer for a subscription.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Event.EventDeliverySummary"/>
 		/// </returns>
 		/// <example>
 		/// <code>
 		///   var eventdeliverysummary = new EventDeliverySummary();
-		///   var eventDeliverySummary = await eventdeliverysummary.GetDeliveryAttemptSummaryAsync( subscriptionId,  id,  responseFields);
+		///   var eventDeliverySummary = await eventdeliverysummary.GetDeliveryAttemptSummaryAsync( subscriptionId,  processId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Event.EventDeliverySummary> GetDeliveryAttemptSummaryAsync(string subscriptionId, int? id =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Event.EventDeliverySummary> GetDeliveryAttemptSummaryAsync(string subscriptionId, int? processId =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Event.EventDeliverySummary> response;
-			var client = Mozu.Api.Clients.Event.Push.Subscriptions.EventDeliverySummaryClient.GetDeliveryAttemptSummaryClient( subscriptionId,  id,  responseFields);
+			var client = Mozu.Api.Clients.Event.Push.Subscriptions.EventDeliverySummaryClient.GetDeliveryAttemptSummaryClient( subscriptionId,  processId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves a collection of data for delivery attempts of events and notifications. These are notifications sent to subscribing sites and tenants. A paged list is returned sorted and filtered per the entered parameters.
-		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
-		/// <param name="subscriptionId">Unique identifier for a subscription, such as subscribing tenants for an event or to receive a notification.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Event.EventDeliverySummaryCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var eventdeliverysummary = new EventDeliverySummary();
-		///   var eventDeliverySummaryCollection = eventdeliverysummary.GetDeliveryAttemptSummaries( subscriptionId,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Event.EventDeliverySummaryCollection GetDeliveryAttemptSummaries(string subscriptionId, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Event.EventDeliverySummaryCollection> response;
-			var client = Mozu.Api.Clients.Event.Push.Subscriptions.EventDeliverySummaryClient.GetDeliveryAttemptSummariesClient( subscriptionId,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a collection of data for delivery attempts of events and notifications. These are notifications sent to subscribing sites and tenants. A paged list is returned sorted and filtered per the entered parameters.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
-		/// <param name="subscriptionId">Unique identifier for a subscription, such as subscribing tenants for an event or to receive a notification.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
+		/// <param name="subscriptionId"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Event.EventDeliverySummaryCollection"/>
 		/// </returns>
@@ -135,12 +83,12 @@ public virtual Mozu.Api.Contracts.Event.EventDeliverySummaryCollection GetDelive
 		///   var eventDeliverySummaryCollection = await eventdeliverysummary.GetDeliveryAttemptSummariesAsync( subscriptionId,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Event.EventDeliverySummaryCollection> GetDeliveryAttemptSummariesAsync(string subscriptionId, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Event.EventDeliverySummaryCollection> GetDeliveryAttemptSummariesAsync(string subscriptionId, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Event.EventDeliverySummaryCollection> response;
 			var client = Mozu.Api.Clients.Event.Push.Subscriptions.EventDeliverySummaryClient.GetDeliveryAttemptSummariesClient( subscriptionId,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
diff --git a/Mozu.Api/Resources/Platform/Adminuser/AdminUserResource.cs b/Mozu.Api/Resources/Platform/Adminuser/AdminUserResource.cs
old mode 100644
new mode 100755
index 2d897150..1fb74018
--- a/Mozu.Api/Resources/Platform/Adminuser/AdminUserResource.cs
+++ b/Mozu.Api/Resources/Platform/Adminuser/AdminUserResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Platform.Adminuser
 {
 	/// <summary>
-	/// The Accounts resource displays the user accounts and account details associated with a developer or  tenant administrator. Email addresses uniquely identify admin user accounts.
+	/// Displays the user accounts and account details associated with a developer or Mozu tenant administrator. Email addresses uniquely identify admin user accounts.
 	/// </summary>
 	public partial class AdminUserResource  	{
 		///
@@ -41,35 +42,11 @@ public AdminUserResource CloneWithApiContext(Action<IApiContext> contextModifica
 		}
 
 				
-		/// <summary>
-		/// Retrieves a list of the  tenants or development stores for which the specified user has an assigned role.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="userId">Unique identifier of the user whose tenant scopes you want to retrieve.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Tenant.TenantCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var adminuser = new AdminUser();
-		///   var tenantCollection = adminuser.GetTenantScopesForUser( userId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Tenant.TenantCollection GetTenantScopesForUser(string userId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Tenant.TenantCollection> response;
-			var client = Mozu.Api.Clients.Platform.Adminuser.AdminUserClient.GetTenantScopesForUserClient( userId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of the  tenants or development stores for which the specified user has an assigned role.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="userId">Unique identifier of the user whose tenant scopes you want to retrieve.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Tenant.TenantCollection"/>
@@ -80,46 +57,22 @@ public virtual Mozu.Api.Contracts.Tenant.TenantCollection GetTenantScopesForUser
 		///   var tenantCollection = await adminuser.GetTenantScopesForUserAsync( userId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Tenant.TenantCollection> GetTenantScopesForUserAsync(string userId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Tenant.TenantCollection> GetTenantScopesForUserAsync(string userId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Tenant.TenantCollection> response;
 			var client = Mozu.Api.Clients.Platform.Adminuser.AdminUserClient.GetTenantScopesForUserClient( userId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the details of the specified administrator user account.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="userId">Unique identifier of the user whose tenant scopes you want to retrieve.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Core.User"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var adminuser = new AdminUser();
-		///   var user = adminuser.GetUser( userId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Core.User GetUser(string userId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Core.User> response;
-			var client = Mozu.Api.Clients.Platform.Adminuser.AdminUserClient.GetUserClient( userId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of the specified administrator user account.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="userId">Unique identifier of the user whose tenant scopes you want to retrieve.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="userId">Unique identifier of the administrator account to retrieve.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Core.User"/>
 		/// </returns>
@@ -129,12 +82,12 @@ public virtual Mozu.Api.Contracts.Core.User GetUser(string userId, string respon
 		///   var user = await adminuser.GetUserAsync( userId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Core.User> GetUserAsync(string userId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Core.User> GetUserAsync(string userId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Core.User> response;
 			var client = Mozu.Api.Clients.Platform.Adminuser.AdminUserClient.GetUserClient( userId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
diff --git a/Mozu.Api/Resources/Platform/Adminuser/TenantAdminUserAuthTicketResource.cs b/Mozu.Api/Resources/Platform/Adminuser/TenantAdminUserAuthTicketResource.cs
old mode 100644
new mode 100755
index fd2ff303..37b3b59e
--- a/Mozu.Api/Resources/Platform/Adminuser/TenantAdminUserAuthTicketResource.cs
+++ b/Mozu.Api/Resources/Platform/Adminuser/TenantAdminUserAuthTicketResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Platform.Adminuser
 {
 	/// <summary>
-	/// Use the Admin User authentication tickets resource to generate and refresh authentication tickets that enable  administrator or developer account users to access development or production tenants.
+	/// Use the Admin User authentication tickets resource to generate and refresh authentication tickets that enable Mozu administrator or developer account users to access development or production tenants.
 	/// </summary>
 	public partial class TenantAdminUserAuthTicketResource  	{
 		///
@@ -41,38 +42,13 @@ public TenantAdminUserAuthTicketResource CloneWithApiContext(Action<IApiContext>
 		}
 
 				
-		/// <summary>
-		/// Creates an authentication ticket for the supplied user to specify in API requests associated with the supplied tenant.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="tenantId">Unique identifier of the development or production tenant for which to generate the user authentication ticket.</param>
-		/// <param name="userAuthInfo">Information required to authenticate a user.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.AdminUser.TenantAdminUserAuthTicket"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var tenantadminuserauthticket = new TenantAdminUserAuthTicket();
-		///   var tenantAdminUserAuthTicket = tenantadminuserauthticket.CreateUserAuthTicket( userAuthInfo,  tenantId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.AdminUser.TenantAdminUserAuthTicket CreateUserAuthTicket(Mozu.Api.Contracts.Core.UserAuthInfo userAuthInfo, int? tenantId =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.AdminUser.TenantAdminUserAuthTicket> response;
-			var client = Mozu.Api.Clients.Platform.Adminuser.TenantAdminUserAuthTicketClient.CreateUserAuthTicketClient( userAuthInfo,  tenantId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Creates an authentication ticket for the supplied user to specify in API requests associated with the supplied tenant.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="tenantId">Unique identifier of the development or production tenant for which to generate the user authentication ticket.</param>
-		/// <param name="userAuthInfo">Information required to authenticate a user.</param>
+		/// <param name="userAuthInfo">The user authentication information required to generate the user authentication ticket, which consists of a user name and password.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.AdminUser.TenantAdminUserAuthTicket"/>
 		/// </returns>
@@ -82,48 +58,23 @@ public virtual Mozu.Api.Contracts.AdminUser.TenantAdminUserAuthTicket CreateUser
 		///   var tenantAdminUserAuthTicket = await tenantadminuserauthticket.CreateUserAuthTicketAsync( userAuthInfo,  tenantId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.AdminUser.TenantAdminUserAuthTicket> CreateUserAuthTicketAsync(Mozu.Api.Contracts.Core.UserAuthInfo userAuthInfo, int? tenantId =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.AdminUser.TenantAdminUserAuthTicket> CreateUserAuthTicketAsync(Mozu.Api.Contracts.Core.UserAuthInfo userAuthInfo, int? tenantId =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.AdminUser.TenantAdminUserAuthTicket> response;
 			var client = Mozu.Api.Clients.Platform.Adminuser.TenantAdminUserAuthTicketClient.CreateUserAuthTicketClient( userAuthInfo,  tenantId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Generates a new user authentication ticket for the specified tenant by supplying the user's existing refresh token information.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="tenantId"></param>
-		/// <param name="existingAuthTicket">Properties of the authentication ticket to be used in user claims with the  API.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.AdminUser.TenantAdminUserAuthTicket"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var tenantadminuserauthticket = new TenantAdminUserAuthTicket();
-		///   var tenantAdminUserAuthTicket = tenantadminuserauthticket.RefreshAuthTicket( existingAuthTicket,  tenantId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.AdminUser.TenantAdminUserAuthTicket RefreshAuthTicket(Mozu.Api.Contracts.AdminUser.TenantAdminUserAuthTicket existingAuthTicket, int? tenantId =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.AdminUser.TenantAdminUserAuthTicket> response;
-			var client = Mozu.Api.Clients.Platform.Adminuser.TenantAdminUserAuthTicketClient.RefreshAuthTicketClient( existingAuthTicket,  tenantId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Generates a new user authentication ticket for the specified tenant by supplying the user's existing refresh token information.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="tenantId"></param>
-		/// <param name="existingAuthTicket">Properties of the authentication ticket to be used in user claims with the  API.</param>
+		/// <param name="existingAuthTicket">Properties of the authentication ticket to refresh. The refresh token is required to complete this request.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.AdminUser.TenantAdminUserAuthTicket"/>
 		/// </returns>
@@ -133,43 +84,21 @@ public virtual Mozu.Api.Contracts.AdminUser.TenantAdminUserAuthTicket RefreshAut
 		///   var tenantAdminUserAuthTicket = await tenantadminuserauthticket.RefreshAuthTicketAsync( existingAuthTicket,  tenantId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.AdminUser.TenantAdminUserAuthTicket> RefreshAuthTicketAsync(Mozu.Api.Contracts.AdminUser.TenantAdminUserAuthTicket existingAuthTicket, int? tenantId =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.AdminUser.TenantAdminUserAuthTicket> RefreshAuthTicketAsync(Mozu.Api.Contracts.AdminUser.TenantAdminUserAuthTicket existingAuthTicket, int? tenantId =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.AdminUser.TenantAdminUserAuthTicket> response;
 			var client = Mozu.Api.Clients.Platform.Adminuser.TenantAdminUserAuthTicketClient.RefreshAuthTicketClient( existingAuthTicket,  tenantId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Deletes the authentication ticket for the user by supplying the refresh token.
-		/// </summary>
-		/// <param name="refreshToken">Alphanumeric string used for access tokens. This token refreshes access for accounts by generating a new developer or application account authentication ticket after an access token expires.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var tenantadminuserauthticket = new TenantAdminUserAuthTicket();
-		///   tenantadminuserauthticket.DeleteUserAuthTicket( refreshToken);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteUserAuthTicket(string refreshToken)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Platform.Adminuser.TenantAdminUserAuthTicketClient.DeleteUserAuthTicketClient( refreshToken);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes the authentication ticket for the user by supplying the refresh token.
+		/// 
 		/// </summary>
-		/// <param name="refreshToken">Alphanumeric string used for access tokens. This token refreshes access for accounts by generating a new developer or application account authentication ticket after an access token expires.</param>
+		/// <param name="refreshToken">Refresh token string associated with the user authentication ticket.</param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -179,12 +108,12 @@ public virtual void DeleteUserAuthTicket(string refreshToken)
 		///   await tenantadminuserauthticket.DeleteUserAuthTicketAsync( refreshToken);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteUserAuthTicketAsync(string refreshToken)
+		public virtual async Task DeleteUserAuthTicketAsync(string refreshToken, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Platform.Adminuser.TenantAdminUserAuthTicketClient.DeleteUserAuthTicketClient( refreshToken);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Platform/Appdev/AppPackageResource.cs b/Mozu.Api/Resources/Platform/Appdev/AppPackageResource.cs
new file mode 100755
index 00000000..f1ddb183
--- /dev/null
+++ b/Mozu.Api/Resources/Platform/Appdev/AppPackageResource.cs
@@ -0,0 +1,308 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using Mozu.Api.Security;
+using System.Threading.Tasks;
+using Newtonsoft.Json.Linq;
+using System.Threading;
+
+namespace Mozu.Api.Resources.Platform.Appdev
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	public partial class AppPackageResource  	{
+		///
+		/// <see cref="Mozu.Api.ApiContext"/>
+		///
+		private readonly IApiContext _apiContext;
+
+		
+		public AppPackageResource(IApiContext apiContext) 
+		{
+			_apiContext = apiContext;
+		}
+
+		public AppPackageResource CloneWithApiContext(Action<IApiContext> contextModification) 
+		{
+			return new AppPackageResource(_apiContext.CloneWith(contextModification));
+		}
+
+				
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
+		/// <returns>
+		/// <see cref="Mozu.Api.Contracts.AppDev.PackageSummaryCollection"/>
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var apppackage = new AppPackage();
+		///   var packageSummaryCollection = await apppackage.GetAllPackagesAsync( startIndex,  pageSize,  sortBy,  filter,  responseFields);
+		/// </code>
+		/// </example>
+		public virtual async Task<Mozu.Api.Contracts.AppDev.PackageSummaryCollection> GetAllPackagesAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
+		{
+			MozuClient<Mozu.Api.Contracts.AppDev.PackageSummaryCollection> response;
+			var client = Mozu.Api.Clients.Platform.Appdev.AppPackageClient.GetAllPackagesClient( startIndex,  pageSize,  sortBy,  filter,  responseFields);
+			client.WithContext(_apiContext);
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+			return await response.ResultAsync();
+
+		}
+
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="applicationKey"></param>
+		/// <param name="includeChildren"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="skipDevAccountCheck"></param>
+		/// <returns>
+		/// <see cref="Mozu.Api.Contracts.AppDev.Package"/>
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var apppackage = new AppPackage();
+		///   var package = await apppackage.GetPackageAsync( applicationKey,  includeChildren,  skipDevAccountCheck,  responseFields);
+		/// </code>
+		/// </example>
+		public virtual async Task<Mozu.Api.Contracts.AppDev.Package> GetPackageAsync(string applicationKey, bool? includeChildren =  null, bool? skipDevAccountCheck =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
+		{
+			MozuClient<Mozu.Api.Contracts.AppDev.Package> response;
+			var client = Mozu.Api.Clients.Platform.Appdev.AppPackageClient.GetPackageClient( applicationKey,  includeChildren,  skipDevAccountCheck,  responseFields);
+			client.WithContext(_apiContext);
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+			return await response.ResultAsync();
+
+		}
+
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="applicationKey"></param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
+		/// <returns>
+		/// <see cref="Mozu.Api.Contracts.AppDev.PackageCollection"/>
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var apppackage = new AppPackage();
+		///   var packageCollection = await apppackage.GetPackagesAsync( applicationKey,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
+		/// </code>
+		/// </example>
+		public virtual async Task<Mozu.Api.Contracts.AppDev.PackageCollection> GetPackagesAsync(string applicationKey, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
+		{
+			MozuClient<Mozu.Api.Contracts.AppDev.PackageCollection> response;
+			var client = Mozu.Api.Clients.Platform.Appdev.AppPackageClient.GetPackagesClient( applicationKey,  startIndex,  pageSize,  sortBy,  filter,  responseFields);
+			client.WithContext(_apiContext);
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+			return await response.ResultAsync();
+
+		}
+
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="appId"></param>
+		/// <returns>
+		/// List{<see cref="Mozu.Api.Contracts.AppDev.ApplicationSummary"/>}
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var apppackage = new AppPackage();
+		///   var applicationSummary = await apppackage.GetApplicationSummaryChildrenAsync( appId);
+		/// </code>
+		/// </example>
+		public virtual async Task<List<Mozu.Api.Contracts.AppDev.ApplicationSummary>> GetApplicationSummaryChildrenAsync(string appId, CancellationToken ct = default(CancellationToken))
+		{
+			MozuClient<List<Mozu.Api.Contracts.AppDev.ApplicationSummary>> response;
+			var client = Mozu.Api.Clients.Platform.Appdev.AppPackageClient.GetApplicationSummaryChildrenClient( appId);
+			client.WithContext(_apiContext);
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+			return await response.ResultAsync();
+
+		}
+
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
+		/// <returns>
+		/// <see cref="Mozu.Api.Contracts.AppDev.ApplicationSummaryCollection"/>
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var apppackage = new AppPackage();
+		///   var applicationSummaryCollection = await apppackage.GetApplicationSummaryParentsAsync( startIndex,  pageSize,  sortBy,  filter,  responseFields);
+		/// </code>
+		/// </example>
+		public virtual async Task<Mozu.Api.Contracts.AppDev.ApplicationSummaryCollection> GetApplicationSummaryParentsAsync(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
+		{
+			MozuClient<Mozu.Api.Contracts.AppDev.ApplicationSummaryCollection> response;
+			var client = Mozu.Api.Clients.Platform.Appdev.AppPackageClient.GetApplicationSummaryParentsClient( startIndex,  pageSize,  sortBy,  filter,  responseFields);
+			client.WithContext(_apiContext);
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+			return await response.ResultAsync();
+
+		}
+
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="applicationKey"></param>
+		/// <param name="packageName"></param>
+		/// <param name="responseFields"></param>
+		/// <returns>
+		/// <see cref="Mozu.Api.Contracts.AppDev.Package"/>
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var apppackage = new AppPackage();
+		///   var package = await apppackage.ClonePackageAsync( applicationKey,  packageName,  responseFields);
+		/// </code>
+		/// </example>
+		public virtual async Task<Mozu.Api.Contracts.AppDev.Package> ClonePackageAsync(string applicationKey, string packageName, string responseFields =  null, CancellationToken ct = default(CancellationToken))
+		{
+			MozuClient<Mozu.Api.Contracts.AppDev.Package> response;
+			var client = Mozu.Api.Clients.Platform.Appdev.AppPackageClient.ClonePackageClient( applicationKey,  packageName,  responseFields);
+			client.WithContext(_apiContext);
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+			return await response.ResultAsync();
+
+		}
+
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="responseFields"></param>
+		/// <param name="packageRequest"></param>
+		/// <returns>
+		/// <see cref="Mozu.Api.Contracts.AppDev.Package"/>
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var apppackage = new AppPackage();
+		///   var package = await apppackage.CreateNewCorePackageAsync( packageRequest,  responseFields);
+		/// </code>
+		/// </example>
+		public virtual async Task<Mozu.Api.Contracts.AppDev.Package> CreateNewCorePackageAsync(Mozu.Api.Contracts.AppDev.PackageRequest packageRequest, string responseFields =  null, CancellationToken ct = default(CancellationToken))
+		{
+			MozuClient<Mozu.Api.Contracts.AppDev.Package> response;
+			var client = Mozu.Api.Clients.Platform.Appdev.AppPackageClient.CreateNewCorePackageClient( packageRequest,  responseFields);
+			client.WithContext(_apiContext);
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+			return await response.ResultAsync();
+
+		}
+
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="projectId"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="package"></param>
+		/// <returns>
+		/// <see cref="Mozu.Api.Contracts.AppDev.Package"/>
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var apppackage = new AppPackage();
+		///   var package = await apppackage.CreatePackageAsync( pkg,  projectId,  responseFields);
+		/// </code>
+		/// </example>
+		public virtual async Task<Mozu.Api.Contracts.AppDev.Package> CreatePackageAsync(Mozu.Api.Contracts.AppDev.Package pkg, int? projectId =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
+		{
+			MozuClient<Mozu.Api.Contracts.AppDev.Package> response;
+			var client = Mozu.Api.Clients.Platform.Appdev.AppPackageClient.CreatePackageClient( pkg,  projectId,  responseFields);
+			client.WithContext(_apiContext);
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+			return await response.ResultAsync();
+
+		}
+
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="applicationKey"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="package"></param>
+		/// <returns>
+		/// <see cref="Mozu.Api.Contracts.AppDev.Package"/>
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var apppackage = new AppPackage();
+		///   var package = await apppackage.UpdatePackageAsync( pkg,  applicationKey,  responseFields);
+		/// </code>
+		/// </example>
+		public virtual async Task<Mozu.Api.Contracts.AppDev.Package> UpdatePackageAsync(Mozu.Api.Contracts.AppDev.Package pkg, string applicationKey, string responseFields =  null, CancellationToken ct = default(CancellationToken))
+		{
+			MozuClient<Mozu.Api.Contracts.AppDev.Package> response;
+			var client = Mozu.Api.Clients.Platform.Appdev.AppPackageClient.UpdatePackageClient( pkg,  applicationKey,  responseFields);
+			client.WithContext(_apiContext);
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+			return await response.ResultAsync();
+
+		}
+
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="applicationKey"></param>
+		/// <returns>
+		/// 
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var apppackage = new AppPackage();
+		///   await apppackage.DeletePackageAsync( applicationKey);
+		/// </code>
+		/// </example>
+		public virtual async Task DeletePackageAsync(string applicationKey, CancellationToken ct = default(CancellationToken))
+		{
+			MozuClient response;
+			var client = Mozu.Api.Clients.Platform.Appdev.AppPackageClient.DeletePackageClient( applicationKey);
+			client.WithContext(_apiContext);
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+
+		}
+
+
+	}
+
+}
+
+
diff --git a/Mozu.Api/Resources/Platform/Appdev/PackageResource.cs b/Mozu.Api/Resources/Platform/Appdev/PackageResource.cs
old mode 100644
new mode 100755
index c307c409..9684dfc9
--- a/Mozu.Api/Resources/Platform/Appdev/PackageResource.cs
+++ b/Mozu.Api/Resources/Platform/Appdev/PackageResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Platform.Appdev
 {
 	/// <summary>
-	/// This resource is not public.
+	/// 
 	/// </summary>
 	public partial class PackageResource  	{
 		///
@@ -41,35 +42,11 @@ public PackageResource CloneWithApiContext(Action<IApiContext> contextModificati
 		}
 
 				
-		/// <summary>
-		/// This operation is not public.
-		/// </summary>
-		/// <param name="applicationKey">The application key uniquely identifies the developer namespace, application ID, version, and package in Dev Center. The format is {Dev Account namespace}.{Application ID}.{Application Version}.{Package name}. </param>
-		/// <param name="fileName"></param>
-		/// <returns>
-		/// <see cref="System.IO.Stream"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var package = new Package();
-		///   var stream = package.GetFile( applicationKey,  fileName);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual System.IO.Stream GetFile(string applicationKey, string fileName)
-		{
-			MozuClient<System.IO.Stream> response;
-			var client = Mozu.Api.Clients.Platform.Appdev.PackageClient.GetFileClient( applicationKey,  fileName);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// This operation is not public.
+		/// 
 		/// </summary>
-		/// <param name="applicationKey">The application key uniquely identifies the developer namespace, application ID, version, and package in Dev Center. The format is {Dev Account namespace}.{Application ID}.{Application Version}.{Package name}. </param>
+		/// <param name="applicationKey"></param>
 		/// <param name="fileName"></param>
 		/// <returns>
 		/// <see cref="System.IO.Stream"/>
@@ -80,12 +57,12 @@ public virtual System.IO.Stream GetFile(string applicationKey, string fileName)
 		///   var stream = await package.GetFileAsync( applicationKey,  fileName);
 		/// </code>
 		/// </example>
-		public virtual async Task<System.IO.Stream> GetFileAsync(string applicationKey, string fileName)
+		public virtual async Task<System.IO.Stream> GetFileAsync(string applicationKey, string fileName, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<System.IO.Stream> response;
 			var client = Mozu.Api.Clients.Platform.Appdev.PackageClient.GetFileClient( applicationKey,  fileName);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
diff --git a/Mozu.Api/Resources/Platform/ApplicationResource.cs b/Mozu.Api/Resources/Platform/ApplicationResource.cs
old mode 100644
new mode 100755
index 2898bd5b..927ab0ee
--- a/Mozu.Api/Resources/Platform/ApplicationResource.cs
+++ b/Mozu.Api/Resources/Platform/ApplicationResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Platform
 {
 	/// <summary>
-	/// Use the Developer resource to view and update information and files related to application packages.
+	/// 
 	/// </summary>
 	public partial class ApplicationResource  	{
 		///
@@ -41,36 +42,12 @@ public ApplicationResource CloneWithApiContext(Action<IApiContext> contextModifi
 		}
 
 				
-		/// <summary>
-		/// Returns a collection of package names for the application specified in the request.
-		/// </summary>
-		/// <param name="applicationKey">The application key uniquely identifies the developer namespace, application ID, version, and package in Dev Center. The format is {Dev Account namespace}.{Application ID}.{Application Version}.{Package name}.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.AppDev.PackageNamesCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var application = new Application();
-		///   var packageNamesCollection = application.GetAppPackageNames( applicationKey,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.AppDev.PackageNamesCollection GetAppPackageNames(string applicationKey, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.AppDev.PackageNamesCollection> response;
-			var client = Mozu.Api.Clients.Platform.ApplicationClient.GetAppPackageNamesClient( applicationKey,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Returns a collection of package names for the application specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="applicationKey">The application key uniquely identifies the developer namespace, application ID, version, and package in Dev Center. The format is {Dev Account namespace}.{Application ID}.{Application Version}.{Package name}.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="applicationKey"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.AppDev.PackageNamesCollection"/>
 		/// </returns>
@@ -80,46 +57,22 @@ public virtual Mozu.Api.Contracts.AppDev.PackageNamesCollection GetAppPackageNam
 		///   var packageNamesCollection = await application.GetAppPackageNamesAsync( applicationKey,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.AppDev.PackageNamesCollection> GetAppPackageNamesAsync(string applicationKey, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.AppDev.PackageNamesCollection> GetAppPackageNamesAsync(string applicationKey, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.AppDev.PackageNamesCollection> response;
 			var client = Mozu.Api.Clients.Platform.ApplicationClient.GetAppPackageNamesClient( applicationKey,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the available versions for the application specified in the request.
-		/// </summary>
-		/// <param name="nsAndAppId">The application key uniquely identifies the developer namespace, application ID, version, and package in Dev Center. The format is {Dev Account namespace}.{Application ID}.{Application Version}.{Package name}.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.AppDev.ApplicationVersionsCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var application = new Application();
-		///   var applicationVersionsCollection = application.GetAppVersions( nsAndAppId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.AppDev.ApplicationVersionsCollection GetAppVersions(string nsAndAppId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.AppDev.ApplicationVersionsCollection> response;
-			var client = Mozu.Api.Clients.Platform.ApplicationClient.GetAppVersionsClient( nsAndAppId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the available versions for the application specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="nsAndAppId">The application key uniquely identifies the developer namespace, application ID, version, and package in Dev Center. The format is {Dev Account namespace}.{Application ID}.{Application Version}.{Package name}.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="nsAndAppId"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.AppDev.ApplicationVersionsCollection"/>
 		/// </returns>
@@ -129,48 +82,23 @@ public virtual Mozu.Api.Contracts.AppDev.ApplicationVersionsCollection GetAppVer
 		///   var applicationVersionsCollection = await application.GetAppVersionsAsync( nsAndAppId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.AppDev.ApplicationVersionsCollection> GetAppVersionsAsync(string nsAndAppId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.AppDev.ApplicationVersionsCollection> GetAppVersionsAsync(string nsAndAppId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.AppDev.ApplicationVersionsCollection> response;
 			var client = Mozu.Api.Clients.Platform.ApplicationClient.GetAppVersionsClient( nsAndAppId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the metadata for a file in an application package.
-		/// </summary>
-		/// <param name="applicationKey">The application key uniquely identifies the developer namespace, application ID, version, and package in Dev Center. The format is {Dev Account namespace}.{Application ID}.{Application Version}.{Package name}.</param>
-		/// <param name="filepath">Represents the file name and location.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.AppDev.FileMetadata"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var application = new Application();
-		///   var fileMetadata = application.GetPackageFileMetadata( applicationKey,  filepath,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.AppDev.FileMetadata GetPackageFileMetadata(string applicationKey, string filepath, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.AppDev.FileMetadata> response;
-			var client = Mozu.Api.Clients.Platform.ApplicationClient.GetPackageFileMetadataClient( applicationKey,  filepath,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the metadata for a file in an application package.
+		/// 
 		/// </summary>
-		/// <param name="applicationKey">The application key uniquely identifies the developer namespace, application ID, version, and package in Dev Center. The format is {Dev Account namespace}.{Application ID}.{Application Version}.{Package name}.</param>
-		/// <param name="filepath">Represents the file name and location.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="applicationKey"></param>
+		/// <param name="filepath"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.AppDev.FileMetadata"/>
 		/// </returns>
@@ -180,46 +108,22 @@ public virtual Mozu.Api.Contracts.AppDev.FileMetadata GetPackageFileMetadata(str
 		///   var fileMetadata = await application.GetPackageFileMetadataAsync( applicationKey,  filepath,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.AppDev.FileMetadata> GetPackageFileMetadataAsync(string applicationKey, string filepath, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.AppDev.FileMetadata> GetPackageFileMetadataAsync(string applicationKey, string filepath, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.AppDev.FileMetadata> response;
 			var client = Mozu.Api.Clients.Platform.ApplicationClient.GetPackageFileMetadataClient( applicationKey,  filepath,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the metadata for a folder in an application package.
-		/// </summary>
-		/// <param name="applicationKey">The application key uniquely identifies the developer namespace, application ID, version, and package in Dev Center. The format is {Dev Account namespace}.{Application ID}.{Application Version}.{Package name}.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.AppDev.FolderMetadata"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var application = new Application();
-		///   var folderMetadata = application.GetPackageMetadata( applicationKey,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.AppDev.FolderMetadata GetPackageMetadata(string applicationKey, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.AppDev.FolderMetadata> response;
-			var client = Mozu.Api.Clients.Platform.ApplicationClient.GetPackageMetadataClient( applicationKey,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the metadata for a folder in an application package.
+		/// 
 		/// </summary>
-		/// <param name="applicationKey">The application key uniquely identifies the developer namespace, application ID, version, and package in Dev Center. The format is {Dev Account namespace}.{Application ID}.{Application Version}.{Package name}.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="applicationKey"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.AppDev.FolderMetadata"/>
 		/// </returns>
@@ -229,52 +133,25 @@ public virtual Mozu.Api.Contracts.AppDev.FolderMetadata GetPackageMetadata(strin
 		///   var folderMetadata = await application.GetPackageMetadataAsync( applicationKey,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.AppDev.FolderMetadata> GetPackageMetadataAsync(string applicationKey, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.AppDev.FolderMetadata> GetPackageMetadataAsync(string applicationKey, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.AppDev.FolderMetadata> response;
 			var client = Mozu.Api.Clients.Platform.ApplicationClient.GetPackageMetadataClient( applicationKey,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Insert or update the specified file into the specified application package.
-		/// </summary>
-		/// <param name="applicationKey">The application key uniquely identifies the developer namespace, application ID, version, and package in Dev Center. The format is {Dev Account namespace}.{Application ID}.{Application Version}.{Package name}.</param>
-		/// <param name="filepath">The application key uniquely identifies the developer namespace, application ID, version, and package in Dev Center. The format is {Dev Account namespace}.{Application ID}.{Application Version}.{Package name}.</param>
-		/// <param name="lastModifiedTime">The date and time of the last file insert or update. This parameter is optional.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="stream">Data stream that delivers information. Used to input and output data.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.AppDev.FileMetadata"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var application = new Application();
-		///   var fileMetadata = application.UpsertPackageFile( stream,  applicationKey,  filepath,  lastModifiedTime,  responseFields,  contentType);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.AppDev.FileMetadata UpsertPackageFile(System.IO.Stream stream, string applicationKey, string filepath, string lastModifiedTime =  null, string responseFields =  null, String  contentType= null)
-		{
-			MozuClient<Mozu.Api.Contracts.AppDev.FileMetadata> response;
-			var client = Mozu.Api.Clients.Platform.ApplicationClient.UpsertPackageFileClient( stream,  applicationKey,  filepath,  lastModifiedTime,  responseFields,  contentType);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Insert or update the specified file into the specified application package.
+		/// 
 		/// </summary>
-		/// <param name="applicationKey">The application key uniquely identifies the developer namespace, application ID, version, and package in Dev Center. The format is {Dev Account namespace}.{Application ID}.{Application Version}.{Package name}.</param>
-		/// <param name="filepath">The application key uniquely identifies the developer namespace, application ID, version, and package in Dev Center. The format is {Dev Account namespace}.{Application ID}.{Application Version}.{Package name}.</param>
-		/// <param name="lastModifiedTime">The date and time of the last file insert or update. This parameter is optional.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="stream">Data stream that delivers information. Used to input and output data.</param>
+		/// <param name="applicationKey"></param>
+		/// <param name="filepath"></param>
+		/// <param name="lastModifiedTime"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="stream"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.AppDev.FileMetadata"/>
 		/// </returns>
@@ -284,48 +161,23 @@ public virtual Mozu.Api.Contracts.AppDev.FileMetadata UpsertPackageFile(System.I
 		///   var fileMetadata = await application.UpsertPackageFileAsync( stream,  applicationKey,  filepath,  lastModifiedTime,  responseFields,  contentType);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.AppDev.FileMetadata> UpsertPackageFileAsync(System.IO.Stream stream, string applicationKey, string filepath, string lastModifiedTime =  null, string responseFields =  null, String  contentType= null)
+		public virtual async Task<Mozu.Api.Contracts.AppDev.FileMetadata> UpsertPackageFileAsync(System.IO.Stream stream, string applicationKey, string filepath, string lastModifiedTime =  null, string responseFields =  null, String  contentType= null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.AppDev.FileMetadata> response;
 			var client = Mozu.Api.Clients.Platform.ApplicationClient.UpsertPackageFileClient( stream,  applicationKey,  filepath,  lastModifiedTime,  responseFields,  contentType);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Renames a file in an application package.
-		/// </summary>
-		/// <param name="applicationKey">The application key uniquely identifies the developer namespace, application ID, version, and package in Dev Center. The format is {Dev Account namespace}.{Application ID}.{Application Version}.{Package name}.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="renameInfo">Information required to update the name of a file in a package, which consists of the original name and the new name.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.AppDev.FileMetadata"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var application = new Application();
-		///   var fileMetadata = application.RenamePackageFile( renameInfo,  applicationKey,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.AppDev.FileMetadata RenamePackageFile(Mozu.Api.Contracts.AppDev.RenameInfo renameInfo, string applicationKey, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.AppDev.FileMetadata> response;
-			var client = Mozu.Api.Clients.Platform.ApplicationClient.RenamePackageFileClient( renameInfo,  applicationKey,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Renames a file in an application package.
+		/// 
 		/// </summary>
-		/// <param name="applicationKey">The application key uniquely identifies the developer namespace, application ID, version, and package in Dev Center. The format is {Dev Account namespace}.{Application ID}.{Application Version}.{Package name}.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="renameInfo">Information required to update the name of a file in a package, which consists of the original name and the new name.</param>
+		/// <param name="applicationKey"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="renameInfo"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.AppDev.FileMetadata"/>
 		/// </returns>
@@ -335,45 +187,22 @@ public virtual Mozu.Api.Contracts.AppDev.FileMetadata RenamePackageFile(Mozu.Api
 		///   var fileMetadata = await application.RenamePackageFileAsync( renameInfo,  applicationKey,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.AppDev.FileMetadata> RenamePackageFileAsync(Mozu.Api.Contracts.AppDev.RenameInfo renameInfo, string applicationKey, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.AppDev.FileMetadata> RenamePackageFileAsync(Mozu.Api.Contracts.AppDev.RenameInfo renameInfo, string applicationKey, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.AppDev.FileMetadata> response;
 			var client = Mozu.Api.Clients.Platform.ApplicationClient.RenamePackageFileClient( renameInfo,  applicationKey,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Deletes the specified file from the specified application package.
-		/// </summary>
-		/// <param name="applicationKey">The application key uniquely identifies the developer namespace, application ID, version, and package in Dev Center. The format is {Dev Account namespace}.{Application ID}.{Application Version}.{Package name}.</param>
-		/// <param name="filepath">Represents the file name and location.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var application = new Application();
-		///   application.DeletePackageFile( applicationKey,  filepath);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeletePackageFile(string applicationKey, string filepath)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Platform.ApplicationClient.DeletePackageFileClient( applicationKey,  filepath);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes the specified file from the specified application package.
+		/// 
 		/// </summary>
-		/// <param name="applicationKey">The application key uniquely identifies the developer namespace, application ID, version, and package in Dev Center. The format is {Dev Account namespace}.{Application ID}.{Application Version}.{Package name}.</param>
-		/// <param name="filepath">Represents the file name and location.</param>
+		/// <param name="applicationKey"></param>
+		/// <param name="filepath"></param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -383,12 +212,12 @@ public virtual void DeletePackageFile(string applicationKey, string filepath)
 		///   await application.DeletePackageFileAsync( applicationKey,  filepath);
 		/// </code>
 		/// </example>
-		public virtual async Task DeletePackageFileAsync(string applicationKey, string filepath)
+		public virtual async Task DeletePackageFileAsync(string applicationKey, string filepath, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Platform.ApplicationClient.DeletePackageFileClient( applicationKey,  filepath);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Platform/Applications/AuthTicketResource.cs b/Mozu.Api/Resources/Platform/Applications/AuthTicketResource.cs
old mode 100644
new mode 100755
index 7e078ea6..cd20fcdc
--- a/Mozu.Api/Resources/Platform/Applications/AuthTicketResource.cs
+++ b/Mozu.Api/Resources/Platform/Applications/AuthTicketResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Platform.Applications
 {
 	/// <summary>
-	/// Use the Authetickets for applications resource to manage authentication tickets for your apps.
+	/// Use this resource to manage authentication tickets for your applications.
 	/// </summary>
 	public partial class AuthTicketResource  	{
 		///
@@ -41,36 +42,12 @@ public AuthTicketResource CloneWithApiContext(Action<IApiContext> contextModific
 		}
 
 				
-		/// <summary>
-		/// Generate an authentication ticket for an application.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="appAuthInfo">The information required to authenticate third party applications against the  API.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.AppDev.AuthTicket"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var authticket = new AuthTicket();
-		///   var authTicket = authticket.AuthenticateApp( appAuthInfo,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.AppDev.AuthTicket AuthenticateApp(Mozu.Api.Contracts.AppDev.AppAuthInfo appAuthInfo, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.AppDev.AuthTicket> response;
-			var client = Mozu.Api.Clients.Platform.Applications.AuthTicketClient.AuthenticateAppClient( appAuthInfo,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Generate an authentication ticket for an application.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="appAuthInfo">The information required to authenticate third party applications against the  API.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="appAuthInfo">Authentication information required to generate an authentication ticket includes the application id and the shared secret.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.AppDev.AuthTicket"/>
 		/// </returns>
@@ -80,46 +57,22 @@ public virtual Mozu.Api.Contracts.AppDev.AuthTicket AuthenticateApp(Mozu.Api.Con
 		///   var authTicket = await authticket.AuthenticateAppAsync( appAuthInfo,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.AppDev.AuthTicket> AuthenticateAppAsync(Mozu.Api.Contracts.AppDev.AppAuthInfo appAuthInfo, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.AppDev.AuthTicket> AuthenticateAppAsync(Mozu.Api.Contracts.AppDev.AppAuthInfo appAuthInfo, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.AppDev.AuthTicket> response;
 			var client = Mozu.Api.Clients.Platform.Applications.AuthTicketClient.AuthenticateAppClient( appAuthInfo,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Refreshes the application's authentication ticket and generates a new access token by providing the refresh token string.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="authTicketRequest">Properties of the authentication ticket refresh requests, which includes the refresh token string.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.AppDev.AuthTicket"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var authticket = new AuthTicket();
-		///   var authTicket = authticket.RefreshAppAuthTicket( authTicketRequest,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.AppDev.AuthTicket RefreshAppAuthTicket(Mozu.Api.Contracts.AppDev.AuthTicketRequest authTicketRequest, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.AppDev.AuthTicket> response;
-			var client = Mozu.Api.Clients.Platform.Applications.AuthTicketClient.RefreshAppAuthTicketClient( authTicketRequest,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Refreshes the application's authentication ticket and generates a new access token by providing the refresh token string.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="authTicketRequest">Properties of the authentication ticket refresh requests, which includes the refresh token string.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="authTicketRequest">The refresh token string required to update the application authentication ticket.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.AppDev.AuthTicket"/>
 		/// </returns>
@@ -129,43 +82,21 @@ public virtual Mozu.Api.Contracts.AppDev.AuthTicket RefreshAppAuthTicket(Mozu.Ap
 		///   var authTicket = await authticket.RefreshAppAuthTicketAsync( authTicketRequest,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.AppDev.AuthTicket> RefreshAppAuthTicketAsync(Mozu.Api.Contracts.AppDev.AuthTicketRequest authTicketRequest, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.AppDev.AuthTicket> RefreshAppAuthTicketAsync(Mozu.Api.Contracts.AppDev.AuthTicketRequest authTicketRequest, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.AppDev.AuthTicket> response;
 			var client = Mozu.Api.Clients.Platform.Applications.AuthTicketClient.RefreshAppAuthTicketClient( authTicketRequest,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Deletes an authentication for an application based on the specified refresh token.
-		/// </summary>
-		/// <param name="refreshToken">Alphanumeric string used for access tokens. This token refreshes access for accounts by generating a new developer or application account authentication ticket after an access token expires.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var authticket = new AuthTicket();
-		///   authticket.DeleteAppAuthTicket( refreshToken);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteAppAuthTicket(string refreshToken)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Platform.Applications.AuthTicketClient.DeleteAppAuthTicketClient( refreshToken);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes an authentication for an application based on the specified refresh token.
+		/// 
 		/// </summary>
-		/// <param name="refreshToken">Alphanumeric string used for access tokens. This token refreshes access for accounts by generating a new developer or application account authentication ticket after an access token expires.</param>
+		/// <param name="refreshToken">The refresh token string from the application's authentication ticket.</param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -175,12 +106,12 @@ public virtual void DeleteAppAuthTicket(string refreshToken)
 		///   await authticket.DeleteAppAuthTicketAsync( refreshToken);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteAppAuthTicketAsync(string refreshToken)
+		public virtual async Task DeleteAppAuthTicketAsync(string refreshToken, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Platform.Applications.AuthTicketClient.DeleteAppAuthTicketClient( refreshToken);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Platform/Developer/DeveloperAdminUserAuthTicketResource.cs b/Mozu.Api/Resources/Platform/Developer/DeveloperAdminUserAuthTicketResource.cs
old mode 100644
new mode 100755
index 34f9cd9c..0a03023c
--- a/Mozu.Api/Resources/Platform/Developer/DeveloperAdminUserAuthTicketResource.cs
+++ b/Mozu.Api/Resources/Platform/Developer/DeveloperAdminUserAuthTicketResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Platform.Developer
 {
 	/// <summary>
-	/// Use the Authtickets resource to manage authentication tickets for your developer account.
+	/// Use this resource to manage authentication tickets for your developer account.
 	/// </summary>
 	public partial class DeveloperAdminUserAuthTicketResource  	{
 		///
@@ -41,38 +42,13 @@ public DeveloperAdminUserAuthTicketResource CloneWithApiContext(Action<IApiConte
 		}
 
 				
-		/// <summary>
-		/// Generate an authentication ticket for a developer account.
-		/// </summary>
-		/// <param name="developerAccountId">Unique identifier of the developer account.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="userAuthInfo">Information required to authenticate a user.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.AdminUser.DeveloperAdminUserAuthTicket"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var developeradminuserauthticket = new DeveloperAdminUserAuthTicket();
-		///   var developerAdminUserAuthTicket = developeradminuserauthticket.CreateDeveloperUserAuthTicket( userAuthInfo,  developerAccountId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.AdminUser.DeveloperAdminUserAuthTicket CreateDeveloperUserAuthTicket(Mozu.Api.Contracts.Core.UserAuthInfo userAuthInfo, int? developerAccountId =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.AdminUser.DeveloperAdminUserAuthTicket> response;
-			var client = Mozu.Api.Clients.Platform.Developer.DeveloperAdminUserAuthTicketClient.CreateDeveloperUserAuthTicketClient( userAuthInfo,  developerAccountId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Generate an authentication ticket for a developer account.
+		/// 
 		/// </summary>
 		/// <param name="developerAccountId">Unique identifier of the developer account.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="userAuthInfo">Information required to authenticate a user.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="userAuthInfo">The user authentication information required to generate the developer account user authentication ticket, which consists of a user name and password.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.AdminUser.DeveloperAdminUserAuthTicket"/>
 		/// </returns>
@@ -82,48 +58,23 @@ public virtual Mozu.Api.Contracts.AdminUser.DeveloperAdminUserAuthTicket CreateD
 		///   var developerAdminUserAuthTicket = await developeradminuserauthticket.CreateDeveloperUserAuthTicketAsync( userAuthInfo,  developerAccountId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.AdminUser.DeveloperAdminUserAuthTicket> CreateDeveloperUserAuthTicketAsync(Mozu.Api.Contracts.Core.UserAuthInfo userAuthInfo, int? developerAccountId =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.AdminUser.DeveloperAdminUserAuthTicket> CreateDeveloperUserAuthTicketAsync(Mozu.Api.Contracts.Core.UserAuthInfo userAuthInfo, int? developerAccountId =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.AdminUser.DeveloperAdminUserAuthTicket> response;
 			var client = Mozu.Api.Clients.Platform.Developer.DeveloperAdminUserAuthTicketClient.CreateDeveloperUserAuthTicketClient( userAuthInfo,  developerAccountId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Generates a new developer account authentication ticket for the specified tenant by supplying the defined refresh token information.
-		/// </summary>
-		/// <param name="developerAccountId">Unique identifier of the developer account.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="existingAuthTicket">Properties of the authentication ticket to be used in developer account claims with the  API.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.AdminUser.DeveloperAdminUserAuthTicket"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var developeradminuserauthticket = new DeveloperAdminUserAuthTicket();
-		///   var developerAdminUserAuthTicket = developeradminuserauthticket.RefreshDeveloperAuthTicket( existingAuthTicket,  developerAccountId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.AdminUser.DeveloperAdminUserAuthTicket RefreshDeveloperAuthTicket(Mozu.Api.Contracts.AdminUser.DeveloperAdminUserAuthTicket existingAuthTicket, int? developerAccountId =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.AdminUser.DeveloperAdminUserAuthTicket> response;
-			var client = Mozu.Api.Clients.Platform.Developer.DeveloperAdminUserAuthTicketClient.RefreshDeveloperAuthTicketClient( existingAuthTicket,  developerAccountId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Generates a new developer account authentication ticket for the specified tenant by supplying the defined refresh token information.
+		/// 
 		/// </summary>
 		/// <param name="developerAccountId">Unique identifier of the developer account.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="existingAuthTicket">Properties of the authentication ticket to be used in developer account claims with the  API.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="existingAuthTicket">Properties of the authentication ticket to refresh. The refresh token is required to complete this request.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.AdminUser.DeveloperAdminUserAuthTicket"/>
 		/// </returns>
@@ -133,43 +84,21 @@ public virtual Mozu.Api.Contracts.AdminUser.DeveloperAdminUserAuthTicket Refresh
 		///   var developerAdminUserAuthTicket = await developeradminuserauthticket.RefreshDeveloperAuthTicketAsync( existingAuthTicket,  developerAccountId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.AdminUser.DeveloperAdminUserAuthTicket> RefreshDeveloperAuthTicketAsync(Mozu.Api.Contracts.AdminUser.DeveloperAdminUserAuthTicket existingAuthTicket, int? developerAccountId =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.AdminUser.DeveloperAdminUserAuthTicket> RefreshDeveloperAuthTicketAsync(Mozu.Api.Contracts.AdminUser.DeveloperAdminUserAuthTicket existingAuthTicket, int? developerAccountId =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.AdminUser.DeveloperAdminUserAuthTicket> response;
 			var client = Mozu.Api.Clients.Platform.Developer.DeveloperAdminUserAuthTicketClient.RefreshDeveloperAuthTicketClient( existingAuthTicket,  developerAccountId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Deletes the authentication ticket for the developer account by supplying the refresh token.
-		/// </summary>
-		/// <param name="refreshToken">Alphanumeric string used for access tokens. This token refreshes access for accounts by generating a new developer or application account authentication ticket after an access token expires.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var developeradminuserauthticket = new DeveloperAdminUserAuthTicket();
-		///   developeradminuserauthticket.DeleteUserAuthTicket( refreshToken);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteUserAuthTicket(string refreshToken)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Platform.Developer.DeveloperAdminUserAuthTicketClient.DeleteUserAuthTicketClient( refreshToken);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes the authentication ticket for the developer account by supplying the refresh token.
+		/// 
 		/// </summary>
-		/// <param name="refreshToken">Alphanumeric string used for access tokens. This token refreshes access for accounts by generating a new developer or application account authentication ticket after an access token expires.</param>
+		/// <param name="refreshToken">Refresh token string associated with the developer account authentication ticket.</param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -179,12 +108,12 @@ public virtual void DeleteUserAuthTicket(string refreshToken)
 		///   await developeradminuserauthticket.DeleteUserAuthTicketAsync( refreshToken);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteUserAuthTicketAsync(string refreshToken)
+		public virtual async Task DeleteUserAuthTicketAsync(string refreshToken, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Platform.Developer.DeveloperAdminUserAuthTicketClient.DeleteUserAuthTicketClient( refreshToken);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Platform/EntityListResource.cs b/Mozu.Api/Resources/Platform/EntityListResource.cs
old mode 100644
new mode 100755
index 6d719f5a..3b7a952a
--- a/Mozu.Api/Resources/Platform/EntityListResource.cs
+++ b/Mozu.Api/Resources/Platform/EntityListResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Platform
 {
 	/// <summary>
-	/// The Entity Lists resource manages all dynamic entities in your  document store of the  cloud. The content is JSON and can have up to five indexed properties (integer, decimal, string, date, and boolean) with support for additional customized elements as needed. Every document in the entity list has a validated unique ID.
+	/// 
 	/// </summary>
 	public partial class EntityListResource  	{
 		///
@@ -37,42 +38,15 @@ public EntityListResource CloneWithApiContext(Action<IApiContext> contextModific
 		}
 
 				
-		/// <summary>
-		/// Get a filtered list of EntityLists for a specific tenant.
-		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.MZDB.EntityListCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var entitylist = new EntityList();
-		///   var entityListCollection = entitylist.GetEntityLists( pageSize,  startIndex,  filter,  sortBy,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.MZDB.EntityListCollection GetEntityLists(int? pageSize =  null, int? startIndex =  null, string filter =  null, string sortBy =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.MZDB.EntityListCollection> response;
-			var client = Mozu.Api.Clients.Platform.EntityListClient.GetEntityListsClient( pageSize,  startIndex,  filter,  sortBy,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Get a filtered list of EntityLists for a specific tenant.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.MZDB.EntityListCollection"/>
 		/// </returns>
@@ -82,46 +56,22 @@ public virtual Mozu.Api.Contracts.MZDB.EntityListCollection GetEntityLists(int?
 		///   var entityListCollection = await entitylist.GetEntityListsAsync( pageSize,  startIndex,  filter,  sortBy,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.MZDB.EntityListCollection> GetEntityListsAsync(int? pageSize =  null, int? startIndex =  null, string filter =  null, string sortBy =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.MZDB.EntityListCollection> GetEntityListsAsync(int? pageSize =  null, int? startIndex =  null, string filter =  null, string sortBy =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.MZDB.EntityListCollection> response;
 			var client = Mozu.Api.Clients.Platform.EntityListClient.GetEntityListsClient( pageSize,  startIndex,  filter,  sortBy,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Get an existing EntityList definition for a specific tenant
-		/// </summary>
-		/// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.MZDB.EntityList"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var entitylist = new EntityList();
-		///   var entityList = entitylist.GetEntityList( entityListFullName,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.MZDB.EntityList GetEntityList(string entityListFullName, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.MZDB.EntityList> response;
-			var client = Mozu.Api.Clients.Platform.EntityListClient.GetEntityListClient( entityListFullName,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Get an existing EntityList definition for a specific tenant
+		/// 
 		/// </summary>
-		/// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="entityListFullName"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.MZDB.EntityList"/>
 		/// </returns>
@@ -131,46 +81,22 @@ public virtual Mozu.Api.Contracts.MZDB.EntityList GetEntityList(string entityLis
 		///   var entityList = await entitylist.GetEntityListAsync( entityListFullName,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.MZDB.EntityList> GetEntityListAsync(string entityListFullName, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.MZDB.EntityList> GetEntityListAsync(string entityListFullName, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.MZDB.EntityList> response;
 			var client = Mozu.Api.Clients.Platform.EntityListClient.GetEntityListClient( entityListFullName,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Create a new EntityList for a specific tenant.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="entityList">The definition of an MZDB EntityList which describes the characteristics of the EntityList on a per tenant basis. EntityLists are created at the tenant level, but instances of the EntityLists are implicitly created at the appropriate context level as entities are added or removed from the EntityList.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.MZDB.EntityList"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var entitylist = new EntityList();
-		///   var entityList = entitylist.CreateEntityList( entityList,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.MZDB.EntityList CreateEntityList(Mozu.Api.Contracts.MZDB.EntityList entityList, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.MZDB.EntityList> response;
-			var client = Mozu.Api.Clients.Platform.EntityListClient.CreateEntityListClient( entityList,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Create a new EntityList for a specific tenant.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="entityList">The definition of an MZDB EntityList which describes the characteristics of the EntityList on a per tenant basis. EntityLists are created at the tenant level, but instances of the EntityLists are implicitly created at the appropriate context level as entities are added or removed from the EntityList.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="entityList"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.MZDB.EntityList"/>
 		/// </returns>
@@ -180,48 +106,23 @@ public virtual Mozu.Api.Contracts.MZDB.EntityList CreateEntityList(Mozu.Api.Cont
 		///   var entityList = await entitylist.CreateEntityListAsync( entityList,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.MZDB.EntityList> CreateEntityListAsync(Mozu.Api.Contracts.MZDB.EntityList entityList, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.MZDB.EntityList> CreateEntityListAsync(Mozu.Api.Contracts.MZDB.EntityList entityList, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.MZDB.EntityList> response;
 			var client = Mozu.Api.Clients.Platform.EntityListClient.CreateEntityListClient( entityList,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Update an existing Entitylist for a specific tenant.
-		/// </summary>
-		/// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="entityList">The definition of an MZDB EntityList which describes the characteristics of the EntityList on a per tenant basis. EntityLists are created at the tenant level, but instances of the EntityLists are implicitly created at the appropriate context level as entities are added or removed from the EntityList.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.MZDB.EntityList"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var entitylist = new EntityList();
-		///   var entityList = entitylist.UpdateEntityList( entityList,  entityListFullName,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.MZDB.EntityList UpdateEntityList(Mozu.Api.Contracts.MZDB.EntityList entityList, string entityListFullName, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.MZDB.EntityList> response;
-			var client = Mozu.Api.Clients.Platform.EntityListClient.UpdateEntityListClient( entityList,  entityListFullName,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Update an existing Entitylist for a specific tenant.
+		/// 
 		/// </summary>
-		/// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="entityList">The definition of an MZDB EntityList which describes the characteristics of the EntityList on a per tenant basis. EntityLists are created at the tenant level, but instances of the EntityLists are implicitly created at the appropriate context level as entities are added or removed from the EntityList.</param>
+		/// <param name="entityListFullName"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="entityList"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.MZDB.EntityList"/>
 		/// </returns>
@@ -231,43 +132,21 @@ public virtual Mozu.Api.Contracts.MZDB.EntityList UpdateEntityList(Mozu.Api.Cont
 		///   var entityList = await entitylist.UpdateEntityListAsync( entityList,  entityListFullName,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.MZDB.EntityList> UpdateEntityListAsync(Mozu.Api.Contracts.MZDB.EntityList entityList, string entityListFullName, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.MZDB.EntityList> UpdateEntityListAsync(Mozu.Api.Contracts.MZDB.EntityList entityList, string entityListFullName, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.MZDB.EntityList> response;
 			var client = Mozu.Api.Clients.Platform.EntityListClient.UpdateEntityListClient( entityList,  entityListFullName,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Delete an existing EntityList for a specific tenant. This will also delete all Entities in all instances of this EntityList for the tenant.
-		/// </summary>
-		/// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var entitylist = new EntityList();
-		///   entitylist.DeleteEntityList( entityListFullName);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteEntityList(string entityListFullName)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Platform.EntityListClient.DeleteEntityListClient( entityListFullName);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Delete an existing EntityList for a specific tenant. This will also delete all Entities in all instances of this EntityList for the tenant.
+		/// 
 		/// </summary>
-		/// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
+		/// <param name="entityListFullName"></param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -277,12 +156,12 @@ public virtual void DeleteEntityList(string entityListFullName)
 		///   await entitylist.DeleteEntityListAsync( entityListFullName);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteEntityListAsync(string entityListFullName)
+		public virtual async Task DeleteEntityListAsync(string entityListFullName, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Platform.EntityListClient.DeleteEntityListClient( entityListFullName);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Platform/Entitylists/EntityContainerResource.cs b/Mozu.Api/Resources/Platform/Entitylists/EntityContainerResource.cs
old mode 100644
new mode 100755
index 473ff7ca..88cab81b
--- a/Mozu.Api/Resources/Platform/Entitylists/EntityContainerResource.cs
+++ b/Mozu.Api/Resources/Platform/Entitylists/EntityContainerResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Platform.Entitylists
 {
 	/// <summary>
-	/// Entity containers provide all properties and data for entities within a site/tenant. This data encapsulates all associated IDs including entity lists, entity views, site, tenant, entities, and more.
+	/// 
 	/// </summary>
 	public partial class EntityContainerResource  	{
 		///
@@ -37,38 +38,13 @@ public EntityContainerResource CloneWithApiContext(Action<IApiContext> contextMo
 		}
 
 				
-		/// <summary>
-		/// Retrieves an entity container, providing all schema and rules and associated IDs for entities.
-		/// </summary>
-		/// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-		/// <param name="id">Unique identifier of the customer segment to retrieve.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.MZDB.EntityContainer"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var entitycontainer = new EntityContainer();
-		///   var entityContainer = entitycontainer.GetEntityContainer( entityListFullName,  id,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.MZDB.EntityContainer GetEntityContainer(string entityListFullName, string id, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.MZDB.EntityContainer> response;
-			var client = Mozu.Api.Clients.Platform.Entitylists.EntityContainerClient.GetEntityContainerClient( entityListFullName,  id,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves an entity container, providing all schema and rules and associated IDs for entities.
+		/// 
 		/// </summary>
-		/// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-		/// <param name="id">Unique identifier of the customer segment to retrieve.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="entityListFullName"></param>
+		/// <param name="id"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.MZDB.EntityContainer"/>
 		/// </returns>
@@ -78,54 +54,26 @@ public virtual Mozu.Api.Contracts.MZDB.EntityContainer GetEntityContainer(string
 		///   var entityContainer = await entitycontainer.GetEntityContainerAsync( entityListFullName,  id,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.MZDB.EntityContainer> GetEntityContainerAsync(string entityListFullName, string id, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.MZDB.EntityContainer> GetEntityContainerAsync(string entityListFullName, string id, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.MZDB.EntityContainer> response;
 			var client = Mozu.Api.Clients.Platform.Entitylists.EntityContainerClient.GetEntityContainerClient( entityListFullName,  id,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves a collection of entity containers. Each container holds a set of entities per ID. 
-		/// </summary>
-		/// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.MZDB.EntityContainerCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var entitycontainer = new EntityContainer();
-		///   var entityContainerCollection = entitycontainer.GetEntityContainers( entityListFullName,  pageSize,  startIndex,  filter,  sortBy,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.MZDB.EntityContainerCollection GetEntityContainers(string entityListFullName, int? pageSize =  null, int? startIndex =  null, string filter =  null, string sortBy =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.MZDB.EntityContainerCollection> response;
-			var client = Mozu.Api.Clients.Platform.Entitylists.EntityContainerClient.GetEntityContainersClient( entityListFullName,  pageSize,  startIndex,  filter,  sortBy,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a collection of entity containers. Each container holds a set of entities per ID. 
+		/// 
 		/// </summary>
-		/// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
+		/// <param name="entityListFullName"></param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.MZDB.EntityContainerCollection"/>
 		/// </returns>
@@ -135,12 +83,12 @@ public virtual Mozu.Api.Contracts.MZDB.EntityContainerCollection GetEntityContai
 		///   var entityContainerCollection = await entitycontainer.GetEntityContainersAsync( entityListFullName,  pageSize,  startIndex,  filter,  sortBy,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.MZDB.EntityContainerCollection> GetEntityContainersAsync(string entityListFullName, int? pageSize =  null, int? startIndex =  null, string filter =  null, string sortBy =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.MZDB.EntityContainerCollection> GetEntityContainersAsync(string entityListFullName, int? pageSize =  null, int? startIndex =  null, string filter =  null, string sortBy =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.MZDB.EntityContainerCollection> response;
 			var client = Mozu.Api.Clients.Platform.Entitylists.EntityContainerClient.GetEntityContainersClient( entityListFullName,  pageSize,  startIndex,  filter,  sortBy,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
diff --git a/Mozu.Api/Resources/Platform/Entitylists/EntityResource.cs b/Mozu.Api/Resources/Platform/Entitylists/EntityResource.cs
old mode 100644
new mode 100755
index 7cfc44d4..ec97cb33
--- a/Mozu.Api/Resources/Platform/Entitylists/EntityResource.cs
+++ b/Mozu.Api/Resources/Platform/Entitylists/EntityResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Platform.Entitylists
 {
 	/// <summary>
-	/// Entities are JSON entries within the MZDB ( Mongo DB) for handling large data sets to heavily filter (&gt;2,000 items). Each entity is associated to an EntityList with schema, rules, and formatting for storing the content. This content can be accessed via the  API and  Hypr tags.
+	/// 
 	/// </summary>
 	public partial class EntityResource  	{
 		///
@@ -37,38 +38,13 @@ public EntityResource CloneWithApiContext(Action<IApiContext> contextModificatio
 		}
 
 				
-		/// <summary>
-		/// Retrieves an entity with an associated entity list and context level at tenant, master catalog, catalog, or site. 
-		/// </summary>
-		/// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-		/// <param name="id">Unique identifier of the customer segment to retrieve.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// JObject
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var entity = new Entity();
-		///   var json = entity.GetEntity( entityListFullName,  id,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual JObject GetEntity(string entityListFullName, string id, string responseFields =  null)
-		{
-			MozuClient<JObject> response;
-			var client = Mozu.Api.Clients.Platform.Entitylists.EntityClient.GetEntityClient( entityListFullName,  id,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves an entity with an associated entity list and context level at tenant, master catalog, catalog, or site. 
+		/// 
 		/// </summary>
-		/// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-		/// <param name="id">Unique identifier of the customer segment to retrieve.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="entityListFullName"></param>
+		/// <param name="id"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// JObject
 		/// </returns>
@@ -78,54 +54,26 @@ public virtual JObject GetEntity(string entityListFullName, string id, string re
 		///   var json = await entity.GetEntityAsync( entityListFullName,  id,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<JObject> GetEntityAsync(string entityListFullName, string id, string responseFields =  null)
+		public virtual async Task<JObject> GetEntityAsync(string entityListFullName, string id, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<JObject> response;
 			var client = Mozu.Api.Clients.Platform.Entitylists.EntityClient.GetEntityClient( entityListFullName,  id,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves a collection of entities with an associated entity list and context level at tenant, master catalog, catalog, or site. 
-		/// </summary>
-		/// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.MZDB.EntityCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var entity = new Entity();
-		///   var entityCollection = entity.GetEntities( entityListFullName,  pageSize,  startIndex,  filter,  sortBy,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.MZDB.EntityCollection GetEntities(string entityListFullName, int? pageSize =  null, int? startIndex =  null, string filter =  null, string sortBy =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.MZDB.EntityCollection> response;
-			var client = Mozu.Api.Clients.Platform.Entitylists.EntityClient.GetEntitiesClient( entityListFullName,  pageSize,  startIndex,  filter,  sortBy,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a collection of entities with an associated entity list and context level at tenant, master catalog, catalog, or site. 
+		/// 
 		/// </summary>
-		/// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
+		/// <param name="entityListFullName"></param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="sortBy"></param>
+		/// <param name="startIndex"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.MZDB.EntityCollection"/>
 		/// </returns>
@@ -135,48 +83,23 @@ public virtual Mozu.Api.Contracts.MZDB.EntityCollection GetEntities(string entit
 		///   var entityCollection = await entity.GetEntitiesAsync( entityListFullName,  pageSize,  startIndex,  filter,  sortBy,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.MZDB.EntityCollection> GetEntitiesAsync(string entityListFullName, int? pageSize =  null, int? startIndex =  null, string filter =  null, string sortBy =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.MZDB.EntityCollection> GetEntitiesAsync(string entityListFullName, int? pageSize =  null, int? startIndex =  null, string filter =  null, string sortBy =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.MZDB.EntityCollection> response;
 			var client = Mozu.Api.Clients.Platform.Entitylists.EntityClient.GetEntitiesClient( entityListFullName,  pageSize,  startIndex,  filter,  sortBy,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Inserts a new entity per the entered item, the entity list full name, and associated response fields. 
-		/// </summary>
-		/// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="item">JSON code for objects.</param>
-		/// <returns>
-		/// JObject
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var entity = new Entity();
-		///   var json = entity.InsertEntity( item,  entityListFullName,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual JObject InsertEntity(JObject item, string entityListFullName, string responseFields =  null)
-		{
-			MozuClient<JObject> response;
-			var client = Mozu.Api.Clients.Platform.Entitylists.EntityClient.InsertEntityClient( item,  entityListFullName,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Inserts a new entity per the entered item, the entity list full name, and associated response fields. 
+		/// 
 		/// </summary>
-		/// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="item">JSON code for objects.</param>
+		/// <param name="entityListFullName"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="item"></param>
 		/// <returns>
 		/// JObject
 		/// </returns>
@@ -186,50 +109,24 @@ public virtual JObject InsertEntity(JObject item, string entityListFullName, str
 		///   var json = await entity.InsertEntityAsync( item,  entityListFullName,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<JObject> InsertEntityAsync(JObject item, string entityListFullName, string responseFields =  null)
+		public virtual async Task<JObject> InsertEntityAsync(JObject item, string entityListFullName, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<JObject> response;
 			var client = Mozu.Api.Clients.Platform.Entitylists.EntityClient.InsertEntityClient( item,  entityListFullName,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates the content and associations for an existing entity.
-		/// </summary>
-		/// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-		/// <param name="id">Unique identifier of the customer segment to retrieve.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="item">JSON code for objects.</param>
-		/// <returns>
-		/// JObject
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var entity = new Entity();
-		///   var json = entity.UpdateEntity( item,  entityListFullName,  id,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual JObject UpdateEntity(JObject item, string entityListFullName, string id, string responseFields =  null)
-		{
-			MozuClient<JObject> response;
-			var client = Mozu.Api.Clients.Platform.Entitylists.EntityClient.UpdateEntityClient( item,  entityListFullName,  id,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates the content and associations for an existing entity.
+		/// 
 		/// </summary>
-		/// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-		/// <param name="id">Unique identifier of the customer segment to retrieve.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="item">JSON code for objects.</param>
+		/// <param name="entityListFullName"></param>
+		/// <param name="id"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="item"></param>
 		/// <returns>
 		/// JObject
 		/// </returns>
@@ -239,45 +136,22 @@ public virtual JObject UpdateEntity(JObject item, string entityListFullName, str
 		///   var json = await entity.UpdateEntityAsync( item,  entityListFullName,  id,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<JObject> UpdateEntityAsync(JObject item, string entityListFullName, string id, string responseFields =  null)
+		public virtual async Task<JObject> UpdateEntityAsync(JObject item, string entityListFullName, string id, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<JObject> response;
 			var client = Mozu.Api.Clients.Platform.Entitylists.EntityClient.UpdateEntityClient( item,  entityListFullName,  id,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Deletes an entity depending on the context of tenant, master catalog, catalog, or site level. Entities are associated to an entity list (schema and formatting) for displaying within a namespace and context level.
-		/// </summary>
-		/// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-		/// <param name="id">Unique identifier of the customer segment to retrieve.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var entity = new Entity();
-		///   entity.DeleteEntity( entityListFullName,  id);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteEntity(string entityListFullName, string id)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Platform.Entitylists.EntityClient.DeleteEntityClient( entityListFullName,  id);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes an entity depending on the context of tenant, master catalog, catalog, or site level. Entities are associated to an entity list (schema and formatting) for displaying within a namespace and context level.
+		/// 
 		/// </summary>
-		/// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-		/// <param name="id">Unique identifier of the customer segment to retrieve.</param>
+		/// <param name="entityListFullName"></param>
+		/// <param name="id"></param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -287,12 +161,12 @@ public virtual void DeleteEntity(string entityListFullName, string id)
 		///   await entity.DeleteEntityAsync( entityListFullName,  id);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteEntityAsync(string entityListFullName, string id)
+		public virtual async Task DeleteEntityAsync(string entityListFullName, string id, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Platform.Entitylists.EntityClient.DeleteEntityClient( entityListFullName,  id);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Platform/Entitylists/ListViewResource.cs b/Mozu.Api/Resources/Platform/Entitylists/ListViewResource.cs
old mode 100644
new mode 100755
index 6933edb5..5346e219
--- a/Mozu.Api/Resources/Platform/Entitylists/ListViewResource.cs
+++ b/Mozu.Api/Resources/Platform/Entitylists/ListViewResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Platform.Entitylists
 {
 	/// <summary>
-	/// Provides settings and options for displaying associated content within a context level of site, tenant, catalog, or master catalog. ListViews can be associated with entity lists and entities.
+	/// 
 	/// </summary>
 	public partial class ListViewResource  	{
 		///
@@ -37,40 +38,14 @@ public ListViewResource CloneWithApiContext(Action<IApiContext> contextModificat
 		}
 
 				
-		/// <summary>
-		/// Retrieves a view for associated entities. A view provides display context levels (site, tenant, catalog, master catalog) and settings.
-		/// </summary>
-		/// <param name="entityId">Unique identifier for an entity, which defines the schema, rules, and formats for JSON entities within the MZDB ( Mongo DB).</param>
-		/// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="viewName">The name for a view. Views are used to render data in , such as document and entity lists. Each view includes a schema, format, name, ID, and associated data types to render.</param>
-		/// <returns>
-		/// JObject
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var listview = new ListView();
-		///   var json = listview.GetViewEntity( entityListFullName,  viewName,  entityId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual JObject GetViewEntity(string entityListFullName, string viewName, string entityId, string responseFields =  null)
-		{
-			MozuClient<JObject> response;
-			var client = Mozu.Api.Clients.Platform.Entitylists.ListViewClient.GetViewEntityClient( entityListFullName,  viewName,  entityId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a view for associated entities. A view provides display context levels (site, tenant, catalog, master catalog) and settings.
+		/// 
 		/// </summary>
-		/// <param name="entityId">Unique identifier for an entity, which defines the schema, rules, and formats for JSON entities within the MZDB ( Mongo DB).</param>
-		/// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="viewName">The name for a view. Views are used to render data in , such as document and entity lists. Each view includes a schema, format, name, ID, and associated data types to render.</param>
+		/// <param name="entityId"></param>
+		/// <param name="entityListFullName"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="viewName"></param>
 		/// <returns>
 		/// JObject
 		/// </returns>
@@ -80,54 +55,26 @@ public virtual JObject GetViewEntity(string entityListFullName, string viewName,
 		///   var json = await listview.GetViewEntityAsync( entityListFullName,  viewName,  entityId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<JObject> GetViewEntityAsync(string entityListFullName, string viewName, string entityId, string responseFields =  null)
+		public virtual async Task<JObject> GetViewEntityAsync(string entityListFullName, string viewName, string entityId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<JObject> response;
 			var client = Mozu.Api.Clients.Platform.Entitylists.ListViewClient.GetViewEntityClient( entityListFullName,  viewName,  entityId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves a collection of views for associated entities. Each view provides display context levels (site, tenant, catalog, master catalog) and settings.
-		/// </summary>
-		/// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
-		/// <param name="viewName">The name for a view. Views are used to render data in , such as document and entity lists. Each view includes a schema, format, name, ID, and associated data types to render.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.MZDB.EntityCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var listview = new ListView();
-		///   var entityCollection = listview.GetViewEntities( entityListFullName,  viewName,  pageSize,  startIndex,  filter,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.MZDB.EntityCollection GetViewEntities(string entityListFullName, string viewName, int? pageSize =  null, int? startIndex =  null, string filter =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.MZDB.EntityCollection> response;
-			var client = Mozu.Api.Clients.Platform.Entitylists.ListViewClient.GetViewEntitiesClient( entityListFullName,  viewName,  pageSize,  startIndex,  filter,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a collection of views for associated entities. Each view provides display context levels (site, tenant, catalog, master catalog) and settings.
+		/// 
 		/// </summary>
-		/// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
-		/// <param name="viewName">The name for a view. Views are used to render data in , such as document and entity lists. Each view includes a schema, format, name, ID, and associated data types to render.</param>
+		/// <param name="entityListFullName"></param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="startIndex"></param>
+		/// <param name="viewName"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.MZDB.EntityCollection"/>
 		/// </returns>
@@ -137,50 +84,24 @@ public virtual Mozu.Api.Contracts.MZDB.EntityCollection GetViewEntities(string e
 		///   var entityCollection = await listview.GetViewEntitiesAsync( entityListFullName,  viewName,  pageSize,  startIndex,  filter,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.MZDB.EntityCollection> GetViewEntitiesAsync(string entityListFullName, string viewName, int? pageSize =  null, int? startIndex =  null, string filter =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.MZDB.EntityCollection> GetViewEntitiesAsync(string entityListFullName, string viewName, int? pageSize =  null, int? startIndex =  null, string filter =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.MZDB.EntityCollection> response;
 			var client = Mozu.Api.Clients.Platform.Entitylists.ListViewClient.GetViewEntitiesClient( entityListFullName,  viewName,  pageSize,  startIndex,  filter,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves a collection of container data for creating and displaying a view of entities. 
-		/// </summary>
-		/// <param name="entityId">Unique identifier for an entity, which defines the schema, rules, and formats for JSON entities within the MZDB ( Mongo DB).</param>
-		/// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="viewName">The name for a view. Views are used to render data in , such as document and entity lists. Each view includes a schema, format, name, ID, and associated data types to render.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.MZDB.EntityContainer"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var listview = new ListView();
-		///   var entityContainer = listview.GetViewEntityContainer( entityListFullName,  viewName,  entityId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.MZDB.EntityContainer GetViewEntityContainer(string entityListFullName, string viewName, string entityId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.MZDB.EntityContainer> response;
-			var client = Mozu.Api.Clients.Platform.Entitylists.ListViewClient.GetViewEntityContainerClient( entityListFullName,  viewName,  entityId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a collection of container data for creating and displaying a view of entities. 
+		/// 
 		/// </summary>
-		/// <param name="entityId">Unique identifier for an entity, which defines the schema, rules, and formats for JSON entities within the MZDB ( Mongo DB).</param>
-		/// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="viewName">The name for a view. Views are used to render data in , such as document and entity lists. Each view includes a schema, format, name, ID, and associated data types to render.</param>
+		/// <param name="entityId"></param>
+		/// <param name="entityListFullName"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="viewName"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.MZDB.EntityContainer"/>
 		/// </returns>
@@ -190,54 +111,26 @@ public virtual Mozu.Api.Contracts.MZDB.EntityContainer GetViewEntityContainer(st
 		///   var entityContainer = await listview.GetViewEntityContainerAsync( entityListFullName,  viewName,  entityId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.MZDB.EntityContainer> GetViewEntityContainerAsync(string entityListFullName, string viewName, string entityId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.MZDB.EntityContainer> GetViewEntityContainerAsync(string entityListFullName, string viewName, string entityId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.MZDB.EntityContainer> response;
 			var client = Mozu.Api.Clients.Platform.Entitylists.ListViewClient.GetViewEntityContainerClient( entityListFullName,  viewName,  entityId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves a collection of container data for creating and displaying a view of entities. 
-		/// </summary>
-		/// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
-		/// <param name="viewName">The name for a view. Views are used to render data in , such as document and entity lists. Each view includes a schema, format, name, ID, and associated data types to render.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.MZDB.EntityContainerCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var listview = new ListView();
-		///   var entityContainerCollection = listview.GetViewEntityContainers( entityListFullName,  viewName,  pageSize,  startIndex,  filter,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.MZDB.EntityContainerCollection GetViewEntityContainers(string entityListFullName, string viewName, int? pageSize =  null, int? startIndex =  null, string filter =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.MZDB.EntityContainerCollection> response;
-			var client = Mozu.Api.Clients.Platform.Entitylists.ListViewClient.GetViewEntityContainersClient( entityListFullName,  viewName,  pageSize,  startIndex,  filter,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a collection of container data for creating and displaying a view of entities. 
+		/// 
 		/// </summary>
-		/// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
-		/// <param name="viewName">The name for a view. Views are used to render data in , such as document and entity lists. Each view includes a schema, format, name, ID, and associated data types to render.</param>
+		/// <param name="entityListFullName"></param>
+		/// <param name="filter"></param>
+		/// <param name="pageSize"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="startIndex"></param>
+		/// <param name="viewName"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.MZDB.EntityContainerCollection"/>
 		/// </returns>
@@ -247,48 +140,23 @@ public virtual Mozu.Api.Contracts.MZDB.EntityContainerCollection GetViewEntityCo
 		///   var entityContainerCollection = await listview.GetViewEntityContainersAsync( entityListFullName,  viewName,  pageSize,  startIndex,  filter,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.MZDB.EntityContainerCollection> GetViewEntityContainersAsync(string entityListFullName, string viewName, int? pageSize =  null, int? startIndex =  null, string filter =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.MZDB.EntityContainerCollection> GetViewEntityContainersAsync(string entityListFullName, string viewName, int? pageSize =  null, int? startIndex =  null, string filter =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.MZDB.EntityContainerCollection> response;
 			var client = Mozu.Api.Clients.Platform.Entitylists.ListViewClient.GetViewEntityContainersClient( entityListFullName,  viewName,  pageSize,  startIndex,  filter,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves a specific `EntityListView`. These views provide schema, rules, and formatting for all associated entities. 
-		/// </summary>
-		/// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="viewName">The name for a view. Views are used to render data in , such as document and entity lists. Each view includes a schema, format, name, ID, and associated data types to render.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.MZDB.ListView"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var listview = new ListView();
-		///   var listView = listview.GetEntityListView( entityListFullName,  viewName,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.MZDB.ListView GetEntityListView(string entityListFullName, string viewName, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.MZDB.ListView> response;
-			var client = Mozu.Api.Clients.Platform.Entitylists.ListViewClient.GetEntityListViewClient( entityListFullName,  viewName,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a specific `EntityListView`. These views provide schema, rules, and formatting for all associated entities. 
+		/// 
 		/// </summary>
-		/// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="viewName">The name for a view. Views are used to render data in , such as document and entity lists. Each view includes a schema, format, name, ID, and associated data types to render.</param>
+		/// <param name="entityListFullName"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="viewName"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.MZDB.ListView"/>
 		/// </returns>
@@ -298,46 +166,22 @@ public virtual Mozu.Api.Contracts.MZDB.ListView GetEntityListView(string entityL
 		///   var listView = await listview.GetEntityListViewAsync( entityListFullName,  viewName,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.MZDB.ListView> GetEntityListViewAsync(string entityListFullName, string viewName, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.MZDB.ListView> GetEntityListViewAsync(string entityListFullName, string viewName, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.MZDB.ListView> response;
 			var client = Mozu.Api.Clients.Platform.Entitylists.ListViewClient.GetEntityListViewClient( entityListFullName,  viewName,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves a collection of `EntityListViews`. These views provide schema, rules, and formatting for all associated entities. 
-		/// </summary>
-		/// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.MZDB.ListViewCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var listview = new ListView();
-		///   var listViewCollection = listview.GetEntityListViews( entityListFullName,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.MZDB.ListViewCollection GetEntityListViews(string entityListFullName, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.MZDB.ListViewCollection> response;
-			var client = Mozu.Api.Clients.Platform.Entitylists.ListViewClient.GetEntityListViewsClient( entityListFullName,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a collection of `EntityListViews`. These views provide schema, rules, and formatting for all associated entities. 
+		/// 
 		/// </summary>
-		/// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="entityListFullName"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.MZDB.ListViewCollection"/>
 		/// </returns>
@@ -347,48 +191,23 @@ public virtual Mozu.Api.Contracts.MZDB.ListViewCollection GetEntityListViews(str
 		///   var listViewCollection = await listview.GetEntityListViewsAsync( entityListFullName,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.MZDB.ListViewCollection> GetEntityListViewsAsync(string entityListFullName, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.MZDB.ListViewCollection> GetEntityListViewsAsync(string entityListFullName, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.MZDB.ListViewCollection> response;
 			var client = Mozu.Api.Clients.Platform.Entitylists.ListViewClient.GetEntityListViewsClient( entityListFullName,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Creates an entity list view. Each view provides display context levels (site, tenant, catalog, master catalog) and settings for the list of entities.
-		/// </summary>
-		/// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="listView">Properties for the list view that specifies what fields and content display per page load. All associated fields in the list view correspond with object data.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.MZDB.ListView"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var listview = new ListView();
-		///   var listView = listview.CreateEntityListView( listView,  entityListFullName,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.MZDB.ListView CreateEntityListView(Mozu.Api.Contracts.MZDB.ListView listView, string entityListFullName, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.MZDB.ListView> response;
-			var client = Mozu.Api.Clients.Platform.Entitylists.ListViewClient.CreateEntityListViewClient( listView,  entityListFullName,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Creates an entity list view. Each view provides display context levels (site, tenant, catalog, master catalog) and settings for the list of entities.
+		/// 
 		/// </summary>
-		/// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="listView">Properties for the list view that specifies what fields and content display per page load. All associated fields in the list view correspond with object data.</param>
+		/// <param name="entityListFullName"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="listView"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.MZDB.ListView"/>
 		/// </returns>
@@ -398,50 +217,24 @@ public virtual Mozu.Api.Contracts.MZDB.ListView CreateEntityListView(Mozu.Api.Co
 		///   var listView = await listview.CreateEntityListViewAsync( listView,  entityListFullName,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.MZDB.ListView> CreateEntityListViewAsync(Mozu.Api.Contracts.MZDB.ListView listView, string entityListFullName, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.MZDB.ListView> CreateEntityListViewAsync(Mozu.Api.Contracts.MZDB.ListView listView, string entityListFullName, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.MZDB.ListView> response;
 			var client = Mozu.Api.Clients.Platform.Entitylists.ListViewClient.CreateEntityListViewClient( listView,  entityListFullName,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates an existing entity list view. Each view provides display context levels (site, tenant, catalog, master catalog) and settings for the list of entities.
-		/// </summary>
-		/// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="viewName">The name for a view. Views are used to render data in , such as document and entity lists. Each view includes a schema, format, name, ID, and associated data types to render.</param>
-		/// <param name="listView">Properties for the list view that specifies what fields and content display per page load. All associated fields in the list view correspond with object data.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.MZDB.ListView"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var listview = new ListView();
-		///   var listView = listview.UpdateEntityListView( listView,  entityListFullName,  viewName,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.MZDB.ListView UpdateEntityListView(Mozu.Api.Contracts.MZDB.ListView listView, string entityListFullName, string viewName, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.MZDB.ListView> response;
-			var client = Mozu.Api.Clients.Platform.Entitylists.ListViewClient.UpdateEntityListViewClient( listView,  entityListFullName,  viewName,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates an existing entity list view. Each view provides display context levels (site, tenant, catalog, master catalog) and settings for the list of entities.
+		/// 
 		/// </summary>
-		/// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="viewName">The name for a view. Views are used to render data in , such as document and entity lists. Each view includes a schema, format, name, ID, and associated data types to render.</param>
-		/// <param name="listView">Properties for the list view that specifies what fields and content display per page load. All associated fields in the list view correspond with object data.</param>
+		/// <param name="entityListFullName"></param>
+		/// <param name="responseFields"></param>
+		/// <param name="viewName"></param>
+		/// <param name="listView"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.MZDB.ListView"/>
 		/// </returns>
@@ -451,45 +244,22 @@ public virtual Mozu.Api.Contracts.MZDB.ListView UpdateEntityListView(Mozu.Api.Co
 		///   var listView = await listview.UpdateEntityListViewAsync( listView,  entityListFullName,  viewName,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.MZDB.ListView> UpdateEntityListViewAsync(Mozu.Api.Contracts.MZDB.ListView listView, string entityListFullName, string viewName, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.MZDB.ListView> UpdateEntityListViewAsync(Mozu.Api.Contracts.MZDB.ListView listView, string entityListFullName, string viewName, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.MZDB.ListView> response;
 			var client = Mozu.Api.Clients.Platform.Entitylists.ListViewClient.UpdateEntityListViewClient( listView,  entityListFullName,  viewName,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Deletes an entity list view. Any associated entities have the association removed.
-		/// </summary>
-		/// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-		/// <param name="viewName">The name for a view. Views are used to render data in , such as document and entity lists. Each view includes a schema, format, name, ID, and associated data types to render.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var listview = new ListView();
-		///   listview.DeleteEntityListView( entityListFullName,  viewName);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteEntityListView(string entityListFullName, string viewName)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Platform.Entitylists.ListViewClient.DeleteEntityListViewClient( entityListFullName,  viewName);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Deletes an entity list view. Any associated entities have the association removed.
+		/// 
 		/// </summary>
-		/// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-		/// <param name="viewName">The name for a view. Views are used to render data in , such as document and entity lists. Each view includes a schema, format, name, ID, and associated data types to render.</param>
+		/// <param name="entityListFullName"></param>
+		/// <param name="viewName"></param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -499,12 +269,12 @@ public virtual void DeleteEntityListView(string entityListFullName, string viewN
 		///   await listview.DeleteEntityListViewAsync( entityListFullName,  viewName);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteEntityListViewAsync(string entityListFullName, string viewName)
+		public virtual async Task DeleteEntityListViewAsync(string entityListFullName, string viewName, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Platform.Entitylists.ListViewClient.DeleteEntityListViewClient( entityListFullName,  viewName);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Platform/Extensions/CredentialStoreEntryResource.cs b/Mozu.Api/Resources/Platform/Extensions/CredentialStoreEntryResource.cs
old mode 100644
new mode 100755
index a1b399f0..66ab42db
--- a/Mozu.Api/Resources/Platform/Extensions/CredentialStoreEntryResource.cs
+++ b/Mozu.Api/Resources/Platform/Extensions/CredentialStoreEntryResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Platform.Extensions
 {
 	/// <summary>
-	/// The CredentialStore resource allows you to encrypt and store sensitive data on your tenant. You can then decrypt and access that data using an Arc.js application, as described in the Arc.js [Programming Patterns](https://www.mozu.com/docs/developer/arcjs-guides/programming-patterns.htm#securely_store_and_access_sensitive_data) topic.
+	/// 
 	/// </summary>
 	public partial class CredentialStoreEntryResource  	{
 		///
@@ -37,31 +38,9 @@ public CredentialStoreEntryResource CloneWithApiContext(Action<IApiContext> cont
 		}
 
 				
-		/// <summary>
-		/// Encrypts and stores data contained in the  JSON object. You can decrypt and access the secured data using an Arc.js application, as described in the Arc.js [Programming Patterns](https://www.mozu.com/docs/developer/arcjs-guides/programming-patterns.htm#securely_store_and_access_sensitive_data) topic.
-		/// </summary>
-		/// <param name="credentials"></param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var credentialstoreentry = new CredentialStoreEntry();
-		///   credentialstoreentry.StoreCredentials( credentials);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void StoreCredentials(Mozu.Api.Contracts.InstalledApplications.CredentialStoreEntry credentials)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Platform.Extensions.CredentialStoreEntryClient.StoreCredentialsClient( credentials);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Encrypts and stores data contained in the  JSON object. You can decrypt and access the secured data using an Arc.js application, as described in the Arc.js [Programming Patterns](https://www.mozu.com/docs/developer/arcjs-guides/programming-patterns.htm#securely_store_and_access_sensitive_data) topic.
+		/// 
 		/// </summary>
 		/// <param name="credentials"></param>
 		/// <returns>
@@ -73,12 +52,12 @@ public virtual void StoreCredentials(Mozu.Api.Contracts.InstalledApplications.Cr
 		///   await credentialstoreentry.StoreCredentialsAsync( credentials);
 		/// </code>
 		/// </example>
-		public virtual async Task StoreCredentialsAsync(Mozu.Api.Contracts.InstalledApplications.CredentialStoreEntry credentials)
+		public virtual async Task StoreCredentialsAsync(Mozu.Api.Contracts.InstalledApplications.CredentialStoreEntry credentials, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Platform.Extensions.CredentialStoreEntryClient.StoreCredentialsClient( credentials);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Platform/InstalledApplicationsResource.cs b/Mozu.Api/Resources/Platform/InstalledApplicationsResource.cs
new file mode 100755
index 00000000..e51e7ba7
--- /dev/null
+++ b/Mozu.Api/Resources/Platform/InstalledApplicationsResource.cs
@@ -0,0 +1,97 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using Mozu.Api.Security;
+using System.Threading.Tasks;
+using Newtonsoft.Json.Linq;
+using System.Threading;
+
+namespace Mozu.Api.Resources.Platform
+{
+	/// <summary>
+	/// Use the Applications resource to update and retrieve details about the applications installed for your tenant.
+	/// </summary>
+	public partial class InstalledApplicationsResource  	{
+		///
+		/// <see cref="Mozu.Api.ApiContext"/>
+		///
+		private readonly IApiContext _apiContext;
+
+		
+		public InstalledApplicationsResource(IApiContext apiContext) 
+		{
+			_apiContext = apiContext;
+		}
+
+		public InstalledApplicationsResource CloneWithApiContext(Action<IApiContext> contextModification) 
+		{
+			return new InstalledApplicationsResource(_apiContext.CloneWith(contextModification));
+		}
+
+				
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="appId">The application ID that represents the application to retrieve.</param>
+		/// <param name="responseFields"></param>
+		/// <returns>
+		/// <see cref="Mozu.Api.Contracts.InstalledApplications.Application"/>
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var installedapplications = new InstalledApplications();
+		///   var application = await installedapplications.GetApplicationAsync( appId,  responseFields);
+		/// </code>
+		/// </example>
+		public virtual async Task<Mozu.Api.Contracts.InstalledApplications.Application> GetApplicationAsync(string appId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
+		{
+			MozuClient<Mozu.Api.Contracts.InstalledApplications.Application> response;
+			var client = Mozu.Api.Clients.Platform.InstalledApplicationsClient.GetApplicationClient( appId,  responseFields);
+			client.WithContext(_apiContext);
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+			return await response.ResultAsync();
+
+		}
+
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="appId">The application ID that represents the application to update.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="application">Properties of the application to update.</param>
+		/// <returns>
+		/// <see cref="Mozu.Api.Contracts.InstalledApplications.Application"/>
+		/// </returns>
+		/// <example>
+		/// <code>
+		///   var installedapplications = new InstalledApplications();
+		///   var application = await installedapplications.UpdateApplicationAsync( application,  appId,  responseFields);
+		/// </code>
+		/// </example>
+		public virtual async Task<Mozu.Api.Contracts.InstalledApplications.Application> UpdateApplicationAsync(Mozu.Api.Contracts.InstalledApplications.Application application, string appId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
+		{
+			MozuClient<Mozu.Api.Contracts.InstalledApplications.Application> response;
+			var client = Mozu.Api.Clients.Platform.InstalledApplicationsClient.UpdateApplicationClient( application,  appId,  responseFields);
+			client.WithContext(_apiContext);
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
+			return await response.ResultAsync();
+
+		}
+
+
+	}
+
+}
+
+
diff --git a/Mozu.Api/Resources/Platform/ReferenceDataResource.cs b/Mozu.Api/Resources/Platform/ReferenceDataResource.cs
old mode 100644
new mode 100755
index c080eb21..ebf43698
--- a/Mozu.Api/Resources/Platform/ReferenceDataResource.cs
+++ b/Mozu.Api/Resources/Platform/ReferenceDataResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Platform
 {
 	/// <summary>
-	/// The Reference resource retrieves collections of standards the  system currently supports. This includes content locales, top-level domains, units of measure, countries, currencies, time zones, and shipping or billing address schemas.
+	/// The Reference resource retrieves collections of standards the Mozu system currently supports. This includes content locales, top-level domains, units of measure, countries, currencies, time zones, and shipping or billing address schemas.
 	/// </summary>
 	public partial class ReferenceDataResource  	{
 		///
@@ -41,36 +42,12 @@ public ReferenceDataResource CloneWithApiContext(Action<IApiContext> contextModi
 		}
 
 				
-		/// <summary>
-		/// Retrieves a specific address schema based on the country code provided. This operation allows the creation of custom shipping and billing address fields.
-		/// </summary>
-		/// <param name="countryCode">The 2-letter geographic code representing the country for the physical or mailing address. Currently limited to the US.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Reference.AddressSchema"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var referencedata = new ReferenceData();
-		///   var addressSchema = referencedata.GetAddressSchema( countryCode,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Reference.AddressSchema GetAddressSchema(string countryCode =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Reference.AddressSchema> response;
-			var client = Mozu.Api.Clients.Platform.ReferenceDataClient.GetAddressSchemaClient( countryCode,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a specific address schema based on the country code provided. This operation allows the creation of custom shipping and billing address fields.
+		/// 
 		/// </summary>
-		/// <param name="countryCode">The 2-letter geographic code representing the country for the physical or mailing address. Currently limited to the US.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="countryCode">The 2-letter country code used to retrieve a specified address schema.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Reference.AddressSchema"/>
 		/// </returns>
@@ -80,44 +57,21 @@ public virtual Mozu.Api.Contracts.Reference.AddressSchema GetAddressSchema(strin
 		///   var addressSchema = await referencedata.GetAddressSchemaAsync( countryCode,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Reference.AddressSchema> GetAddressSchemaAsync(string countryCode =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Reference.AddressSchema> GetAddressSchemaAsync(string countryCode =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Reference.AddressSchema> response;
 			var client = Mozu.Api.Clients.Platform.ReferenceDataClient.GetAddressSchemaClient( countryCode,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the entire list of address schemas that the system supports.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Reference.AddressSchemaCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var referencedata = new ReferenceData();
-		///   var addressSchemaCollection = referencedata.GetAddressSchemas( responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Reference.AddressSchemaCollection GetAddressSchemas(string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Reference.AddressSchemaCollection> response;
-			var client = Mozu.Api.Clients.Platform.ReferenceDataClient.GetAddressSchemasClient( responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the entire list of address schemas that the system supports.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Reference.AddressSchemaCollection"/>
 		/// </returns>
@@ -127,46 +81,22 @@ public virtual Mozu.Api.Contracts.Reference.AddressSchemaCollection GetAddressSc
 		///   var addressSchemaCollection = await referencedata.GetAddressSchemasAsync( responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Reference.AddressSchemaCollection> GetAddressSchemasAsync(string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Reference.AddressSchemaCollection> GetAddressSchemasAsync(string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Reference.AddressSchemaCollection> response;
 			var client = Mozu.Api.Clients.Platform.ReferenceDataClient.GetAddressSchemasClient( responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the details of a behavior based on the behavior ID specified in the request.
-		/// </summary>
-		/// <param name="behaviorId">Unique identifier of the behavior.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Core.Behavior"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var referencedata = new ReferenceData();
-		///   var behavior = referencedata.GetBehavior( behaviorId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Core.Behavior GetBehavior(int behaviorId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Core.Behavior> response;
-			var client = Mozu.Api.Clients.Platform.ReferenceDataClient.GetBehaviorClient( behaviorId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of a behavior based on the behavior ID specified in the request.
+		/// 
 		/// </summary>
 		/// <param name="behaviorId">Unique identifier of the behavior.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Core.Behavior"/>
 		/// </returns>
@@ -176,46 +106,22 @@ public virtual Mozu.Api.Contracts.Core.Behavior GetBehavior(int behaviorId, stri
 		///   var behavior = await referencedata.GetBehaviorAsync( behaviorId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Core.Behavior> GetBehaviorAsync(int behaviorId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Core.Behavior> GetBehaviorAsync(int behaviorId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Core.Behavior> response;
 			var client = Mozu.Api.Clients.Platform.ReferenceDataClient.GetBehaviorClient( behaviorId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the details of the behavior category specified in the request.
-		/// </summary>
-		/// <param name="categoryId">Unique identifier of the category to modify.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Core.BehaviorCategory"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var referencedata = new ReferenceData();
-		///   var behaviorCategory = referencedata.GetBehaviorCategory( categoryId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Core.BehaviorCategory GetBehaviorCategory(int categoryId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Core.BehaviorCategory> response;
-			var client = Mozu.Api.Clients.Platform.ReferenceDataClient.GetBehaviorCategoryClient( categoryId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the details of the behavior category specified in the request.
+		/// 
 		/// </summary>
-		/// <param name="categoryId">Unique identifier of the category to modify.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="categoryId">Unique identifier of the behavior category.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Core.BehaviorCategory"/>
 		/// </returns>
@@ -225,44 +131,21 @@ public virtual Mozu.Api.Contracts.Core.BehaviorCategory GetBehaviorCategory(int
 		///   var behaviorCategory = await referencedata.GetBehaviorCategoryAsync( categoryId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Core.BehaviorCategory> GetBehaviorCategoryAsync(int categoryId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Core.BehaviorCategory> GetBehaviorCategoryAsync(int categoryId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Core.BehaviorCategory> response;
 			var client = Mozu.Api.Clients.Platform.ReferenceDataClient.GetBehaviorCategoryClient( categoryId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the list of behavior categories.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Core.BehaviorCategoryCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var referencedata = new ReferenceData();
-		///   var behaviorCategoryCollection = referencedata.GetBehaviorCategories( responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Core.BehaviorCategoryCollection GetBehaviorCategories(string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Core.BehaviorCategoryCollection> response;
-			var client = Mozu.Api.Clients.Platform.ReferenceDataClient.GetBehaviorCategoriesClient( responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the list of behavior categories.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Core.BehaviorCategoryCollection"/>
 		/// </returns>
@@ -272,45 +155,21 @@ public virtual Mozu.Api.Contracts.Core.BehaviorCategoryCollection GetBehaviorCat
 		///   var behaviorCategoryCollection = await referencedata.GetBehaviorCategoriesAsync( responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Core.BehaviorCategoryCollection> GetBehaviorCategoriesAsync(string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Core.BehaviorCategoryCollection> GetBehaviorCategoriesAsync(string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Core.BehaviorCategoryCollection> response;
 			var client = Mozu.Api.Clients.Platform.ReferenceDataClient.GetBehaviorCategoriesClient( responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves a list of application behaviors.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="userType">The user type associated with the behaviors to retrieve.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Core.BehaviorCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var referencedata = new ReferenceData();
-		///   var behaviorCollection = referencedata.GetBehaviors( userType,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Core.BehaviorCollection GetBehaviors(string userType =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Core.BehaviorCollection> response;
-			var client = Mozu.Api.Clients.Platform.ReferenceDataClient.GetBehaviorsClient( userType,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves a list of application behaviors.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <param name="userType">The user type associated with the behaviors to retrieve.</param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Core.BehaviorCollection"/>
@@ -321,44 +180,21 @@ public virtual Mozu.Api.Contracts.Core.BehaviorCollection GetBehaviors(string us
 		///   var behaviorCollection = await referencedata.GetBehaviorsAsync( userType,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Core.BehaviorCollection> GetBehaviorsAsync(string userType =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Core.BehaviorCollection> GetBehaviorsAsync(string userType =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Core.BehaviorCollection> response;
 			var client = Mozu.Api.Clients.Platform.ReferenceDataClient.GetBehaviorsClient( userType,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the list of content locales the system supports. Content locales indicate the language used and the country where the language is used.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Reference.ContentLocaleCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var referencedata = new ReferenceData();
-		///   var contentLocaleCollection = referencedata.GetContentLocales( responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Reference.ContentLocaleCollection GetContentLocales(string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Reference.ContentLocaleCollection> response;
-			var client = Mozu.Api.Clients.Platform.ReferenceDataClient.GetContentLocalesClient( responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the list of content locales the system supports. Content locales indicate the language used and the country where the language is used.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Reference.ContentLocaleCollection"/>
 		/// </returns>
@@ -368,44 +204,21 @@ public virtual Mozu.Api.Contracts.Reference.ContentLocaleCollection GetContentLo
 		///   var contentLocaleCollection = await referencedata.GetContentLocalesAsync( responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Reference.ContentLocaleCollection> GetContentLocalesAsync(string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Reference.ContentLocaleCollection> GetContentLocalesAsync(string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Reference.ContentLocaleCollection> response;
 			var client = Mozu.Api.Clients.Platform.ReferenceDataClient.GetContentLocalesClient( responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the entire list of countries that the system supports.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Reference.CountryCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var referencedata = new ReferenceData();
-		///   var countryCollection = referencedata.GetCountries( responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Reference.CountryCollection GetCountries(string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Reference.CountryCollection> response;
-			var client = Mozu.Api.Clients.Platform.ReferenceDataClient.GetCountriesClient( responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the entire list of countries that the system supports.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Reference.CountryCollection"/>
 		/// </returns>
@@ -415,44 +228,21 @@ public virtual Mozu.Api.Contracts.Reference.CountryCollection GetCountries(strin
 		///   var countryCollection = await referencedata.GetCountriesAsync( responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Reference.CountryCollection> GetCountriesAsync(string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Reference.CountryCollection> GetCountriesAsync(string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Reference.CountryCollection> response;
 			var client = Mozu.Api.Clients.Platform.ReferenceDataClient.GetCountriesClient( responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the entire list of countries that the system supports.
-		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Reference.CountryWithStatesCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var referencedata = new ReferenceData();
-		///   var countryWithStatesCollection = referencedata.GetCountriesWithStates( responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Reference.CountryWithStatesCollection GetCountriesWithStates(string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Reference.CountryWithStatesCollection> response;
-			var client = Mozu.Api.Clients.Platform.ReferenceDataClient.GetCountriesWithStatesClient( responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the entire list of countries that the system supports.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Reference.CountryWithStatesCollection"/>
 		/// </returns>
@@ -462,44 +252,21 @@ public virtual Mozu.Api.Contracts.Reference.CountryWithStatesCollection GetCount
 		///   var countryWithStatesCollection = await referencedata.GetCountriesWithStatesAsync( responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Reference.CountryWithStatesCollection> GetCountriesWithStatesAsync(string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Reference.CountryWithStatesCollection> GetCountriesWithStatesAsync(string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Reference.CountryWithStatesCollection> response;
 			var client = Mozu.Api.Clients.Platform.ReferenceDataClient.GetCountriesWithStatesClient( responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the entire list of currencies that the system supports.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Reference.CurrencyCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var referencedata = new ReferenceData();
-		///   var currencyCollection = referencedata.GetCurrencies( responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Reference.CurrencyCollection GetCurrencies(string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Reference.CurrencyCollection> response;
-			var client = Mozu.Api.Clients.Platform.ReferenceDataClient.GetCurrenciesClient( responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the entire list of currencies that the system supports.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Reference.CurrencyCollection"/>
 		/// </returns>
@@ -509,44 +276,21 @@ public virtual Mozu.Api.Contracts.Reference.CurrencyCollection GetCurrencies(str
 		///   var currencyCollection = await referencedata.GetCurrenciesAsync( responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Reference.CurrencyCollection> GetCurrenciesAsync(string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Reference.CurrencyCollection> GetCurrenciesAsync(string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Reference.CurrencyCollection> response;
 			var client = Mozu.Api.Clients.Platform.ReferenceDataClient.GetCurrenciesClient( responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the entire list of time zones that the system supports.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Reference.TimeZoneCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var referencedata = new ReferenceData();
-		///   var timeZoneCollection = referencedata.GetTimeZones( responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Reference.TimeZoneCollection GetTimeZones(string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Reference.TimeZoneCollection> response;
-			var client = Mozu.Api.Clients.Platform.ReferenceDataClient.GetTimeZonesClient( responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the entire list of time zones that the system supports.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Reference.TimeZoneCollection"/>
 		/// </returns>
@@ -556,44 +300,21 @@ public virtual Mozu.Api.Contracts.Reference.TimeZoneCollection GetTimeZones(stri
 		///   var timeZoneCollection = await referencedata.GetTimeZonesAsync( responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Reference.TimeZoneCollection> GetTimeZonesAsync(string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Reference.TimeZoneCollection> GetTimeZonesAsync(string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Reference.TimeZoneCollection> response;
 			var client = Mozu.Api.Clients.Platform.ReferenceDataClient.GetTimeZonesClient( responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves the entire list of top-level internet domains that the system supports.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Reference.TopLevelDomainCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var referencedata = new ReferenceData();
-		///   var topLevelDomainCollection = referencedata.GetTopLevelDomains( responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Reference.TopLevelDomainCollection GetTopLevelDomains(string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Reference.TopLevelDomainCollection> response;
-			var client = Mozu.Api.Clients.Platform.ReferenceDataClient.GetTopLevelDomainsClient( responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the entire list of top-level internet domains that the system supports.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Reference.TopLevelDomainCollection"/>
 		/// </returns>
@@ -603,46 +324,22 @@ public virtual Mozu.Api.Contracts.Reference.TopLevelDomainCollection GetTopLevel
 		///   var topLevelDomainCollection = await referencedata.GetTopLevelDomainsAsync( responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Reference.TopLevelDomainCollection> GetTopLevelDomainsAsync(string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Reference.TopLevelDomainCollection> GetTopLevelDomainsAsync(string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Reference.TopLevelDomainCollection> response;
 			var client = Mozu.Api.Clients.Platform.ReferenceDataClient.GetTopLevelDomainsClient( responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Retrieves an array list of all units of measure the system supports.
-		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Reference.UnitOfMeasureCollection"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var referencedata = new ReferenceData();
-		///   var unitOfMeasureCollection = referencedata.GetUnitsOfMeasure( filter,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Reference.UnitOfMeasureCollection GetUnitsOfMeasure(string filter =  null, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Reference.UnitOfMeasureCollection> response;
-			var client = Mozu.Api.Clients.Platform.ReferenceDataClient.GetUnitsOfMeasureClient( filter,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves an array list of all units of measure the system supports.
+		/// 
 		/// </summary>
-		/// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="filter"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Reference.UnitOfMeasureCollection"/>
 		/// </returns>
@@ -652,12 +349,12 @@ public virtual Mozu.Api.Contracts.Reference.UnitOfMeasureCollection GetUnitsOfMe
 		///   var unitOfMeasureCollection = await referencedata.GetUnitsOfMeasureAsync( filter,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Reference.UnitOfMeasureCollection> GetUnitsOfMeasureAsync(string filter =  null, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Reference.UnitOfMeasureCollection> GetUnitsOfMeasureAsync(string filter =  null, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Reference.UnitOfMeasureCollection> response;
 			var client = Mozu.Api.Clients.Platform.ReferenceDataClient.GetUnitsOfMeasureClient( filter,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
diff --git a/Mozu.Api/Resources/Platform/SecureAppDataResource.cs b/Mozu.Api/Resources/Platform/SecureAppDataResource.cs
old mode 100644
new mode 100755
index 7295f6c4..9132a1a1
--- a/Mozu.Api/Resources/Platform/SecureAppDataResource.cs
+++ b/Mozu.Api/Resources/Platform/SecureAppDataResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Platform
 {
 	/// <summary>
-	/// Manage Secure App Settings. Expose via arc.js so that arc apps can securely access secrets. Third-party extensions can also access their data. Secured via AppKey.AppId
+	/// 
 	/// </summary>
 	public partial class SecureAppDataResource  	{
 		///
@@ -37,38 +38,13 @@ public SecureAppDataResource CloneWithApiContext(Action<IApiContext> contextModi
 		}
 
 				
-		/// <summary>
-		/// platform-secureappdata Get GetDBValue description DOCUMENT_HERE 
-		/// </summary>
-		/// <param name="appKeyId"></param>
-		/// <param name="dbEntryQuery">The database entry string to create.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <returns>
-		/// JObject
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var secureappdata = new SecureAppData();
-		///   var json = secureappdata.GetDBValue( appKeyId,  dbEntryQuery,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual JObject GetDBValue(string appKeyId, string dbEntryQuery, string responseFields =  null)
-		{
-			MozuClient<JObject> response;
-			var client = Mozu.Api.Clients.Platform.SecureAppDataClient.GetDBValueClient( appKeyId,  dbEntryQuery,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// platform-secureappdata Get GetDBValue description DOCUMENT_HERE 
+		/// 
 		/// </summary>
 		/// <param name="appKeyId"></param>
-		/// <param name="dbEntryQuery">The database entry string to create.</param>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="dbEntryQuery"></param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// JObject
 		/// </returns>
@@ -78,47 +54,23 @@ public virtual JObject GetDBValue(string appKeyId, string dbEntryQuery, string r
 		///   var json = await secureappdata.GetDBValueAsync( appKeyId,  dbEntryQuery,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<JObject> GetDBValueAsync(string appKeyId, string dbEntryQuery, string responseFields =  null)
+		public virtual async Task<JObject> GetDBValueAsync(string appKeyId, string dbEntryQuery, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<JObject> response;
 			var client = Mozu.Api.Clients.Platform.SecureAppDataClient.GetDBValueClient( appKeyId,  dbEntryQuery,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// platform-secureappdata Post CreateDBValue description DOCUMENT_HERE 
-		/// </summary>
-		/// <param name="appKeyId"></param>
-		/// <param name="dbEntryQuery">The database entry string to create.</param>
-		/// <param name="value">The value string to create.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var secureappdata = new SecureAppData();
-		///   secureappdata.CreateDBValue( value,  appKeyId,  dbEntryQuery);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void CreateDBValue(JObject value, string appKeyId, string dbEntryQuery)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Platform.SecureAppDataClient.CreateDBValueClient( value,  appKeyId,  dbEntryQuery);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// platform-secureappdata Post CreateDBValue description DOCUMENT_HERE 
+		/// 
 		/// </summary>
 		/// <param name="appKeyId"></param>
-		/// <param name="dbEntryQuery">The database entry string to create.</param>
-		/// <param name="value">The value string to create.</param>
+		/// <param name="dbEntryQuery"></param>
+		/// <param name="value"></param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -128,46 +80,22 @@ public virtual void CreateDBValue(JObject value, string appKeyId, string dbEntry
 		///   await secureappdata.CreateDBValueAsync( value,  appKeyId,  dbEntryQuery);
 		/// </code>
 		/// </example>
-		public virtual async Task CreateDBValueAsync(JObject value, string appKeyId, string dbEntryQuery)
+		public virtual async Task CreateDBValueAsync(JObject value, string appKeyId, string dbEntryQuery, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Platform.SecureAppDataClient.CreateDBValueClient( value,  appKeyId,  dbEntryQuery);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
-		/// <summary>
-		/// platform-secureappdata Put UpdateDBValue description DOCUMENT_HERE 
-		/// </summary>
-		/// <param name="appKeyId"></param>
-		/// <param name="dbEntryQuery">The database entry string to create.</param>
-		/// <param name="value">The value string to create.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var secureappdata = new SecureAppData();
-		///   secureappdata.UpdateDBValue( value,  appKeyId,  dbEntryQuery);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void UpdateDBValue(JObject value, string appKeyId, string dbEntryQuery)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Platform.SecureAppDataClient.UpdateDBValueClient( value,  appKeyId,  dbEntryQuery);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// platform-secureappdata Put UpdateDBValue description DOCUMENT_HERE 
+		/// 
 		/// </summary>
 		/// <param name="appKeyId"></param>
-		/// <param name="dbEntryQuery">The database entry string to create.</param>
-		/// <param name="value">The value string to create.</param>
+		/// <param name="dbEntryQuery"></param>
+		/// <param name="value"></param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -177,44 +105,21 @@ public virtual void UpdateDBValue(JObject value, string appKeyId, string dbEntry
 		///   await secureappdata.UpdateDBValueAsync( value,  appKeyId,  dbEntryQuery);
 		/// </code>
 		/// </example>
-		public virtual async Task UpdateDBValueAsync(JObject value, string appKeyId, string dbEntryQuery)
+		public virtual async Task UpdateDBValueAsync(JObject value, string appKeyId, string dbEntryQuery, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Platform.SecureAppDataClient.UpdateDBValueClient( value,  appKeyId,  dbEntryQuery);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
-		/// <summary>
-		/// platform-secureappdata Delete DeleteDBValue description DOCUMENT_HERE 
-		/// </summary>
-		/// <param name="appKeyId"></param>
-		/// <param name="dbEntryQuery">The database entry string to create.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var secureappdata = new SecureAppData();
-		///   secureappdata.DeleteDBValue( appKeyId,  dbEntryQuery);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteDBValue(string appKeyId, string dbEntryQuery)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Platform.SecureAppDataClient.DeleteDBValueClient( appKeyId,  dbEntryQuery);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// platform-secureappdata Delete DeleteDBValue description DOCUMENT_HERE 
+		/// 
 		/// </summary>
 		/// <param name="appKeyId"></param>
-		/// <param name="dbEntryQuery">The database entry string to create.</param>
+		/// <param name="dbEntryQuery"></param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -224,12 +129,12 @@ public virtual void DeleteDBValue(string appKeyId, string dbEntryQuery)
 		///   await secureappdata.DeleteDBValueAsync( appKeyId,  dbEntryQuery);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteDBValueAsync(string appKeyId, string dbEntryQuery)
+		public virtual async Task DeleteDBValueAsync(string appKeyId, string dbEntryQuery, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Platform.SecureAppDataClient.DeleteDBValueClient( appKeyId,  dbEntryQuery);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Platform/SiteDataResource.cs b/Mozu.Api/Resources/Platform/SiteDataResource.cs
old mode 100644
new mode 100755
index bee99e43..16b15c5a
--- a/Mozu.Api/Resources/Platform/SiteDataResource.cs
+++ b/Mozu.Api/Resources/Platform/SiteDataResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Platform
 {
 	/// <summary>
-	/// Use the site data resource to store site-level information required for a third-party application in the  database.
+	/// Use the site data resource to store site-level information required for a third-party application in the Mozu database.
 	/// </summary>
 	public partial class SiteDataResource  	{
 		///
@@ -37,36 +38,12 @@ public SiteDataResource CloneWithApiContext(Action<IApiContext> contextModificat
 		}
 
 				
-		/// <summary>
-		/// Retrieves the value of a record in the  database.
-		/// </summary>
-		/// <param name="dbEntryQuery">The database entry string to create.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// string
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var sitedata = new SiteData();
-		///   var string = sitedata.GetDBValue( dbEntryQuery,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual string GetDBValue(string dbEntryQuery, string responseFields =  null)
-		{
-			MozuClient<string> response;
-			var client = Mozu.Api.Clients.Platform.SiteDataClient.GetDBValueClient( dbEntryQuery,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the value of a record in the  database.
+		/// 
 		/// </summary>
-		/// <param name="dbEntryQuery">The database entry string to create.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="dbEntryQuery">The database entry query string used to retrieve the record information.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// string
 		/// </returns>
@@ -76,42 +53,19 @@ public virtual string GetDBValue(string dbEntryQuery, string responseFields =  n
 		///   var string = await sitedata.GetDBValueAsync( dbEntryQuery,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<string> GetDBValueAsync(string dbEntryQuery, string responseFields =  null)
+		public virtual async Task<string> GetDBValueAsync(string dbEntryQuery, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<string> response;
 			var client = Mozu.Api.Clients.Platform.SiteDataClient.GetDBValueClient( dbEntryQuery,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Creates a new record in the  database based on the information supplied in the request.
-		/// </summary>
-		/// <param name="dbEntryQuery">The database entry string to create.</param>
-		/// <param name="value">The value string to create.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var sitedata = new SiteData();
-		///   sitedata.CreateDBValue( value,  dbEntryQuery);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void CreateDBValue(string value, string dbEntryQuery)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Platform.SiteDataClient.CreateDBValueClient( value,  dbEntryQuery);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Creates a new record in the  database based on the information supplied in the request.
+		/// 
 		/// </summary>
 		/// <param name="dbEntryQuery">The database entry string to create.</param>
 		/// <param name="value">The value string to create.</param>
@@ -124,44 +78,21 @@ public virtual void CreateDBValue(string value, string dbEntryQuery)
 		///   await sitedata.CreateDBValueAsync( value,  dbEntryQuery);
 		/// </code>
 		/// </example>
-		public virtual async Task CreateDBValueAsync(string value, string dbEntryQuery)
+		public virtual async Task CreateDBValueAsync(string value, string dbEntryQuery, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Platform.SiteDataClient.CreateDBValueClient( value,  dbEntryQuery);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
-		/// <summary>
-		/// Updates a record in the  database based on the information supplied in the request.
-		/// </summary>
-		/// <param name="dbEntryQuery">The database entry string to create.</param>
-		/// <param name="value">The value string to create.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var sitedata = new SiteData();
-		///   sitedata.UpdateDBValue( value,  dbEntryQuery);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void UpdateDBValue(string value, string dbEntryQuery)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Platform.SiteDataClient.UpdateDBValueClient( value,  dbEntryQuery);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Updates a record in the  database based on the information supplied in the request.
+		/// 
 		/// </summary>
-		/// <param name="dbEntryQuery">The database entry string to create.</param>
-		/// <param name="value">The value string to create.</param>
+		/// <param name="dbEntryQuery">The database entry query string used to update the record information.</param>
+		/// <param name="value">The database value to update.</param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -171,42 +102,20 @@ public virtual void UpdateDBValue(string value, string dbEntryQuery)
 		///   await sitedata.UpdateDBValueAsync( value,  dbEntryQuery);
 		/// </code>
 		/// </example>
-		public virtual async Task UpdateDBValueAsync(string value, string dbEntryQuery)
+		public virtual async Task UpdateDBValueAsync(string value, string dbEntryQuery, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Platform.SiteDataClient.UpdateDBValueClient( value,  dbEntryQuery);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
-		/// <summary>
-		/// Removes a previously defined record in the  database.
-		/// </summary>
-		/// <param name="dbEntryQuery">The database entry string to create.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var sitedata = new SiteData();
-		///   sitedata.DeleteDBValue( dbEntryQuery);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteDBValue(string dbEntryQuery)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Platform.SiteDataClient.DeleteDBValueClient( dbEntryQuery);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Removes a previously defined record in the  database.
+		/// 
 		/// </summary>
-		/// <param name="dbEntryQuery">The database entry string to create.</param>
+		/// <param name="dbEntryQuery">The database entry string to delete.</param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -216,12 +125,12 @@ public virtual void DeleteDBValue(string dbEntryQuery)
 		///   await sitedata.DeleteDBValueAsync( dbEntryQuery);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteDBValueAsync(string dbEntryQuery)
+		public virtual async Task DeleteDBValueAsync(string dbEntryQuery, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Platform.SiteDataClient.DeleteDBValueClient( dbEntryQuery);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Platform/TenantDataResource.cs b/Mozu.Api/Resources/Platform/TenantDataResource.cs
old mode 100644
new mode 100755
index b7bc2b09..e5084890
--- a/Mozu.Api/Resources/Platform/TenantDataResource.cs
+++ b/Mozu.Api/Resources/Platform/TenantDataResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Platform
 {
 	/// <summary>
-	/// Use the tenant data resource to store tenant-level information required for a third-party application in the  database.
+	/// Use the tenant data resource to store tenant-level information required for a third-party application in the Mozu database.
 	/// </summary>
 	public partial class TenantDataResource  	{
 		///
@@ -37,36 +38,12 @@ public TenantDataResource CloneWithApiContext(Action<IApiContext> contextModific
 		}
 
 				
-		/// <summary>
-		/// Retrieves the value of a record in the  database.
-		/// </summary>
-		/// <param name="dbEntryQuery">The database entry string to create.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// string
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var tenantdata = new TenantData();
-		///   var string = tenantdata.GetDBValue( dbEntryQuery,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual string GetDBValue(string dbEntryQuery, string responseFields =  null)
-		{
-			MozuClient<string> response;
-			var client = Mozu.Api.Clients.Platform.TenantDataClient.GetDBValueClient( dbEntryQuery,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the value of a record in the  database.
+		/// 
 		/// </summary>
-		/// <param name="dbEntryQuery">The database entry string to create.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="dbEntryQuery">The database entry query string used to retrieve the record information.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// string
 		/// </returns>
@@ -76,42 +53,19 @@ public virtual string GetDBValue(string dbEntryQuery, string responseFields =  n
 		///   var string = await tenantdata.GetDBValueAsync( dbEntryQuery,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<string> GetDBValueAsync(string dbEntryQuery, string responseFields =  null)
+		public virtual async Task<string> GetDBValueAsync(string dbEntryQuery, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<string> response;
 			var client = Mozu.Api.Clients.Platform.TenantDataClient.GetDBValueClient( dbEntryQuery,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Creates a new record in the  database based on the information supplied in the request.
-		/// </summary>
-		/// <param name="dbEntryQuery">The database entry string to create.</param>
-		/// <param name="value">The value string to create.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var tenantdata = new TenantData();
-		///   tenantdata.CreateDBValue( value,  dbEntryQuery);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void CreateDBValue(string value, string dbEntryQuery)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Platform.TenantDataClient.CreateDBValueClient( value,  dbEntryQuery);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Creates a new record in the  database based on the information supplied in the request.
+		/// 
 		/// </summary>
 		/// <param name="dbEntryQuery">The database entry string to create.</param>
 		/// <param name="value">The value string to create.</param>
@@ -124,44 +78,21 @@ public virtual void CreateDBValue(string value, string dbEntryQuery)
 		///   await tenantdata.CreateDBValueAsync( value,  dbEntryQuery);
 		/// </code>
 		/// </example>
-		public virtual async Task CreateDBValueAsync(string value, string dbEntryQuery)
+		public virtual async Task CreateDBValueAsync(string value, string dbEntryQuery, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Platform.TenantDataClient.CreateDBValueClient( value,  dbEntryQuery);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
-		/// <summary>
-		/// Updates a record in the  database based on the information supplied in the request.
-		/// </summary>
-		/// <param name="dbEntryQuery">The database entry string to create.</param>
-		/// <param name="value">The value string to create.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var tenantdata = new TenantData();
-		///   tenantdata.UpdateDBValue( value,  dbEntryQuery);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void UpdateDBValue(string value, string dbEntryQuery)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Platform.TenantDataClient.UpdateDBValueClient( value,  dbEntryQuery);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Updates a record in the  database based on the information supplied in the request.
+		/// 
 		/// </summary>
-		/// <param name="dbEntryQuery">The database entry string to create.</param>
-		/// <param name="value">The value string to create.</param>
+		/// <param name="dbEntryQuery">The database entry query string used to update the record information.</param>
+		/// <param name="value">The database value to update.</param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -171,42 +102,20 @@ public virtual void UpdateDBValue(string value, string dbEntryQuery)
 		///   await tenantdata.UpdateDBValueAsync( value,  dbEntryQuery);
 		/// </code>
 		/// </example>
-		public virtual async Task UpdateDBValueAsync(string value, string dbEntryQuery)
+		public virtual async Task UpdateDBValueAsync(string value, string dbEntryQuery, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Platform.TenantDataClient.UpdateDBValueClient( value,  dbEntryQuery);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
-		/// <summary>
-		/// Removes a previously defined record in the  database.
-		/// </summary>
-		/// <param name="dbEntryQuery">The database entry string to create.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var tenantdata = new TenantData();
-		///   tenantdata.DeleteDBValue( dbEntryQuery);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteDBValue(string dbEntryQuery)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Platform.TenantDataClient.DeleteDBValueClient( dbEntryQuery);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Removes a previously defined record in the  database.
+		/// 
 		/// </summary>
-		/// <param name="dbEntryQuery">The database entry string to create.</param>
+		/// <param name="dbEntryQuery">The database entry string to delete.</param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -216,12 +125,12 @@ public virtual void DeleteDBValue(string dbEntryQuery)
 		///   await tenantdata.DeleteDBValueAsync( dbEntryQuery);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteDBValueAsync(string dbEntryQuery)
+		public virtual async Task DeleteDBValueAsync(string dbEntryQuery, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Platform.TenantDataClient.DeleteDBValueClient( dbEntryQuery);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Resources/Platform/TenantExtensionsResource.cs b/Mozu.Api/Resources/Platform/TenantExtensionsResource.cs
old mode 100644
new mode 100755
index 9fd4e22c..b5793a24
--- a/Mozu.Api/Resources/Platform/TenantExtensionsResource.cs
+++ b/Mozu.Api/Resources/Platform/TenantExtensionsResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Platform
 {
 	/// <summary>
-	/// Use the Extensions resource to manage Arc.js configuration settings. These are the same settings you can configure through  in the Action Management JSON Editor.
+	/// 
 	/// </summary>
 	public partial class TenantExtensionsResource  	{
 		///
@@ -37,34 +38,11 @@ public TenantExtensionsResource CloneWithApiContext(Action<IApiContext> contextM
 		}
 
 				
-		/// <summary>
-		/// Retrieves the Arc.js configuration settings for a site.
-		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.InstalledApplications.TenantExtensions"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var tenantextensions = new TenantExtensions();
-		///   var tenantExtensions = tenantextensions.GetExtensions( responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.InstalledApplications.TenantExtensions GetExtensions(string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.InstalledApplications.TenantExtensions> response;
-			var client = Mozu.Api.Clients.Platform.TenantExtensionsClient.GetExtensionsClient( responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the Arc.js configuration settings for a site.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.InstalledApplications.TenantExtensions"/>
 		/// </returns>
@@ -74,46 +52,22 @@ public virtual Mozu.Api.Contracts.InstalledApplications.TenantExtensions GetExte
 		///   var tenantExtensions = await tenantextensions.GetExtensionsAsync( responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.InstalledApplications.TenantExtensions> GetExtensionsAsync(string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.InstalledApplications.TenantExtensions> GetExtensionsAsync(string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.InstalledApplications.TenantExtensions> response;
 			var client = Mozu.Api.Clients.Platform.TenantExtensionsClient.GetExtensionsClient( responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Updates the Arc.js configuration settings for a site.
-		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="extensions">The updated details of the Arc.js configuration settings.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.InstalledApplications.TenantExtensions"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var tenantextensions = new TenantExtensions();
-		///   var tenantExtensions = tenantextensions.UpdateExtensions( extensions,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.InstalledApplications.TenantExtensions UpdateExtensions(Mozu.Api.Contracts.InstalledApplications.TenantExtensions extensions, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.InstalledApplications.TenantExtensions> response;
-			var client = Mozu.Api.Clients.Platform.TenantExtensionsClient.UpdateExtensionsClient( extensions,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Updates the Arc.js configuration settings for a site.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-		/// <param name="extensions">The updated details of the Arc.js configuration settings.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="extensions"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.InstalledApplications.TenantExtensions"/>
 		/// </returns>
@@ -123,12 +77,12 @@ public virtual Mozu.Api.Contracts.InstalledApplications.TenantExtensions UpdateE
 		///   var tenantExtensions = await tenantextensions.UpdateExtensionsAsync( extensions,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.InstalledApplications.TenantExtensions> UpdateExtensionsAsync(Mozu.Api.Contracts.InstalledApplications.TenantExtensions extensions, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.InstalledApplications.TenantExtensions> UpdateExtensionsAsync(Mozu.Api.Contracts.InstalledApplications.TenantExtensions extensions, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.InstalledApplications.TenantExtensions> response;
 			var client = Mozu.Api.Clients.Platform.TenantExtensionsClient.UpdateExtensionsClient( extensions,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
diff --git a/Mozu.Api/Resources/Platform/TenantResource.cs b/Mozu.Api/Resources/Platform/TenantResource.cs
old mode 100644
new mode 100755
index c4634822..617069ad
--- a/Mozu.Api/Resources/Platform/TenantResource.cs
+++ b/Mozu.Api/Resources/Platform/TenantResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Platform
 {
 	/// <summary>
-	/// Use the tenants resource to manage information about a  tenant.
+	/// Use the tenants resource to manage information about a Mozu tenant.
 	/// </summary>
 	public partial class TenantResource  	{
 		///
@@ -41,36 +42,12 @@ public TenantResource CloneWithApiContext(Action<IApiContext> contextModificatio
 		}
 
 				
-		/// <summary>
-		/// Retrieve details about a specific tenant by providing the tenant ID.
-		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="tenantId">Unique identifier of the Mozu tenant.</param>
-		/// <returns>
-		/// <see cref="Mozu.Api.Contracts.Tenant.Tenant"/>
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var tenant = new Tenant();
-		///   var tenant = tenant.GetTenant( tenantId,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual Mozu.Api.Contracts.Tenant.Tenant GetTenant(int tenantId, string responseFields =  null)
-		{
-			MozuClient<Mozu.Api.Contracts.Tenant.Tenant> response;
-			var client = Mozu.Api.Clients.Platform.TenantClient.GetTenantClient( tenantId,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieve details about a specific tenant by providing the tenant ID.
+		/// 
 		/// </summary>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <param name="tenantId">Unique identifier of the Mozu tenant.</param>
+		/// <param name="responseFields"></param>
+		/// <param name="tenantId"></param>
 		/// <returns>
 		/// <see cref="Mozu.Api.Contracts.Tenant.Tenant"/>
 		/// </returns>
@@ -80,12 +57,12 @@ public virtual Mozu.Api.Contracts.Tenant.Tenant GetTenant(int tenantId, string r
 		///   var tenant = await tenant.GetTenantAsync( tenantId,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<Mozu.Api.Contracts.Tenant.Tenant> GetTenantAsync(int tenantId, string responseFields =  null)
+		public virtual async Task<Mozu.Api.Contracts.Tenant.Tenant> GetTenantAsync(int tenantId, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<Mozu.Api.Contracts.Tenant.Tenant> response;
 			var client = Mozu.Api.Clients.Platform.TenantClient.GetTenantClient( tenantId,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
diff --git a/Mozu.Api/Resources/Platform/UserDataResource.cs b/Mozu.Api/Resources/Platform/UserDataResource.cs
old mode 100644
new mode 100755
index 088fc2e8..a168acea
--- a/Mozu.Api/Resources/Platform/UserDataResource.cs
+++ b/Mozu.Api/Resources/Platform/UserDataResource.cs
@@ -13,11 +13,12 @@
 using Mozu.Api.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace Mozu.Api.Resources.Platform
 {
 	/// <summary>
-	/// Use the user data subresource to store user-level data required for a third-party application in the  database.
+	/// Use the user data subresource to store user-level data required for a third-party application in the Mozu database.
 	/// </summary>
 	public partial class UserDataResource  	{
 		///
@@ -37,36 +38,12 @@ public UserDataResource CloneWithApiContext(Action<IApiContext> contextModificat
 		}
 
 				
-		/// <summary>
-		/// Retrieves the value of a record in the  database.
-		/// </summary>
-		/// <param name="dbEntryQuery">The database entry string to create.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-		/// <returns>
-		/// string
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var userdata = new UserData();
-		///   var string = userdata.GetDBValue( dbEntryQuery,  responseFields);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual string GetDBValue(string dbEntryQuery, string responseFields =  null)
-		{
-			MozuClient<string> response;
-			var client = Mozu.Api.Clients.Platform.UserDataClient.GetDBValueClient( dbEntryQuery,  responseFields);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-			return response.Result();
-
-		}
 
 		/// <summary>
-		/// Retrieves the value of a record in the  database.
+		/// 
 		/// </summary>
-		/// <param name="dbEntryQuery">The database entry string to create.</param>
-		/// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+		/// <param name="dbEntryQuery">The database entry query string used to retrieve the record information.</param>
+		/// <param name="responseFields"></param>
 		/// <returns>
 		/// string
 		/// </returns>
@@ -76,42 +53,19 @@ public virtual string GetDBValue(string dbEntryQuery, string responseFields =  n
 		///   var string = await userdata.GetDBValueAsync( dbEntryQuery,  responseFields);
 		/// </code>
 		/// </example>
-		public virtual async Task<string> GetDBValueAsync(string dbEntryQuery, string responseFields =  null)
+		public virtual async Task<string> GetDBValueAsync(string dbEntryQuery, string responseFields =  null, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient<string> response;
 			var client = Mozu.Api.Clients.Platform.UserDataClient.GetDBValueClient( dbEntryQuery,  responseFields);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 			return await response.ResultAsync();
 
 		}
 
-		/// <summary>
-		/// Creates a new record in the  database based on the information supplied in the request.
-		/// </summary>
-		/// <param name="dbEntryQuery">The database entry string to create.</param>
-		/// <param name="value">The value string to create.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var userdata = new UserData();
-		///   userdata.CreateDBValue( value,  dbEntryQuery);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void CreateDBValue(string value, string dbEntryQuery)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Platform.UserDataClient.CreateDBValueClient( value,  dbEntryQuery);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Creates a new record in the  database based on the information supplied in the request.
+		/// 
 		/// </summary>
 		/// <param name="dbEntryQuery">The database entry string to create.</param>
 		/// <param name="value">The value string to create.</param>
@@ -124,44 +78,21 @@ public virtual void CreateDBValue(string value, string dbEntryQuery)
 		///   await userdata.CreateDBValueAsync( value,  dbEntryQuery);
 		/// </code>
 		/// </example>
-		public virtual async Task CreateDBValueAsync(string value, string dbEntryQuery)
+		public virtual async Task CreateDBValueAsync(string value, string dbEntryQuery, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Platform.UserDataClient.CreateDBValueClient( value,  dbEntryQuery);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
-		/// <summary>
-		/// Updates a record in the  database based on the information supplied in the request.
-		/// </summary>
-		/// <param name="dbEntryQuery">The database entry string to create.</param>
-		/// <param name="value">The value string to create.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var userdata = new UserData();
-		///   userdata.UpdateDBValue( value,  dbEntryQuery);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void UpdateDBValue(string value, string dbEntryQuery)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Platform.UserDataClient.UpdateDBValueClient( value,  dbEntryQuery);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Updates a record in the  database based on the information supplied in the request.
+		/// 
 		/// </summary>
-		/// <param name="dbEntryQuery">The database entry string to create.</param>
-		/// <param name="value">The value string to create.</param>
+		/// <param name="dbEntryQuery">The database entry query string used to update the record information.</param>
+		/// <param name="value">The database value to update.</param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -171,42 +102,20 @@ public virtual void UpdateDBValue(string value, string dbEntryQuery)
 		///   await userdata.UpdateDBValueAsync( value,  dbEntryQuery);
 		/// </code>
 		/// </example>
-		public virtual async Task UpdateDBValueAsync(string value, string dbEntryQuery)
+		public virtual async Task UpdateDBValueAsync(string value, string dbEntryQuery, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Platform.UserDataClient.UpdateDBValueClient( value,  dbEntryQuery);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
-		/// <summary>
-		/// Removes a previously defined record in the  database.
-		/// </summary>
-		/// <param name="dbEntryQuery">The database entry string to create.</param>
-		/// <returns>
-		/// 
-		/// </returns>
-		/// <example>
-		/// <code>
-		///   var userdata = new UserData();
-		///   userdata.DeleteDBValue( dbEntryQuery);
-		/// </code>
-		/// </example>
-		[Obsolete("This method is obsolete; use the async method instead")]
-		public virtual void DeleteDBValue(string dbEntryQuery)
-		{
-			MozuClient response;
-			var client = Mozu.Api.Clients.Platform.UserDataClient.DeleteDBValueClient( dbEntryQuery);
-			client.WithContext(_apiContext);
-			response = client.Execute();
-
-		}
 
 		/// <summary>
-		/// Removes a previously defined record in the  database.
+		/// 
 		/// </summary>
-		/// <param name="dbEntryQuery">The database entry string to create.</param>
+		/// <param name="dbEntryQuery">The database entry string to delete.</param>
 		/// <returns>
 		/// 
 		/// </returns>
@@ -216,12 +125,12 @@ public virtual void DeleteDBValue(string dbEntryQuery)
 		///   await userdata.DeleteDBValueAsync( dbEntryQuery);
 		/// </code>
 		/// </example>
-		public virtual async Task DeleteDBValueAsync(string dbEntryQuery)
+		public virtual async Task DeleteDBValueAsync(string dbEntryQuery, CancellationToken ct = default(CancellationToken))
 		{
 			MozuClient response;
 			var client = Mozu.Api.Clients.Platform.UserDataClient.DeleteDBValueClient( dbEntryQuery);
 			client.WithContext(_apiContext);
-			response = await client.ExecuteAsync();
+			response = await client.ExecuteAsync(ct).ConfigureAwait(false);
 
 		}
 
diff --git a/Mozu.Api/Security/AppAuthenticator.cs b/Mozu.Api/Security/AppAuthenticator.cs
index 82cc77c2..13cab91a 100644
--- a/Mozu.Api/Security/AppAuthenticator.cs
+++ b/Mozu.Api/Security/AppAuthenticator.cs
@@ -26,7 +26,7 @@ public sealed class AppAuthenticator
         private RefreshInterval _refreshInterval = null;
 
         private static ILogger _log = LogManager.GetLogger(typeof(AppAuthenticator));
-        private static SemaphoreSlim _semaphoreWaiter = new SemaphoreSlim(10);
+        private static SemaphoreSlim _semaphoreWaiter = new SemaphoreSlim(1);
 
         /// <summary>
 		/// The application auth ticket
diff --git a/Mozu.Api/Security/CustomerAuthenticator.cs b/Mozu.Api/Security/CustomerAuthenticator.cs
index 50dc0074..57c65b25 100644
--- a/Mozu.Api/Security/CustomerAuthenticator.cs
+++ b/Mozu.Api/Security/CustomerAuthenticator.cs
@@ -20,29 +20,31 @@ public class CustomerAuthenticationProfile
 
     public class CustomerAuthenticator
     {
-        public static AuthTicket EnsureAuthTicket(AuthTicket authTicket)
+        public static async Task<AuthTicket> EnsureAuthTicket(AuthTicket authTicket)
         {
+
             if (DateTime.UtcNow >= authTicket.AccessTokenExpiration.AddSeconds(-180))
-                return RefreshUserAuthTicket(authTicket).AuthTicket;
+                return (await RefreshUserAuthTicket(authTicket).ConfigureAwait(false)).AuthTicket;
 
             return null;
         }
 
-        private static string GetAuthUrl(int tenantId)
+        private static async Task<string> GetAuthUrl(int tenantId)
         {
             var tenantResource = new TenantResource();
-            var tenant = tenantResource.GetTenant(tenantId);
+            var tenant = await tenantResource.GetTenantAsync(tenantId).ConfigureAwait(false);
             return HttpHelper.GetUrl(tenant.Domain);
 
            
         }
 
-        public static CustomerAuthenticationProfile RefreshUserAuthTicket(AuthTicket authTicket)
+        public static async Task<CustomerAuthenticationProfile> RefreshUserAuthTicket(AuthTicket authTicket)
         {
 
             var resourceUrl = CustomerAuthTicketUrl.RefreshUserAuthTicketUrl(authTicket.RefreshToken).Url;
 
-            var client = new HttpClient { BaseAddress = new Uri(GetAuthUrl(authTicket.TenantId.Value)) };
+            var authUrl = await GetAuthUrl(authTicket.TenantId.Value).ConfigureAwait(false);
+            var client = new HttpClient { BaseAddress = new Uri(authUrl) };
             AppAuthenticator.AddHeader(client);
 
             if (authTicket.SiteId.HasValue)
@@ -59,13 +61,13 @@ public static CustomerAuthenticationProfile RefreshUserAuthTicket(AuthTicket aut
 
 
 
-        public static CustomerAuthenticationProfile Authenticate(CustomerUserAuthInfo customerUserAuthInfo,
+        public static async Task<CustomerAuthenticationProfile> Authenticate(CustomerUserAuthInfo customerUserAuthInfo,
                                                                 int tenantId, int siteId)
         {
             var resourceUrl = CustomerAuthTicketUrl.CreateUserAuthTicketUrl().Url;
 
-
-            var client = new HttpClient { BaseAddress = new Uri(GetAuthUrl(tenantId)) };
+            var authUrl = await GetAuthUrl(tenantId).ConfigureAwait(false);
+            var client = new HttpClient { BaseAddress = new Uri(authUrl) };
 
             client.DefaultRequestHeaders.Add(Headers.X_VOL_SITE, siteId.ToString());
 
diff --git a/Mozu.Api/Urls/Commerce/Admin/LocationTypeUrl.cs b/Mozu.Api/Urls/Commerce/Admin/LocationTypeUrl.cs
old mode 100644
new mode 100755
index 46507f4c..2d7f2035
--- a/Mozu.Api/Urls/Commerce/Admin/LocationTypeUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Admin/LocationTypeUrl.cs
@@ -33,7 +33,7 @@ public static MozuUrl GetLocationTypesUrl()
         /// Get Resource Url for GetLocationType
         /// </summary>
         /// <param name="locationTypeCode">The user-defined code that identifies the location type.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -49,7 +49,7 @@ public static MozuUrl GetLocationTypeUrl(string locationTypeCode, string respons
 				/// <summary>
         /// Get Resource Url for AddLocationType
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -65,7 +65,7 @@ public static MozuUrl AddLocationTypeUrl(string responseFields =  null)
         /// Get Resource Url for UpdateLocationType
         /// </summary>
         /// <param name="locationTypeCode">The user-defined code that identifies the location type.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -81,7 +81,7 @@ public static MozuUrl UpdateLocationTypeUrl(string locationTypeCode, string resp
 				/// <summary>
         /// Get Resource Url for DeleteLocationType
         /// </summary>
-        /// <param name="locationTypeCode">The user-defined code that identifies the location type.</param>
+        /// <param name="locationTypeCode">User-defined code used to identify the location type.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Admin/LocationUrl.cs b/Mozu.Api/Urls/Commerce/Admin/LocationUrl.cs
old mode 100644
new mode 100755
index 2f81e77c..38e896e1
--- a/Mozu.Api/Urls/Commerce/Admin/LocationUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Admin/LocationUrl.cs
@@ -19,11 +19,11 @@ public partial class LocationUrl
 		/// <summary>
         /// Get Resource Url for GetLocations
         /// </summary>
-        /// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-        /// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-        /// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+        /// <param name="filter"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="sortBy"></param>
+        /// <param name="startIndex"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -42,8 +42,8 @@ public static MozuUrl GetLocationsUrl(int? startIndex =  null, int? pageSize =
 		/// <summary>
         /// Get Resource Url for GetLocation
         /// </summary>
-        /// <param name="locationCode">The unique, user-defined code that identifies a location. </param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="locationCode">The merchant-defined code of the location to retrieve.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -59,7 +59,7 @@ public static MozuUrl GetLocationUrl(string locationCode, string responseFields
 				/// <summary>
         /// Get Resource Url for AddLocation
         /// </summary>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -74,8 +74,8 @@ public static MozuUrl AddLocationUrl(string responseFields =  null)
 				/// <summary>
         /// Get Resource Url for UpdateLocation
         /// </summary>
-        /// <param name="locationCode">The unique, user-defined code that identifies a location. </param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="locationCode">The merchant-defined code associated with the location to update.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -91,7 +91,7 @@ public static MozuUrl UpdateLocationUrl(string locationCode, string responseFiel
 				/// <summary>
         /// Get Resource Url for DeleteLocation
         /// </summary>
-        /// <param name="locationCode">The unique, user-defined code that identifies a location. </param>
+        /// <param name="locationCode">The merchant-defined code of the location to delete.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Admin/Locations/Attributedefinition/AttributeUrl.cs b/Mozu.Api/Urls/Commerce/Admin/Locations/Attributedefinition/AttributeUrl.cs
new file mode 100755
index 00000000..ea096017
--- /dev/null
+++ b/Mozu.Api/Urls/Commerce/Admin/Locations/Attributedefinition/AttributeUrl.cs
@@ -0,0 +1,109 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+
+namespace Mozu.Api.Urls.Commerce.Admin.Locations.Attributedefinition
+{
+	public partial class AttributeUrl 
+	{
+
+		/// <summary>
+        /// Get Resource Url for GetAttributes
+        /// </summary>
+        /// <param name="filter"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="sortBy"></param>
+        /// <param name="startIndex"></param>
+        /// <returns>
+        /// String - Resource Url
+        /// </returns>
+        public static MozuUrl GetAttributesUrl(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
+		{
+			var url = "/api/commerce/admin/locations/attributedefinition/attributes/?startIndex={startIndex}&pageSize={pageSize}&sortBy={sortBy}&filter={filter}&responseFields={responseFields}";
+			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
+			mozuUrl.FormatUrl( "filter", filter);
+			mozuUrl.FormatUrl( "pageSize", pageSize);
+			mozuUrl.FormatUrl( "responseFields", responseFields);
+			mozuUrl.FormatUrl( "sortBy", sortBy);
+			mozuUrl.FormatUrl( "startIndex", startIndex);
+			return mozuUrl;
+		}
+
+		/// <summary>
+        /// Get Resource Url for GetAttributeVocabularyValues
+        /// </summary>
+        /// <param name="attributeFQN"></param>
+        /// <returns>
+        /// String - Resource Url
+        /// </returns>
+        public static MozuUrl GetAttributeVocabularyValuesUrl(string attributeFQN)
+		{
+			var url = "/api/commerce/admin/locations/attributedefinition/attributes/{attributeFQN}/VocabularyValues";
+			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
+			mozuUrl.FormatUrl( "attributeFQN", attributeFQN);
+			return mozuUrl;
+		}
+
+		/// <summary>
+        /// Get Resource Url for GetAttribute
+        /// </summary>
+        /// <param name="attributeFQN"></param>
+        /// <param name="responseFields"></param>
+        /// <returns>
+        /// String - Resource Url
+        /// </returns>
+        public static MozuUrl GetAttributeUrl(string attributeFQN, string responseFields =  null)
+		{
+			var url = "/api/commerce/admin/locations/attributedefinition/attributes/{attributeFQN}?responseFields={responseFields}";
+			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
+			mozuUrl.FormatUrl( "attributeFQN", attributeFQN);
+			mozuUrl.FormatUrl( "responseFields", responseFields);
+			return mozuUrl;
+		}
+
+				/// <summary>
+        /// Get Resource Url for CreateAttribute
+        /// </summary>
+        /// <param name="responseFields"></param>
+        /// <returns>
+        /// String - Resource Url
+        /// </returns>
+        public static MozuUrl CreateAttributeUrl(string responseFields =  null)
+		{
+			var url = "/api/commerce/admin/locations/attributedefinition/attributes/?responseFields={responseFields}";
+			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
+			mozuUrl.FormatUrl( "responseFields", responseFields);
+			return mozuUrl;
+		}
+
+				/// <summary>
+        /// Get Resource Url for UpdateAttribute
+        /// </summary>
+        /// <param name="attributeFQN"></param>
+        /// <param name="responseFields"></param>
+        /// <returns>
+        /// String - Resource Url
+        /// </returns>
+        public static MozuUrl UpdateAttributeUrl(string attributeFQN, string responseFields =  null)
+		{
+			var url = "/api/commerce/admin/locations/attributedefinition/attributes/{attributeFQN}?responseFields={responseFields}";
+			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
+			mozuUrl.FormatUrl( "attributeFQN", attributeFQN);
+			mozuUrl.FormatUrl( "responseFields", responseFields);
+			return mozuUrl;
+		}
+
+				
+	}
+}
+
diff --git a/Mozu.Api/Urls/Commerce/CartUrl.cs b/Mozu.Api/Urls/Commerce/CartUrl.cs
old mode 100644
new mode 100755
index e822ce74..18411b71
--- a/Mozu.Api/Urls/Commerce/CartUrl.cs
+++ b/Mozu.Api/Urls/Commerce/CartUrl.cs
@@ -19,8 +19,8 @@ public partial class CartUrl
 		/// <summary>
         /// Get Resource Url for GetCart
         /// </summary>
-        /// <param name="cartId">Identifier of the cart to delete.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="cartId">Identifier of the cart to retrieve.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -36,7 +36,7 @@ public static MozuUrl GetCartUrl(string cartId, string responseFields =  null)
 		/// <summary>
         /// Get Resource Url for GetOrCreateCart
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -51,7 +51,7 @@ public static MozuUrl GetOrCreateCartUrl(string responseFields =  null)
 		/// <summary>
         /// Get Resource Url for GetCartSummary
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -66,8 +66,8 @@ public static MozuUrl GetCartSummaryUrl(string responseFields =  null)
 		/// <summary>
         /// Get Resource Url for GetUserCartSummary
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="userId">Unique identifier of the user whose tenant scopes you want to retrieve.</param>
+        /// <param name="responseFields"></param>
+        /// <param name="userId">Unique identifier of the user whose cart details you want to retrieve.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -83,8 +83,8 @@ public static MozuUrl GetUserCartSummaryUrl(string userId, string responseFields
 		/// <summary>
         /// Get Resource Url for GetUserCart
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="userId">Unique identifier of the user whose tenant scopes you want to retrieve.</param>
+        /// <param name="responseFields"></param>
+        /// <param name="userId">Unique identifier of the user whose cart you want to retrieve.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -100,7 +100,7 @@ public static MozuUrl GetUserCartUrl(string userId, string responseFields =  nul
 						/// <summary>
         /// Get Resource Url for UpdateCart
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Carts/AppliedDiscountUrl.cs b/Mozu.Api/Urls/Commerce/Carts/AppliedDiscountUrl.cs
old mode 100644
new mode 100755
index 544482e5..517f739d
--- a/Mozu.Api/Urls/Commerce/Carts/AppliedDiscountUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Carts/AppliedDiscountUrl.cs
@@ -19,9 +19,9 @@ public partial class AppliedDiscountUrl
 						/// <summary>
         /// Get Resource Url for ApplyCoupon
         /// </summary>
-        /// <param name="cartId">Identifier of the cart to delete.</param>
-        /// <param name="couponCode">Code associated with the coupon to remove from the cart.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="cartId">Unique identifier of the cart to which to apply the coupon.</param>
+        /// <param name="couponCode">Code associated with the coupon to apply to the cart.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -38,7 +38,7 @@ public static MozuUrl ApplyCouponUrl(string cartId, string couponCode, string re
 				/// <summary>
         /// Get Resource Url for RemoveCoupons
         /// </summary>
-        /// <param name="cartId">Identifier of the cart to delete.</param>
+        /// <param name="cartId">Unique identifier of the cart.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -53,7 +53,7 @@ public static MozuUrl RemoveCouponsUrl(string cartId)
 		/// <summary>
         /// Get Resource Url for RemoveCoupon
         /// </summary>
-        /// <param name="cartId">Identifier of the cart to delete.</param>
+        /// <param name="cartId">Unique identifier of the cart.</param>
         /// <param name="couponCode">Code associated with the coupon to remove from the cart.</param>
         /// <returns>
         /// String - Resource Url
diff --git a/Mozu.Api/Urls/Commerce/Carts/CartItemUrl.cs b/Mozu.Api/Urls/Commerce/Carts/CartItemUrl.cs
old mode 100644
new mode 100755
index de5d3f64..acf4ecc5
--- a/Mozu.Api/Urls/Commerce/Carts/CartItemUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Carts/CartItemUrl.cs
@@ -19,8 +19,8 @@ public partial class CartItemUrl
 		/// <summary>
         /// Get Resource Url for GetCartItem
         /// </summary>
-        /// <param name="cartItemId">Identifier of the cart item to delete.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="cartItemId">Identifier of the cart item to retrieve.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -36,7 +36,7 @@ public static MozuUrl GetCartItemUrl(string cartItemId, string responseFields =
 		/// <summary>
         /// Get Resource Url for GetCartItems
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -51,7 +51,7 @@ public static MozuUrl GetCartItemsUrl(string responseFields =  null)
 				/// <summary>
         /// Get Resource Url for AddItemToCart
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -66,9 +66,9 @@ public static MozuUrl AddItemToCartUrl(string responseFields =  null)
 				/// <summary>
         /// Get Resource Url for UpdateCartItemQuantity
         /// </summary>
-        /// <param name="cartItemId">Identifier of the cart item to delete.</param>
+        /// <param name="cartItemId">Identifier of the cart item to update quantity.</param>
         /// <param name="quantity">The number of cart items in the shopper's active cart.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -85,8 +85,8 @@ public static MozuUrl UpdateCartItemQuantityUrl(string cartItemId, int quantity,
 		/// <summary>
         /// Get Resource Url for UpdateCartItem
         /// </summary>
-        /// <param name="cartItemId">Identifier of the cart item to delete.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="cartItemId">Identifier of the cart item to update.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Carts/ChangeMessageUrl.cs b/Mozu.Api/Urls/Commerce/Carts/ChangeMessageUrl.cs
old mode 100644
new mode 100755
index c798c026..e9cdcdff
--- a/Mozu.Api/Urls/Commerce/Carts/ChangeMessageUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Carts/ChangeMessageUrl.cs
@@ -19,7 +19,7 @@ public partial class ChangeMessageUrl
 		/// <summary>
         /// Get Resource Url for GetMessages
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Carts/ExtendedPropertyUrl.cs b/Mozu.Api/Urls/Commerce/Carts/ExtendedPropertyUrl.cs
old mode 100644
new mode 100755
index d866b5a8..dc1a96c8
--- a/Mozu.Api/Urls/Commerce/Carts/ExtendedPropertyUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Carts/ExtendedPropertyUrl.cs
@@ -45,9 +45,9 @@ public static MozuUrl AddExtendedPropertiesUrl()
 				/// <summary>
         /// Get Resource Url for UpdateExtendedProperty
         /// </summary>
-        /// <param name="key">Key used for metadata defined for objects, including extensible attributes, custom attributes associated with a shipping provider, and search synonyms definitions. This content may be user-defined depending on the object and usage.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-        /// <param name="upsert">Any set of key value pairs to be stored in the extended properties of a cart.</param>
+        /// <param name="key"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="upsert"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -64,7 +64,7 @@ public static MozuUrl UpdateExtendedPropertyUrl(string key, bool? upsert =  null
 		/// <summary>
         /// Get Resource Url for UpdateExtendedProperties
         /// </summary>
-        /// <param name="upsert">Any set of key value pairs to be stored in the extended properties of a cart.</param>
+        /// <param name="upsert"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Catalog/Admin/Attributedefinition/AttributeUrl.cs b/Mozu.Api/Urls/Commerce/Catalog/Admin/Attributedefinition/AttributeUrl.cs
old mode 100644
new mode 100755
index ae3cb4ae..a6c6eccd
--- a/Mozu.Api/Urls/Commerce/Catalog/Admin/Attributedefinition/AttributeUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Catalog/Admin/Attributedefinition/AttributeUrl.cs
@@ -19,9 +19,9 @@ public partial class AttributeUrl
 		/// <summary>
         /// Get Resource Url for GetAttributes
         /// </summary>
-        /// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-        /// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="filter"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="responseFields"></param>
         /// <param name="sortBy"></param>
         /// <param name="startIndex"></param>
         /// <returns>
@@ -42,8 +42,8 @@ public static MozuUrl GetAttributesUrl(int? startIndex =  null, int? pageSize =
 		/// <summary>
         /// Get Resource Url for GetAttribute
         /// </summary>
-        /// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="attributeFQN"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -59,7 +59,7 @@ public static MozuUrl GetAttributeUrl(string attributeFQN, string responseFields
 				/// <summary>
         /// Get Resource Url for AddAttribute
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -74,8 +74,8 @@ public static MozuUrl AddAttributeUrl(string responseFields =  null)
 				/// <summary>
         /// Get Resource Url for UpdateAttribute
         /// </summary>
-        /// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="attributeFQN"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -91,7 +91,7 @@ public static MozuUrl UpdateAttributeUrl(string attributeFQN, string responseFie
 				/// <summary>
         /// Get Resource Url for DeleteAttribute
         /// </summary>
-        /// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
+        /// <param name="attributeFQN"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Catalog/Admin/Attributedefinition/Attributes/AttributeLocalizedContentUrl.cs b/Mozu.Api/Urls/Commerce/Catalog/Admin/Attributedefinition/Attributes/AttributeLocalizedContentUrl.cs
old mode 100644
new mode 100755
index c91bb830..67a8242d
--- a/Mozu.Api/Urls/Commerce/Catalog/Admin/Attributedefinition/Attributes/AttributeLocalizedContentUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Catalog/Admin/Attributedefinition/Attributes/AttributeLocalizedContentUrl.cs
@@ -19,7 +19,7 @@ public partial class AttributeLocalizedContentUrl
 		/// <summary>
         /// Get Resource Url for GetAttributeLocalizedContents
         /// </summary>
-        /// <param name="attributeFQN">Fully qualified name for an attribute.</param>
+        /// <param name="attributeFQN"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -34,9 +34,9 @@ public static MozuUrl GetAttributeLocalizedContentsUrl(string attributeFQN)
 		/// <summary>
         /// Get Resource Url for GetAttributeLocalizedContent
         /// </summary>
-        /// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-        /// <param name="localeCode">Language used for the entity. Currently, only "en-US" is supported.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="attributeFQN"></param>
+        /// <param name="localeCode"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -53,8 +53,8 @@ public static MozuUrl GetAttributeLocalizedContentUrl(string attributeFQN, strin
 				/// <summary>
         /// Get Resource Url for AddLocalizedContent
         /// </summary>
-        /// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="attributeFQN"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -70,7 +70,7 @@ public static MozuUrl AddLocalizedContentUrl(string attributeFQN, string respons
 				/// <summary>
         /// Get Resource Url for UpdateLocalizedContents
         /// </summary>
-        /// <param name="attributeFQN">Fully qualified name for an attribute.</param>
+        /// <param name="attributeFQN"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -85,9 +85,9 @@ public static MozuUrl UpdateLocalizedContentsUrl(string attributeFQN)
 		/// <summary>
         /// Get Resource Url for UpdateLocalizedContent
         /// </summary>
-        /// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-        /// <param name="localeCode">Language used for the entity. Currently, only "en-US" is supported.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="attributeFQN"></param>
+        /// <param name="localeCode"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -104,8 +104,8 @@ public static MozuUrl UpdateLocalizedContentUrl(string attributeFQN, string loca
 				/// <summary>
         /// Get Resource Url for DeleteLocalizedContent
         /// </summary>
-        /// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-        /// <param name="localeCode">Language used for the entity. Currently, only "en-US" is supported.</param>
+        /// <param name="attributeFQN"></param>
+        /// <param name="localeCode"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Catalog/Admin/Attributedefinition/Attributes/AttributeTypeRuleUrl.cs b/Mozu.Api/Urls/Commerce/Catalog/Admin/Attributedefinition/Attributes/AttributeTypeRuleUrl.cs
old mode 100644
new mode 100755
index 791db734..32624697
--- a/Mozu.Api/Urls/Commerce/Catalog/Admin/Attributedefinition/Attributes/AttributeTypeRuleUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Catalog/Admin/Attributedefinition/Attributes/AttributeTypeRuleUrl.cs
@@ -19,9 +19,9 @@ public partial class AttributeTypeRuleUrl
 		/// <summary>
         /// Get Resource Url for GetAttributeTypeRules
         /// </summary>
-        /// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-        /// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="filter"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="responseFields"></param>
         /// <param name="sortBy"></param>
         /// <param name="startIndex"></param>
         /// <returns>
diff --git a/Mozu.Api/Urls/Commerce/Catalog/Admin/Attributedefinition/Attributes/AttributeVocabularyValueUrl.cs b/Mozu.Api/Urls/Commerce/Catalog/Admin/Attributedefinition/Attributes/AttributeVocabularyValueUrl.cs
old mode 100644
new mode 100755
index b53f5bbd..ab4b3704
--- a/Mozu.Api/Urls/Commerce/Catalog/Admin/Attributedefinition/Attributes/AttributeVocabularyValueUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Catalog/Admin/Attributedefinition/Attributes/AttributeVocabularyValueUrl.cs
@@ -19,7 +19,7 @@ public partial class AttributeVocabularyValueUrl
 		/// <summary>
         /// Get Resource Url for GetAttributeVocabularyValues
         /// </summary>
-        /// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
+        /// <param name="attributeFQN"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -34,8 +34,8 @@ public static MozuUrl GetAttributeVocabularyValuesUrl(string attributeFQN)
 		/// <summary>
         /// Get Resource Url for GetAttributeVocabularyValueLocalizedContents
         /// </summary>
-        /// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-        /// <param name="value">The value string to create.</param>
+        /// <param name="attributeFQN"></param>
+        /// <param name="value"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -51,10 +51,10 @@ public static MozuUrl GetAttributeVocabularyValueLocalizedContentsUrl(string att
 		/// <summary>
         /// Get Resource Url for GetAttributeVocabularyValueLocalizedContent
         /// </summary>
-        /// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-        /// <param name="localeCode">Language used for the entity. Currently, only "en-US" is supported.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="value">The value string to create.</param>
+        /// <param name="attributeFQN"></param>
+        /// <param name="localeCode"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="value"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -72,9 +72,9 @@ public static MozuUrl GetAttributeVocabularyValueLocalizedContentUrl(string attr
 		/// <summary>
         /// Get Resource Url for GetAttributeVocabularyValue
         /// </summary>
-        /// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="value">The value string to create.</param>
+        /// <param name="attributeFQN"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="value">The actual unique value of the attribute vocabulary to retrieve. A single attribute must have a unique value and match the attribute's data type. If a string value returns null, the system will generate a value. The actual string content displayed shoud be stored as "Content" and actual content is required for string values.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -91,9 +91,9 @@ public static MozuUrl GetAttributeVocabularyValueUrl(string attributeFQN, string
 				/// <summary>
         /// Get Resource Url for AddAttributeVocabularyValueLocalizedContent
         /// </summary>
-        /// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="value">The value string to create.</param>
+        /// <param name="attributeFQN"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="value"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -110,8 +110,8 @@ public static MozuUrl AddAttributeVocabularyValueLocalizedContentUrl(string attr
 		/// <summary>
         /// Get Resource Url for AddAttributeVocabularyValue
         /// </summary>
-        /// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="attributeFQN"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -127,7 +127,7 @@ public static MozuUrl AddAttributeVocabularyValueUrl(string attributeFQN, string
 				/// <summary>
         /// Get Resource Url for UpdateAttributeVocabularyValues
         /// </summary>
-        /// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
+        /// <param name="attributeFQN"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -142,8 +142,8 @@ public static MozuUrl UpdateAttributeVocabularyValuesUrl(string attributeFQN)
 		/// <summary>
         /// Get Resource Url for UpdateAttributeVocabularyValueLocalizedContents
         /// </summary>
-        /// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-        /// <param name="value">The value string to create.</param>
+        /// <param name="attributeFQN"></param>
+        /// <param name="value"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -159,10 +159,10 @@ public static MozuUrl UpdateAttributeVocabularyValueLocalizedContentsUrl(string
 		/// <summary>
         /// Get Resource Url for UpdateAttributeVocabularyValueLocalizedContent
         /// </summary>
-        /// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-        /// <param name="localeCode">The two character country code that sets the locale, such as US for United States. Sites, tenants, and catalogs use locale codes for localizing content, such as translated product text per supported country.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="value">The value string to create.</param>
+        /// <param name="attributeFQN"></param>
+        /// <param name="localeCode"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="value"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -180,9 +180,9 @@ public static MozuUrl UpdateAttributeVocabularyValueLocalizedContentUrl(string a
 		/// <summary>
         /// Get Resource Url for UpdateAttributeVocabularyValue
         /// </summary>
-        /// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="value">The value string to create.</param>
+        /// <param name="attributeFQN"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="value">The actual unique value of the attribute vocabulary value to update. A single attribute must have a unique value and match the attribute's data type. If a string value returns null, the system will generate a value. The actual string content displayed shoud be stored as "Content" and actual content is required for string values.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -199,8 +199,8 @@ public static MozuUrl UpdateAttributeVocabularyValueUrl(string attributeFQN, str
 				/// <summary>
         /// Get Resource Url for DeleteAttributeVocabularyValue
         /// </summary>
-        /// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-        /// <param name="value">The value string to create.</param>
+        /// <param name="attributeFQN"></param>
+        /// <param name="value">The actual unique value of the attribute vocabulary to delete. A single attribute must have a unique value and match the attribute's data type. If a string value returns null, the system will generate a value. The actual string content displayed shoud be stored as "Content" and actual content is required for string values.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -216,9 +216,9 @@ public static MozuUrl DeleteAttributeVocabularyValueUrl(string attributeFQN, str
 		/// <summary>
         /// Get Resource Url for DeleteAttributeVocabularyValueLocalizedContent
         /// </summary>
-        /// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-        /// <param name="localeCode">Language used for the entity. Currently, only "en-US" is supported.</param>
-        /// <param name="value">The value string to create.</param>
+        /// <param name="attributeFQN"></param>
+        /// <param name="localeCode"></param>
+        /// <param name="value"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Catalog/Admin/Attributedefinition/ProductTypeUrl.cs b/Mozu.Api/Urls/Commerce/Catalog/Admin/Attributedefinition/ProductTypeUrl.cs
old mode 100644
new mode 100755
index eae7bf6f..fe94d282
--- a/Mozu.Api/Urls/Commerce/Catalog/Admin/Attributedefinition/ProductTypeUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Catalog/Admin/Attributedefinition/ProductTypeUrl.cs
@@ -19,9 +19,9 @@ public partial class ProductTypeUrl
 		/// <summary>
         /// Get Resource Url for GetProductTypes
         /// </summary>
-        /// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-        /// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. You can filter product type search results by any of its properties. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=Name+cont+shoes"</param>
+        /// <param name="pageSize"></param>
+        /// <param name="responseFields"></param>
         /// <param name="sortBy"></param>
         /// <param name="startIndex"></param>
         /// <returns>
@@ -42,8 +42,8 @@ public static MozuUrl GetProductTypesUrl(int? startIndex =  null, int? pageSize
 		/// <summary>
         /// Get Resource Url for GetProductType
         /// </summary>
-        /// <param name="productTypeId">Identifier of the product type.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="productTypeId">Identifier of the product type to retrieve.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -59,7 +59,7 @@ public static MozuUrl GetProductTypeUrl(int productTypeId, string responseFields
 				/// <summary>
         /// Get Resource Url for AddProductType
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -74,8 +74,8 @@ public static MozuUrl AddProductTypeUrl(string responseFields =  null)
 				/// <summary>
         /// Get Resource Url for UpdateProductType
         /// </summary>
-        /// <param name="productTypeId">Identifier of the product type.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="productTypeId">Identifier of the product type to update.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -91,7 +91,7 @@ public static MozuUrl UpdateProductTypeUrl(int productTypeId, string responseFie
 				/// <summary>
         /// Get Resource Url for DeleteProductType
         /// </summary>
-        /// <param name="productTypeId">Identifier of the product type.</param>
+        /// <param name="productTypeId">Identifier of the product type to delete.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypeExtraUrl.cs b/Mozu.Api/Urls/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypeExtraUrl.cs
old mode 100644
new mode 100755
index 37534449..36d8e1a2
--- a/Mozu.Api/Urls/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypeExtraUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypeExtraUrl.cs
@@ -34,9 +34,9 @@ public static MozuUrl GetExtrasUrl(int productTypeId)
 		/// <summary>
         /// Get Resource Url for GetExtra
         /// </summary>
-        /// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-        /// <param name="productTypeId">Identifier of the product type.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="attributeFQN"></param>
+        /// <param name="productTypeId">Identifier of the product type whose extra is being retrieved.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -54,7 +54,7 @@ public static MozuUrl GetExtraUrl(int productTypeId, string attributeFQN, string
         /// Get Resource Url for AddExtra
         /// </summary>
         /// <param name="productTypeId">Identifier of the product type.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -70,9 +70,9 @@ public static MozuUrl AddExtraUrl(int productTypeId, string responseFields =  nu
 				/// <summary>
         /// Get Resource Url for UpdateExtra
         /// </summary>
-        /// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
+        /// <param name="attributeFQN"></param>
         /// <param name="productTypeId">Identifier of the product type.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -89,7 +89,7 @@ public static MozuUrl UpdateExtraUrl(int productTypeId, string attributeFQN, str
 				/// <summary>
         /// Get Resource Url for DeleteExtra
         /// </summary>
-        /// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
+        /// <param name="attributeFQN"></param>
         /// <param name="productTypeId">Identifier of the product type.</param>
         /// <returns>
         /// String - Resource Url
diff --git a/Mozu.Api/Urls/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypeOptionUrl.cs b/Mozu.Api/Urls/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypeOptionUrl.cs
old mode 100644
new mode 100755
index b6c3dd9f..8c8cc579
--- a/Mozu.Api/Urls/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypeOptionUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypeOptionUrl.cs
@@ -19,7 +19,7 @@ public partial class ProductTypeOptionUrl
 		/// <summary>
         /// Get Resource Url for GetOptions
         /// </summary>
-        /// <param name="productTypeId">Identifier of the product type.</param>
+        /// <param name="productTypeId">Identifier of the product type to retrieve.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -34,9 +34,9 @@ public static MozuUrl GetOptionsUrl(int productTypeId)
 		/// <summary>
         /// Get Resource Url for GetOption
         /// </summary>
-        /// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-        /// <param name="productTypeId">Identifier of the product type.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="attributeFQN"></param>
+        /// <param name="productTypeId">The identifier of the product type.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -54,7 +54,7 @@ public static MozuUrl GetOptionUrl(int productTypeId, string attributeFQN, strin
         /// Get Resource Url for AddOption
         /// </summary>
         /// <param name="productTypeId">Identifier of the product type.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -70,9 +70,9 @@ public static MozuUrl AddOptionUrl(int productTypeId, string responseFields =  n
 				/// <summary>
         /// Get Resource Url for UpdateOption
         /// </summary>
-        /// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
+        /// <param name="attributeFQN"></param>
         /// <param name="productTypeId">Identifier of the product type.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -89,7 +89,7 @@ public static MozuUrl UpdateOptionUrl(int productTypeId, string attributeFQN, st
 				/// <summary>
         /// Get Resource Url for DeleteOption
         /// </summary>
-        /// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
+        /// <param name="attributeFQN"></param>
         /// <param name="productTypeId">Identifier of the product type.</param>
         /// <returns>
         /// String - Resource Url
diff --git a/Mozu.Api/Urls/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypePropertyUrl.cs b/Mozu.Api/Urls/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypePropertyUrl.cs
old mode 100644
new mode 100755
index 0dcd6959..ddc93cc3
--- a/Mozu.Api/Urls/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypePropertyUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypePropertyUrl.cs
@@ -34,9 +34,9 @@ public static MozuUrl GetPropertiesUrl(int productTypeId)
 		/// <summary>
         /// Get Resource Url for GetProperty
         /// </summary>
-        /// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
+        /// <param name="attributeFQN"></param>
         /// <param name="productTypeId">Identifier of the product type.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -54,7 +54,7 @@ public static MozuUrl GetPropertyUrl(int productTypeId, string attributeFQN, str
         /// Get Resource Url for AddProperty
         /// </summary>
         /// <param name="productTypeId">Identifier of the product type.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -70,9 +70,9 @@ public static MozuUrl AddPropertyUrl(int productTypeId, string responseFields =
 				/// <summary>
         /// Get Resource Url for UpdateProperty
         /// </summary>
-        /// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
+        /// <param name="attributeFQN"></param>
         /// <param name="productTypeId">Identifier of the product type.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -89,7 +89,7 @@ public static MozuUrl UpdatePropertyUrl(int productTypeId, string attributeFQN,
 				/// <summary>
         /// Get Resource Url for DeleteProperty
         /// </summary>
-        /// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
+        /// <param name="attributeFQN"></param>
         /// <param name="productTypeId">Identifier of the product type.</param>
         /// <returns>
         /// String - Resource Url
diff --git a/Mozu.Api/Urls/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypeVariationUrl.cs b/Mozu.Api/Urls/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypeVariationUrl.cs
old mode 100644
new mode 100755
index 6e0d6942..e701d9a6
--- a/Mozu.Api/Urls/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypeVariationUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypeVariationUrl.cs
@@ -19,13 +19,13 @@ public partial class ProductTypeVariationUrl
 				/// <summary>
         /// Get Resource Url for GenerateProductVariations
         /// </summary>
-        /// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-        /// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
+        /// <param name="filter"></param>
+        /// <param name="pageSize"></param>
         /// <param name="productCode"></param>
-        /// <param name="productTypeId">Identifier of the product type.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-        /// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+        /// <param name="productTypeId">Unique identifier of the product type.</param>
+        /// <param name="responseFields"></param>
+        /// <param name="sortBy"></param>
+        /// <param name="startIndex"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Catalog/Admin/CategoryUrl.cs b/Mozu.Api/Urls/Commerce/Catalog/Admin/CategoryUrl.cs
old mode 100644
new mode 100755
index d920f7fd..fc95a85f
--- a/Mozu.Api/Urls/Commerce/Catalog/Admin/CategoryUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Catalog/Admin/CategoryUrl.cs
@@ -19,9 +19,9 @@ public partial class CategoryUrl
 		/// <summary>
         /// Get Resource Url for GetCategories
         /// </summary>
-        /// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-        /// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. You can filter product category search results by any of its properties, including its position in the category hierarchy. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
+        /// <param name="pageSize"></param>
+        /// <param name="responseFields"></param>
         /// <param name="sortBy"></param>
         /// <param name="startIndex"></param>
         /// <returns>
@@ -42,8 +42,8 @@ public static MozuUrl GetCategoriesUrl(int? startIndex =  null, int? pageSize =
 		/// <summary>
         /// Get Resource Url for GetChildCategories
         /// </summary>
-        /// <param name="categoryId">Unique identifier of the category to modify.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="categoryId">Unique identifier of the category for which to retrieve subcategories.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -59,8 +59,8 @@ public static MozuUrl GetChildCategoriesUrl(int categoryId, string responseField
 		/// <summary>
         /// Get Resource Url for GetCategory
         /// </summary>
-        /// <param name="categoryId">Unique identifier of the category to modify.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="categoryId">Unique identifier of the category to retrieve.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -77,8 +77,8 @@ public static MozuUrl GetCategoryUrl(int categoryId, string responseFields =  nu
         /// Get Resource Url for AddCategory
         /// </summary>
         /// <param name="incrementSequence">If true, when adding a new product category, set the sequence number of the new category to an increment of one integer greater than the maximum available sequence number across all product categories. If false, set the sequence number to zero.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="useProvidedId">Optional. If ,  uses the  you specify in the request as the category's id. If ,  generates an  for the category regardless if you specify an id in the request.If you specify an id already in use and set this parameter to ,  returns an error.</param>
+        /// <param name="responseFields"></param>
+        /// <param name="useProvidedId"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -95,7 +95,7 @@ public static MozuUrl AddCategoryUrl(bool? incrementSequence =  null, bool? useP
 		/// <summary>
         /// Get Resource Url for ValidateDynamicExpression
         /// </summary>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -110,7 +110,7 @@ public static MozuUrl ValidateDynamicExpressionUrl(string responseFields =  null
 		/// <summary>
         /// Get Resource Url for ValidateRealTimeDynamicExpression
         /// </summary>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -125,9 +125,9 @@ public static MozuUrl ValidateRealTimeDynamicExpressionUrl(string responseFields
 				/// <summary>
         /// Get Resource Url for UpdateCategory
         /// </summary>
-        /// <param name="cascadeVisibility">If true, when changing the display option for the category, change it for all subcategories also. The default value is false.</param>
+        /// <param name="cascadeVisibility">If true, when changing the display option for the category, change it for all subcategories also. Default: False.</param>
         /// <param name="categoryId">Unique identifier of the category to modify.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -144,10 +144,10 @@ public static MozuUrl UpdateCategoryUrl(int categoryId, bool? cascadeVisibility
 				/// <summary>
         /// Get Resource Url for DeleteCategoryById
         /// </summary>
-        /// <param name="cascadeDelete">Specifies whether to also delete all subcategories associated with the specified category.If you set this value is false, only the specified category is deleted.The default value is false.</param>
-        /// <param name="categoryId">Unique identifier of the category to modify.</param>
-        /// <param name="forceDelete">Specifies whether the category, and any associated subcategories, are deleted even if there are products that reference them. The default value is false.</param>
-        /// <param name="reassignToParent">Specifies whether any subcategories of the specified category are reassigned to the parent of the specified category.This field only applies if the cascadeDelete parameter is false.The default value is false.</param>
+        /// <param name="cascadeDelete">If true, also delete all subcategories associated with the specified category.</param>
+        /// <param name="categoryId">Unique identifier of the category to delete.</param>
+        /// <param name="forceDelete"></param>
+        /// <param name="reassignToParent"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Catalog/Admin/CouponSetUrl.cs b/Mozu.Api/Urls/Commerce/Catalog/Admin/CouponSetUrl.cs
old mode 100644
new mode 100755
index 7cbb2503..429fcace
--- a/Mozu.Api/Urls/Commerce/Catalog/Admin/CouponSetUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Catalog/Admin/CouponSetUrl.cs
@@ -19,12 +19,12 @@ public partial class CouponSetUrl
 		/// <summary>
         /// Get Resource Url for GetCouponSets
         /// </summary>
-        /// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-        /// <param name="includeCounts">Specifies whether to include the number of redeemed coupons, existing coupon codes, and assigned discounts in the response body.</param>
-        /// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-        /// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-        /// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
+        /// <param name="filter"></param>
+        /// <param name="includeCounts"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="sortBy"></param>
+        /// <param name="startIndex"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -44,9 +44,9 @@ public static MozuUrl GetCouponSetsUrl(int? startIndex =  null, int? pageSize =
 		/// <summary>
         /// Get Resource Url for GetCouponSet
         /// </summary>
-        /// <param name="couponSetCode">The unique identifier of the coupon set.</param>
-        /// <param name="includeCounts">Specifies whether to include the number of redeemed coupons, existing coupon codes, and assigned discounts in the response body.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="couponSetCode"></param>
+        /// <param name="includeCounts"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -63,7 +63,7 @@ public static MozuUrl GetCouponSetUrl(string couponSetCode, bool? includeCounts
 		/// <summary>
         /// Get Resource Url for GetUniqueCouponSetCode
         /// </summary>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -78,7 +78,7 @@ public static MozuUrl GetUniqueCouponSetCodeUrl(string responseFields =  null)
 				/// <summary>
         /// Get Resource Url for AddCouponSet
         /// </summary>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -93,7 +93,7 @@ public static MozuUrl AddCouponSetUrl(string responseFields =  null)
 		/// <summary>
         /// Get Resource Url for ValidateUniqueCouponSetCode
         /// </summary>
-        /// <param name="code">User-defined code that uniqely identifies the channel group.</param>
+        /// <param name="code"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -108,8 +108,8 @@ public static MozuUrl ValidateUniqueCouponSetCodeUrl(string code)
 				/// <summary>
         /// Get Resource Url for UpdateCouponSet
         /// </summary>
-        /// <param name="couponSetCode">The unique identifier of the coupon set.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="couponSetCode"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -125,7 +125,7 @@ public static MozuUrl UpdateCouponSetUrl(string couponSetCode, string responseFi
 				/// <summary>
         /// Get Resource Url for DeleteCouponSet
         /// </summary>
-        /// <param name="couponSetCode">The unique identifier of the coupon set.</param>
+        /// <param name="couponSetCode"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Catalog/Admin/Couponsets/AssignedDiscountUrl.cs b/Mozu.Api/Urls/Commerce/Catalog/Admin/Couponsets/AssignedDiscountUrl.cs
old mode 100644
new mode 100755
index efef4c8a..dff05a19
--- a/Mozu.Api/Urls/Commerce/Catalog/Admin/Couponsets/AssignedDiscountUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Catalog/Admin/Couponsets/AssignedDiscountUrl.cs
@@ -19,7 +19,7 @@ public partial class AssignedDiscountUrl
 		/// <summary>
         /// Get Resource Url for GetAssignedDiscounts
         /// </summary>
-        /// <param name="couponSetCode">The unique identifier of the coupon set.</param>
+        /// <param name="couponSetCode"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -34,7 +34,7 @@ public static MozuUrl GetAssignedDiscountsUrl(string couponSetCode)
 				/// <summary>
         /// Get Resource Url for AssignDiscount
         /// </summary>
-        /// <param name="couponSetCode">The unique identifier of the coupon set.</param>
+        /// <param name="couponSetCode"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -49,8 +49,8 @@ public static MozuUrl AssignDiscountUrl(string couponSetCode)
 						/// <summary>
         /// Get Resource Url for UnAssignDiscount
         /// </summary>
-        /// <param name="couponSetCode">The unique identifier of the coupon set.</param>
-        /// <param name="discountId">discountId parameter description DOCUMENT_HERE </param>
+        /// <param name="couponSetCode"></param>
+        /// <param name="discountId"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Catalog/Admin/Couponsets/CouponUrl.cs b/Mozu.Api/Urls/Commerce/Catalog/Admin/Couponsets/CouponUrl.cs
old mode 100644
new mode 100755
index 8ac3d9fc..a7e34cb8
--- a/Mozu.Api/Urls/Commerce/Catalog/Admin/Couponsets/CouponUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Catalog/Admin/Couponsets/CouponUrl.cs
@@ -19,10 +19,10 @@ public partial class CouponUrl
 		/// <summary>
         /// Get Resource Url for GetCoupon
         /// </summary>
-        /// <param name="couponCode">Code associated with the coupon to remove from the cart.</param>
-        /// <param name="couponSetCode">The unique identifier of the coupon set that the coupon belongs to.</param>
-        /// <param name="includeCounts">Specifies whether to return the redemptionCount property in the response body object.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="couponCode"></param>
+        /// <param name="couponSetCode"></param>
+        /// <param name="includeCounts"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -40,13 +40,13 @@ public static MozuUrl GetCouponUrl(string couponSetCode, string couponCode, bool
 		/// <summary>
         /// Get Resource Url for GetCoupons
         /// </summary>
-        /// <param name="couponSetCode">The unique identifier of the coupon set that the coupons belongs to.</param>
-        /// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-        /// <param name="includeCounts">Specifies whether to include the redemptionCount property in the response body object.</param>
-        /// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-        /// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-        /// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
+        /// <param name="couponSetCode"></param>
+        /// <param name="filter"></param>
+        /// <param name="includeCounts"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="sortBy"></param>
+        /// <param name="startIndex"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -67,7 +67,7 @@ public static MozuUrl GetCouponsUrl(string couponSetCode, int? startIndex =  nul
 				/// <summary>
         /// Get Resource Url for AddCoupons
         /// </summary>
-        /// <param name="couponSetCode">The unique identifier of the coupon set.</param>
+        /// <param name="couponSetCode"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -82,7 +82,7 @@ public static MozuUrl AddCouponsUrl(string couponSetCode)
 		/// <summary>
         /// Get Resource Url for DeleteCoupons
         /// </summary>
-        /// <param name="couponSetCode">The unique identifier of the coupon set that the coupon belongs to.</param>
+        /// <param name="couponSetCode"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -97,8 +97,8 @@ public static MozuUrl DeleteCouponsUrl(string couponSetCode)
 						/// <summary>
         /// Get Resource Url for DeleteCoupon
         /// </summary>
-        /// <param name="couponCode">Code associated with the coupon to remove from the cart.</param>
-        /// <param name="couponSetCode">The unique identifier of the coupon set that the coupon belongs to.</param>
+        /// <param name="couponCode"></param>
+        /// <param name="couponSetCode"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Catalog/Admin/DiscountSettingsUrl.cs b/Mozu.Api/Urls/Commerce/Catalog/Admin/DiscountSettingsUrl.cs
new file mode 100755
index 00000000..73d2d50e
--- /dev/null
+++ b/Mozu.Api/Urls/Commerce/Catalog/Admin/DiscountSettingsUrl.cs
@@ -0,0 +1,56 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+
+namespace Mozu.Api.Urls.Commerce.Catalog.Admin
+{
+	public partial class DiscountSettingsUrl 
+	{
+
+		/// <summary>
+        /// Get Resource Url for GetDiscountSettings
+        /// </summary>
+        /// <param name="catalogId"></param>
+        /// <param name="responseFields"></param>
+        /// <returns>
+        /// String - Resource Url
+        /// </returns>
+        public static MozuUrl GetDiscountSettingsUrl(int catalogId, string responseFields =  null)
+		{
+			var url = "/api/commerce/catalog/admin/discountsettings/{catalogId}?responseFields={responseFields}";
+			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
+			mozuUrl.FormatUrl( "catalogId", catalogId);
+			mozuUrl.FormatUrl( "responseFields", responseFields);
+			return mozuUrl;
+		}
+
+						/// <summary>
+        /// Get Resource Url for UpdateDiscountSettings
+        /// </summary>
+        /// <param name="catalogId"></param>
+        /// <param name="responseFields"></param>
+        /// <returns>
+        /// String - Resource Url
+        /// </returns>
+        public static MozuUrl UpdateDiscountSettingsUrl(int catalogId, string responseFields =  null)
+		{
+			var url = "/api/commerce/catalog/admin/discountsettings/{catalogId}?responseFields={responseFields}";
+			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
+			mozuUrl.FormatUrl( "catalogId", catalogId);
+			mozuUrl.FormatUrl( "responseFields", responseFields);
+			return mozuUrl;
+		}
+
+				
+	}
+}
+
diff --git a/Mozu.Api/Urls/Commerce/Catalog/Admin/DiscountUrl.cs b/Mozu.Api/Urls/Commerce/Catalog/Admin/DiscountUrl.cs
old mode 100644
new mode 100755
index a78b6cb8..f74ad56f
--- a/Mozu.Api/Urls/Commerce/Catalog/Admin/DiscountUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Catalog/Admin/DiscountUrl.cs
@@ -19,9 +19,9 @@ public partial class DiscountUrl
 		/// <summary>
         /// Get Resource Url for GetDiscounts
         /// </summary>
-        /// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-        /// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="filter"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="responseFields"></param>
         /// <param name="sortBy"></param>
         /// <param name="startIndex"></param>
         /// <returns>
@@ -42,8 +42,8 @@ public static MozuUrl GetDiscountsUrl(int? startIndex =  null, int? pageSize =
 		/// <summary>
         /// Get Resource Url for GetDiscountContent
         /// </summary>
-        /// <param name="discountId">discountId parameter description DOCUMENT_HERE </param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="discountId">Unique identifier of the discount. System-supplied and read-only.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -59,8 +59,8 @@ public static MozuUrl GetDiscountContentUrl(int discountId, string responseField
 		/// <summary>
         /// Get Resource Url for GetDiscount
         /// </summary>
-        /// <param name="discountId">discountId parameter description DOCUMENT_HERE </param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="discountId">Unique identifier of the discount. System-supplied and read-only.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -76,7 +76,7 @@ public static MozuUrl GetDiscountUrl(int discountId, string responseFields =  nu
 		/// <summary>
         /// Get Resource Url for GenerateRandomCoupon
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -91,7 +91,7 @@ public static MozuUrl GenerateRandomCouponUrl(string responseFields =  null)
 				/// <summary>
         /// Get Resource Url for CreateDiscount
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -106,8 +106,8 @@ public static MozuUrl CreateDiscountUrl(string responseFields =  null)
 				/// <summary>
         /// Get Resource Url for UpdateDiscountContent
         /// </summary>
-        /// <param name="discountId">discountId parameter description DOCUMENT_HERE </param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="discountId">Unique identifier of the discount. System-supplied and read-only.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -123,8 +123,8 @@ public static MozuUrl UpdateDiscountContentUrl(int discountId, string responseFi
 		/// <summary>
         /// Get Resource Url for UpdateDiscount
         /// </summary>
-        /// <param name="discountId">discountId parameter description DOCUMENT_HERE </param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="discountId">Unique identifier of the discount to update.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -140,7 +140,7 @@ public static MozuUrl UpdateDiscountUrl(int discountId, string responseFields =
 				/// <summary>
         /// Get Resource Url for DeleteDiscount
         /// </summary>
-        /// <param name="discountId">discountId parameter description DOCUMENT_HERE </param>
+        /// <param name="discountId">Unique identifier of the discount. System-supplied and read-only.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Catalog/Admin/Discounts/DiscountTargetUrl.cs b/Mozu.Api/Urls/Commerce/Catalog/Admin/Discounts/DiscountTargetUrl.cs
old mode 100644
new mode 100755
index 917ea6a4..5005f41e
--- a/Mozu.Api/Urls/Commerce/Catalog/Admin/Discounts/DiscountTargetUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Catalog/Admin/Discounts/DiscountTargetUrl.cs
@@ -19,8 +19,8 @@ public partial class DiscountTargetUrl
 		/// <summary>
         /// Get Resource Url for GetDiscountTarget
         /// </summary>
-        /// <param name="discountId">discountId parameter description DOCUMENT_HERE </param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="discountId">Unique identifier of the discount. System-supplied and read only.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -36,8 +36,8 @@ public static MozuUrl GetDiscountTargetUrl(int discountId, string responseFields
 						/// <summary>
         /// Get Resource Url for UpdateDiscountTarget
         /// </summary>
-        /// <param name="discountId">discountId parameter description DOCUMENT_HERE </param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="discountId">Unique identifier of the discount. System-supplied and read-only.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Catalog/Admin/FacetUrl.cs b/Mozu.Api/Urls/Commerce/Catalog/Admin/FacetUrl.cs
old mode 100644
new mode 100755
index b3f9f03a..65616c91
--- a/Mozu.Api/Urls/Commerce/Catalog/Admin/FacetUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Catalog/Admin/FacetUrl.cs
@@ -20,7 +20,7 @@ public partial class FacetUrl
         /// Get Resource Url for GetFacet
         /// </summary>
         /// <param name="facetId">Unique identifier of the facet to retrieve.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <param name="validate">Validates that the product category associated with a facet is active. System-supplied and read only.</param>
         /// <returns>
         /// String - Resource Url
@@ -38,9 +38,9 @@ public static MozuUrl GetFacetUrl(int facetId, bool? validate =  null, string re
 		/// <summary>
         /// Get Resource Url for GetFacetCategoryList
         /// </summary>
-        /// <param name="categoryId">Unique identifier of the category to modify.</param>
+        /// <param name="categoryId">Unique identifier of the category associated with the facets to retrieve.</param>
         /// <param name="includeAvailable">If true, returns a list of the attributes and categories associated with a product type that have not been defined as a facet for the category.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <param name="validate">Validates that the product category associated with a facet is active. System-supplied and read only.</param>
         /// <returns>
         /// String - Resource Url
@@ -59,7 +59,7 @@ public static MozuUrl GetFacetCategoryListUrl(int categoryId, bool? includeAvail
 				/// <summary>
         /// Get Resource Url for AddFacet
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -74,8 +74,8 @@ public static MozuUrl AddFacetUrl(string responseFields =  null)
 				/// <summary>
         /// Get Resource Url for UpdateFacet
         /// </summary>
-        /// <param name="facetId">Unique identifier of the facet to retrieve.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="facetId">Unique identifier of the facet to modify.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -91,7 +91,7 @@ public static MozuUrl UpdateFacetUrl(int facetId, string responseFields =  null)
 				/// <summary>
         /// Get Resource Url for DeleteFacetById
         /// </summary>
-        /// <param name="facetId">Unique identifier of the facet to retrieve.</param>
+        /// <param name="facetId">Unique identifier of the facet to delete.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Catalog/Admin/LocationInventoryUrl.cs b/Mozu.Api/Urls/Commerce/Catalog/Admin/LocationInventoryUrl.cs
old mode 100644
new mode 100755
index 0f7648d7..92a8bce5
--- a/Mozu.Api/Urls/Commerce/Catalog/Admin/LocationInventoryUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Catalog/Admin/LocationInventoryUrl.cs
@@ -19,9 +19,9 @@ public partial class LocationInventoryUrl
 		/// <summary>
         /// Get Resource Url for GetLocationInventory
         /// </summary>
-        /// <param name="locationCode">The unique, user-defined code that identifies a location. </param>
-        /// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="locationCode">User-defined code that uniquely identifies the location.</param>
+        /// <param name="productCode"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -38,13 +38,13 @@ public static MozuUrl GetLocationInventoryUrl(string locationCode, string produc
 		/// <summary>
         /// Get Resource Url for GetLocationInventories
         /// </summary>
-        /// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-        /// <param name="filterFunctions">Functions that optimize commonly used filters for efficiency.For the  operation, you have access to the  filter function. For example, use  to filter only for product inventory that is currently active.</param>
-        /// <param name="locationCode">The unique, user-defined code that identifies a location. </param>
-        /// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-        /// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+        /// <param name="filter"></param>
+        /// <param name="filterFunctions"></param>
+        /// <param name="locationCode"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="sortBy"></param>
+        /// <param name="startIndex"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -65,8 +65,8 @@ public static MozuUrl GetLocationInventoriesUrl(string locationCode, int? startI
 				/// <summary>
         /// Get Resource Url for AddLocationInventory
         /// </summary>
-        /// <param name="locationCode">The unique, user-defined code that identifies a location. </param>
-        /// <param name="performUpserts">Query string parameter lets the service perform an update for a new or existing record. When run, the update occurs without throwing a conflict exception that the record exists. If true, the updates completes regardless of the record currently existing. By default, if no value is specified, the service assumes this value is false.</param>
+        /// <param name="locationCode">User-defined code that uniquely identifies the location.</param>
+        /// <param name="performUpserts"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -82,7 +82,7 @@ public static MozuUrl AddLocationInventoryUrl(string locationCode, bool? perform
 				/// <summary>
         /// Get Resource Url for UpdateLocationInventory
         /// </summary>
-        /// <param name="locationCode">The unique, user-defined code that identifies a location. </param>
+        /// <param name="locationCode">User-defined code that uniquely identifies the location.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -97,8 +97,8 @@ public static MozuUrl UpdateLocationInventoryUrl(string locationCode)
 				/// <summary>
         /// Get Resource Url for DeleteLocationInventory
         /// </summary>
-        /// <param name="locationCode">The unique, user-defined code that identifies a location. </param>
-        /// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
+        /// <param name="locationCode">User-defined code that uniquely identifies the location.</param>
+        /// <param name="productCode"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Catalog/Admin/MasterCatalogUrl.cs b/Mozu.Api/Urls/Commerce/Catalog/Admin/MasterCatalogUrl.cs
old mode 100644
new mode 100755
index ec487f5b..a7c6a0b6
--- a/Mozu.Api/Urls/Commerce/Catalog/Admin/MasterCatalogUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Catalog/Admin/MasterCatalogUrl.cs
@@ -19,7 +19,7 @@ public partial class MasterCatalogUrl
 		/// <summary>
         /// Get Resource Url for GetMasterCatalogs
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -34,8 +34,8 @@ public static MozuUrl GetMasterCatalogsUrl(string responseFields =  null)
 		/// <summary>
         /// Get Resource Url for GetMasterCatalog
         /// </summary>
-        /// <param name="masterCatalogId">The unique identifier of the master catalog associated with the entity.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="masterCatalogId"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -52,7 +52,7 @@ public static MozuUrl GetMasterCatalogUrl(int masterCatalogId, string responseFi
         /// Get Resource Url for UpdateMasterCatalog
         /// </summary>
         /// <param name="masterCatalogId"></param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Catalog/Admin/PriceListUrl.cs b/Mozu.Api/Urls/Commerce/Catalog/Admin/PriceListUrl.cs
old mode 100644
new mode 100755
index 370fe1b5..a8489772
--- a/Mozu.Api/Urls/Commerce/Catalog/Admin/PriceListUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Catalog/Admin/PriceListUrl.cs
@@ -19,11 +19,11 @@ public partial class PriceListUrl
 		/// <summary>
         /// Get Resource Url for GetPriceLists
         /// </summary>
-        /// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-        /// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-        /// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-        /// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
+        /// <param name="filter"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="sortBy"></param>
+        /// <param name="startIndex"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -42,8 +42,8 @@ public static MozuUrl GetPriceListsUrl(int? startIndex =  null, int? pageSize =
 		/// <summary>
         /// Get Resource Url for GetPriceList
         /// </summary>
-        /// <param name="priceListCode">The unique, user-defined code of the price list.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="priceListCode"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -59,7 +59,7 @@ public static MozuUrl GetPriceListUrl(string priceListCode, string responseField
 				/// <summary>
         /// Get Resource Url for AddPriceList
         /// </summary>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -74,8 +74,8 @@ public static MozuUrl AddPriceListUrl(string responseFields =  null)
 		/// <summary>
         /// Get Resource Url for BulkAddPriceListEntries
         /// </summary>
-        /// <param name="invalidateCache">Disable this property if you expect to encounter unacceptable performance hits related to clearing the cache for each product in the price list entries. Otherwise, leave this property enabled.</param>
-        /// <param name="publishEvents">Disable this property to prevent publishing the event related to adding price list entries to the system. Disabling this property helps you prevent performance delays if you expect the event to trigger the re-indexing of a large number of products, or if you want to postpone the operations of other applications and services listening for the event.</param>
+        /// <param name="invalidateCache"></param>
+        /// <param name="publishEvents"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -91,8 +91,8 @@ public static MozuUrl BulkAddPriceListEntriesUrl(bool? publishEvents =  null, bo
 		/// <summary>
         /// Get Resource Url for BulkDeletePriceListEntries
         /// </summary>
-        /// <param name="invalidateCache">Disable this property if you expect to encounter unacceptable performance hits related to clearing the cache for each product in the price list entries. Otherwise, leave this property enabled.</param>
-        /// <param name="publishEvents">Disable this property to prevent publishing the event related to deleting price list entries from the system. Disabling this property helps you prevent performance delays if you expect the event to trigger the re-indexing of a large number of products, or if you want to postpone the operations of other applications and services listening for the event.</param>
+        /// <param name="invalidateCache"></param>
+        /// <param name="publishEvents"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -108,8 +108,8 @@ public static MozuUrl BulkDeletePriceListEntriesUrl(bool? publishEvents =  null,
 		/// <summary>
         /// Get Resource Url for BulkUpdatePriceListEntries
         /// </summary>
-        /// <param name="invalidateCache">Disable this property if you expect to encounter unacceptable performance hits related to clearing the cache for each product in the price list entries. Otherwise, leave this property enabled.</param>
-        /// <param name="publishEvents">Disable this property to prevent publishing the event related to updating price list entries in the system. Disabling this property helps you prevent performance delays if you expect the event to trigger the re-indexing of a large number of products, or if you want to postpone the operations of other applications and services listening for the event.</param>
+        /// <param name="invalidateCache"></param>
+        /// <param name="publishEvents"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -125,8 +125,8 @@ public static MozuUrl BulkUpdatePriceListEntriesUrl(bool? publishEvents =  null,
 				/// <summary>
         /// Get Resource Url for UpdatePriceList
         /// </summary>
-        /// <param name="priceListCode">The unique, user-defined code of the price list.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="priceListCode"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -142,8 +142,8 @@ public static MozuUrl UpdatePriceListUrl(string priceListCode, string responseFi
 				/// <summary>
         /// Get Resource Url for DeletePriceList
         /// </summary>
-        /// <param name="cascadeDeleteEntries">Specifies whether to deletes all price list entries associated with the price list.</param>
-        /// <param name="priceListCode">The unique, user-defined code of the price list.</param>
+        /// <param name="cascadeDeleteEntries"></param>
+        /// <param name="priceListCode"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Catalog/Admin/Pricelists/PriceListEntryUrl.cs b/Mozu.Api/Urls/Commerce/Catalog/Admin/Pricelists/PriceListEntryUrl.cs
old mode 100644
new mode 100755
index d9d74d91..a85b6aab
--- a/Mozu.Api/Urls/Commerce/Catalog/Admin/Pricelists/PriceListEntryUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Catalog/Admin/Pricelists/PriceListEntryUrl.cs
@@ -19,11 +19,11 @@ public partial class PriceListEntryUrl
 		/// <summary>
         /// Get Resource Url for GetPriceListEntry
         /// </summary>
-        /// <param name="currencyCode">The three character ISO currency code, such as USD for US Dollars.</param>
-        /// <param name="priceListCode">The unique code of the price list associated with the price list entry.</param>
-        /// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-        /// <param name="startDate">The start date of the price list entry.</param>
+        /// <param name="currencyCode"></param>
+        /// <param name="priceListCode"></param>
+        /// <param name="productCode"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="startDate"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -42,12 +42,12 @@ public static MozuUrl GetPriceListEntryUrl(string priceListCode, string productC
 		/// <summary>
         /// Get Resource Url for GetPriceListEntries
         /// </summary>
-        /// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-        /// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-        /// <param name="priceListCode">The unique code of the price list associated with the price list entry.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-        /// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-        /// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
+        /// <param name="filter"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="priceListCode"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="sortBy"></param>
+        /// <param name="startIndex"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -67,8 +67,8 @@ public static MozuUrl GetPriceListEntriesUrl(string priceListCode, int? startInd
 				/// <summary>
         /// Get Resource Url for AddPriceListEntry
         /// </summary>
-        /// <param name="priceListCode">The specified price list to which you want to add the price list entry.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="priceListCode"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -84,11 +84,11 @@ public static MozuUrl AddPriceListEntryUrl(string priceListCode, string response
 				/// <summary>
         /// Get Resource Url for UpdatePriceListEntry
         /// </summary>
-        /// <param name="currencyCode">The three character ISO currency code, such as USD for US Dollars.</param>
-        /// <param name="priceListCode">The unique code of the price list associated with the price list entry.</param>
-        /// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-        /// <param name="startDate">The start date of the price list entry.</param>
+        /// <param name="currencyCode"></param>
+        /// <param name="priceListCode"></param>
+        /// <param name="productCode"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="startDate"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -107,10 +107,10 @@ public static MozuUrl UpdatePriceListEntryUrl(string priceListCode, string produ
 				/// <summary>
         /// Get Resource Url for DeletePriceListEntry
         /// </summary>
-        /// <param name="currencyCode">The three character ISO currency code, such as USD for US Dollars.</param>
-        /// <param name="priceListCode">The code of the specified price list associated with the price list entry.</param>
-        /// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-        /// <param name="startDate">The start date of the price list entry.</param>
+        /// <param name="currencyCode"></param>
+        /// <param name="priceListCode"></param>
+        /// <param name="productCode"></param>
+        /// <param name="startDate"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Catalog/Admin/ProductReservationUrl.cs b/Mozu.Api/Urls/Commerce/Catalog/Admin/ProductReservationUrl.cs
old mode 100644
new mode 100755
index 21884532..4625e6a6
--- a/Mozu.Api/Urls/Commerce/Catalog/Admin/ProductReservationUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Catalog/Admin/ProductReservationUrl.cs
@@ -19,10 +19,10 @@ public partial class ProductReservationUrl
 		/// <summary>
         /// Get Resource Url for GetProductReservations
         /// </summary>
-        /// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-        /// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="sortBy"></param>
+        /// <param name="filter"></param>
+        /// <param name="pageSize">Used to page results from a query. Indicates the maximum number of entities to return from a query. Default value: 20. Max value: 200.</param>
+        /// <param name="responseFields"></param>
+        /// <param name="sortBy">The element to sort the results by and the order in which the results appear. Either ascending order (a-z) which accepts 'asc' or 'asc' or descending order (z-a) which accepts 'desc' or 'desc'. The sortBy parameter follows an available property.</param>
         /// <param name="startIndex"></param>
         /// <returns>
         /// String - Resource Url
@@ -43,7 +43,7 @@ public static MozuUrl GetProductReservationsUrl(int? startIndex =  null, int? pa
         /// Get Resource Url for GetProductReservation
         /// </summary>
         /// <param name="productReservationId">Unique identifier of the product reservation.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -87,7 +87,7 @@ public static MozuUrl CommitReservationsUrl()
 				/// <summary>
         /// Get Resource Url for UpdateProductReservations
         /// </summary>
-        /// <param name="skipInventoryCheck">If true, skip the process to validate inventory when creating this product reservation.</param>
+        /// <param name="skipInventoryCheck">If true, skip the inventory validation process when updating this product reservation.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -102,7 +102,7 @@ public static MozuUrl UpdateProductReservationsUrl(bool? skipInventoryCheck =  n
 				/// <summary>
         /// Get Resource Url for DeleteProductReservation
         /// </summary>
-        /// <param name="productReservationId">Unique identifier of the product reservation.</param>
+        /// <param name="productReservationId">Unique identifier of the reservation.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Catalog/Admin/ProductUrl.cs b/Mozu.Api/Urls/Commerce/Catalog/Admin/ProductUrl.cs
old mode 100644
new mode 100755
index 233f0089..2fa46592
--- a/Mozu.Api/Urls/Commerce/Catalog/Admin/ProductUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Catalog/Admin/ProductUrl.cs
@@ -19,12 +19,12 @@ public partial class ProductUrl
 		/// <summary>
         /// Get Resource Url for GetProducts
         /// </summary>
-        /// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
+        /// <param name="filter"></param>
         /// <param name="noCount">If true, the operation does not return the TotalCount number of results.</param>
-        /// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-        /// <param name="q">A list of order search terms (not phrases) to use in the query when searching across order number and the name or email of the billing contact. When entering, separate multiple search terms with a space character.</param>
+        /// <param name="pageSize"></param>
+        /// <param name="q">A list of product search terms to use in the query when searching across product code and product name. Separate multiple search terms with a space character.</param>
         /// <param name="qLimit">The maximum number of search results to return in the response. You can limit any range between 1-100.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <param name="sortBy"></param>
         /// <param name="startIndex"></param>
         /// <returns>
@@ -48,7 +48,7 @@ public static MozuUrl GetProductsUrl(int? startIndex =  null, int? pageSize =  n
 		/// <summary>
         /// Get Resource Url for GetProductInCatalogs
         /// </summary>
-        /// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
+        /// <param name="productCode"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -63,9 +63,9 @@ public static MozuUrl GetProductInCatalogsUrl(string productCode)
 		/// <summary>
         /// Get Resource Url for GetProductInCatalog
         /// </summary>
-        /// <param name="catalogId">The unique identifier of the catalog of products used by a site.</param>
-        /// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="catalogId"></param>
+        /// <param name="productCode"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -82,8 +82,8 @@ public static MozuUrl GetProductInCatalogUrl(string productCode, int catalogId,
 		/// <summary>
         /// Get Resource Url for GetProduct
         /// </summary>
-        /// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="productCode"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -99,7 +99,7 @@ public static MozuUrl GetProductUrl(string productCode, string responseFields =
 				/// <summary>
         /// Get Resource Url for AddProduct
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -114,8 +114,8 @@ public static MozuUrl AddProductUrl(string responseFields =  null)
 		/// <summary>
         /// Get Resource Url for AddProductInCatalog
         /// </summary>
-        /// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="productCode"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -144,7 +144,7 @@ public static MozuUrl RenameProductCodesUrl()
 				/// <summary>
         /// Get Resource Url for UpdateProductInCatalogs
         /// </summary>
-        /// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
+        /// <param name="productCode"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -159,9 +159,9 @@ public static MozuUrl UpdateProductInCatalogsUrl(string productCode)
 		/// <summary>
         /// Get Resource Url for UpdateProductInCatalog
         /// </summary>
-        /// <param name="catalogId">The unique identifier of the catalog of products used by a site.</param>
-        /// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="catalogId"></param>
+        /// <param name="productCode"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -178,8 +178,8 @@ public static MozuUrl UpdateProductInCatalogUrl(string productCode, int catalogI
 		/// <summary>
         /// Get Resource Url for UpdateProduct
         /// </summary>
-        /// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="productCode"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -195,7 +195,7 @@ public static MozuUrl UpdateProductUrl(string productCode, string responseFields
 				/// <summary>
         /// Get Resource Url for DeleteProduct
         /// </summary>
-        /// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
+        /// <param name="productCode"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -210,8 +210,8 @@ public static MozuUrl DeleteProductUrl(string productCode)
 		/// <summary>
         /// Get Resource Url for DeleteProductInCatalog
         /// </summary>
-        /// <param name="catalogId">The unique identifier of the catalog of products used by a site.</param>
-        /// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
+        /// <param name="catalogId"></param>
+        /// <param name="productCode"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Catalog/Admin/Products/LocationInventoryUrl.cs b/Mozu.Api/Urls/Commerce/Catalog/Admin/Products/LocationInventoryUrl.cs
old mode 100644
new mode 100755
index 2c227ab0..aa36bf1c
--- a/Mozu.Api/Urls/Commerce/Catalog/Admin/Products/LocationInventoryUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Catalog/Admin/Products/LocationInventoryUrl.cs
@@ -19,12 +19,12 @@ public partial class LocationInventoryUrl
 		/// <summary>
         /// Get Resource Url for GetLocationInventories
         /// </summary>
-        /// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-        /// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-        /// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-        /// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+        /// <param name="filter"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="productCode"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="sortBy"></param>
+        /// <param name="startIndex"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -44,9 +44,9 @@ public static MozuUrl GetLocationInventoriesUrl(string productCode, int? startIn
 		/// <summary>
         /// Get Resource Url for GetLocationInventory
         /// </summary>
-        /// <param name="locationCode">The unique, user-defined code that identifies a location. </param>
-        /// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="locationCode">User-defined code that identifies the location.</param>
+        /// <param name="productCode"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -63,8 +63,8 @@ public static MozuUrl GetLocationInventoryUrl(string productCode, string locatio
 				/// <summary>
         /// Get Resource Url for AddLocationInventory
         /// </summary>
-        /// <param name="performUpserts">Query string parameter lets the service perform an update for a new or existing record. When run, the update occurs without throwing a conflict exception that the record exists. If true, the updates completes regardless of the record currently existing. By default, if no value is specified, the service assumes this value is false.</param>
-        /// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
+        /// <param name="performUpserts">The performUpserts query string parameter lets the service perform an update if the record already exists instead of throwing an already exists conflict exception. PerformUpserts=true means it updates if the record already exists. By default, no value specified means that the service assumes PerformUpserts=false.</param>
+        /// <param name="productCode"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -80,7 +80,7 @@ public static MozuUrl AddLocationInventoryUrl(string productCode, bool? performU
 				/// <summary>
         /// Get Resource Url for UpdateLocationInventory
         /// </summary>
-        /// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
+        /// <param name="productCode">The product code of the product for which to update active stock on hand inventory at a specified location.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -95,8 +95,8 @@ public static MozuUrl UpdateLocationInventoryUrl(string productCode)
 				/// <summary>
         /// Get Resource Url for DeleteLocationInventory
         /// </summary>
-        /// <param name="locationCode">The unique, user-defined code that identifies a location. </param>
-        /// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
+        /// <param name="locationCode">The code that identifies the location for which to delete product inventory.</param>
+        /// <param name="productCode">The product code for which to delete a location's inventory.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Catalog/Admin/Products/ProductExtraUrl.cs b/Mozu.Api/Urls/Commerce/Catalog/Admin/Products/ProductExtraUrl.cs
old mode 100644
new mode 100755
index 4f29e4c9..88dd91e0
--- a/Mozu.Api/Urls/Commerce/Catalog/Admin/Products/ProductExtraUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Catalog/Admin/Products/ProductExtraUrl.cs
@@ -19,7 +19,7 @@ public partial class ProductExtraUrl
 		/// <summary>
         /// Get Resource Url for GetExtras
         /// </summary>
-        /// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
+        /// <param name="productCode"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -34,9 +34,9 @@ public static MozuUrl GetExtrasUrl(string productCode)
 		/// <summary>
         /// Get Resource Url for GetExtraValueLocalizedDeltaPrices
         /// </summary>
-        /// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-        /// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-        /// <param name="value">The value string to create.</param>
+        /// <param name="attributeFQN"></param>
+        /// <param name="productCode"></param>
+        /// <param name="value"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -53,11 +53,11 @@ public static MozuUrl GetExtraValueLocalizedDeltaPricesUrl(string productCode, s
 		/// <summary>
         /// Get Resource Url for GetExtraValueLocalizedDeltaPrice
         /// </summary>
-        /// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-        /// <param name="currencyCode">The three character ISO currency code, such as USD for US Dollars.</param>
-        /// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="value">The value string to create.</param>
+        /// <param name="attributeFQN"></param>
+        /// <param name="currencyCode"></param>
+        /// <param name="productCode"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="value"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -76,9 +76,9 @@ public static MozuUrl GetExtraValueLocalizedDeltaPriceUrl(string productCode, st
 		/// <summary>
         /// Get Resource Url for GetExtra
         /// </summary>
-        /// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-        /// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="attributeFQN"></param>
+        /// <param name="productCode"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -95,10 +95,10 @@ public static MozuUrl GetExtraUrl(string productCode, string attributeFQN, strin
 				/// <summary>
         /// Get Resource Url for AddExtraValueLocalizedDeltaPrice
         /// </summary>
-        /// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-        /// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="value">The value string to create.</param>
+        /// <param name="attributeFQN"></param>
+        /// <param name="productCode"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="value"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -116,8 +116,8 @@ public static MozuUrl AddExtraValueLocalizedDeltaPriceUrl(string productCode, st
 		/// <summary>
         /// Get Resource Url for AddExtra
         /// </summary>
-        /// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="productCode"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -133,9 +133,9 @@ public static MozuUrl AddExtraUrl(string productCode, string responseFields =  n
 				/// <summary>
         /// Get Resource Url for UpdateExtraValueLocalizedDeltaPrices
         /// </summary>
-        /// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-        /// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-        /// <param name="value">The value string to create.</param>
+        /// <param name="attributeFQN"></param>
+        /// <param name="productCode"></param>
+        /// <param name="value"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -152,11 +152,11 @@ public static MozuUrl UpdateExtraValueLocalizedDeltaPricesUrl(string productCode
 		/// <summary>
         /// Get Resource Url for UpdateExtraValueLocalizedDeltaPrice
         /// </summary>
-        /// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-        /// <param name="currencyCode">The three character ISO currency code, such as USD for US Dollars.</param>
-        /// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="value">The value string to create.</param>
+        /// <param name="attributeFQN"></param>
+        /// <param name="currencyCode"></param>
+        /// <param name="productCode"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="value"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -175,9 +175,9 @@ public static MozuUrl UpdateExtraValueLocalizedDeltaPriceUrl(string productCode,
 		/// <summary>
         /// Get Resource Url for UpdateExtra
         /// </summary>
-        /// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-        /// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="attributeFQN"></param>
+        /// <param name="productCode"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -194,8 +194,8 @@ public static MozuUrl UpdateExtraUrl(string productCode, string attributeFQN, st
 				/// <summary>
         /// Get Resource Url for DeleteExtra
         /// </summary>
-        /// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-        /// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
+        /// <param name="attributeFQN"></param>
+        /// <param name="productCode"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -211,10 +211,10 @@ public static MozuUrl DeleteExtraUrl(string productCode, string attributeFQN)
 		/// <summary>
         /// Get Resource Url for DeleteExtraValueLocalizedDeltaPrice
         /// </summary>
-        /// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-        /// <param name="currencyCode">The three character ISO currency code, such as USD for US Dollars.</param>
-        /// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-        /// <param name="value">Use this field to include those fields which are not included by default.</param>
+        /// <param name="attributeFQN"></param>
+        /// <param name="currencyCode"></param>
+        /// <param name="productCode"></param>
+        /// <param name="value"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Catalog/Admin/Products/ProductOptionUrl.cs b/Mozu.Api/Urls/Commerce/Catalog/Admin/Products/ProductOptionUrl.cs
old mode 100644
new mode 100755
index e6a68aec..b756b099
--- a/Mozu.Api/Urls/Commerce/Catalog/Admin/Products/ProductOptionUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Catalog/Admin/Products/ProductOptionUrl.cs
@@ -19,7 +19,7 @@ public partial class ProductOptionUrl
 		/// <summary>
         /// Get Resource Url for GetOptions
         /// </summary>
-        /// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
+        /// <param name="productCode"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -34,9 +34,9 @@ public static MozuUrl GetOptionsUrl(string productCode)
 		/// <summary>
         /// Get Resource Url for GetOption
         /// </summary>
-        /// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-        /// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="attributeFQN"></param>
+        /// <param name="productCode"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -53,8 +53,8 @@ public static MozuUrl GetOptionUrl(string productCode, string attributeFQN, stri
 				/// <summary>
         /// Get Resource Url for AddOption
         /// </summary>
-        /// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="productCode"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -70,9 +70,9 @@ public static MozuUrl AddOptionUrl(string productCode, string responseFields =
 				/// <summary>
         /// Get Resource Url for UpdateOption
         /// </summary>
-        /// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-        /// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="attributeFQN"></param>
+        /// <param name="productCode"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -89,8 +89,8 @@ public static MozuUrl UpdateOptionUrl(string productCode, string attributeFQN, s
 				/// <summary>
         /// Get Resource Url for DeleteOption
         /// </summary>
-        /// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-        /// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
+        /// <param name="attributeFQN"></param>
+        /// <param name="productCode"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Catalog/Admin/Products/ProductPropertyUrl.cs b/Mozu.Api/Urls/Commerce/Catalog/Admin/Products/ProductPropertyUrl.cs
old mode 100644
new mode 100755
index f0816451..2303a74f
--- a/Mozu.Api/Urls/Commerce/Catalog/Admin/Products/ProductPropertyUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Catalog/Admin/Products/ProductPropertyUrl.cs
@@ -19,7 +19,7 @@ public partial class ProductPropertyUrl
 		/// <summary>
         /// Get Resource Url for GetProperties
         /// </summary>
-        /// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
+        /// <param name="productCode"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -34,9 +34,9 @@ public static MozuUrl GetPropertiesUrl(string productCode)
 		/// <summary>
         /// Get Resource Url for GetPropertyValueLocalizedContents
         /// </summary>
-        /// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-        /// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-        /// <param name="value">The value string to create.</param>
+        /// <param name="attributeFQN"></param>
+        /// <param name="productCode"></param>
+        /// <param name="value"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -53,11 +53,11 @@ public static MozuUrl GetPropertyValueLocalizedContentsUrl(string productCode, s
 		/// <summary>
         /// Get Resource Url for GetPropertyValueLocalizedContent
         /// </summary>
-        /// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-        /// <param name="localeCode">Language used for the entity. Currently, only "en-US" is supported.</param>
-        /// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="value">The value string to create.</param>
+        /// <param name="attributeFQN"></param>
+        /// <param name="localeCode"></param>
+        /// <param name="productCode"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="value"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -76,9 +76,9 @@ public static MozuUrl GetPropertyValueLocalizedContentUrl(string productCode, st
 		/// <summary>
         /// Get Resource Url for GetProperty
         /// </summary>
-        /// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-        /// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="attributeFQN"></param>
+        /// <param name="productCode"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -95,10 +95,10 @@ public static MozuUrl GetPropertyUrl(string productCode, string attributeFQN, st
 				/// <summary>
         /// Get Resource Url for AddPropertyValueLocalizedContent
         /// </summary>
-        /// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-        /// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="value">The value string to create.</param>
+        /// <param name="attributeFQN"></param>
+        /// <param name="productCode"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="value"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -116,8 +116,8 @@ public static MozuUrl AddPropertyValueLocalizedContentUrl(string productCode, st
 		/// <summary>
         /// Get Resource Url for AddProperty
         /// </summary>
-        /// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="productCode"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -133,9 +133,9 @@ public static MozuUrl AddPropertyUrl(string productCode, string responseFields =
 				/// <summary>
         /// Get Resource Url for UpdatePropertyValueLocalizedContents
         /// </summary>
-        /// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-        /// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-        /// <param name="value">The value string to create.</param>
+        /// <param name="attributeFQN"></param>
+        /// <param name="productCode"></param>
+        /// <param name="value"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -152,11 +152,11 @@ public static MozuUrl UpdatePropertyValueLocalizedContentsUrl(string productCode
 		/// <summary>
         /// Get Resource Url for UpdatePropertyValueLocalizedContent
         /// </summary>
-        /// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-        /// <param name="localeCode">Language used for the entity. Currently, only "en-US" is supported.</param>
-        /// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="value">The value string to create.</param>
+        /// <param name="attributeFQN"></param>
+        /// <param name="localeCode"></param>
+        /// <param name="productCode"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="value"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -175,9 +175,9 @@ public static MozuUrl UpdatePropertyValueLocalizedContentUrl(string productCode,
 		/// <summary>
         /// Get Resource Url for UpdateProperty
         /// </summary>
-        /// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-        /// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="attributeFQN"></param>
+        /// <param name="productCode"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -194,8 +194,8 @@ public static MozuUrl UpdatePropertyUrl(string productCode, string attributeFQN,
 				/// <summary>
         /// Get Resource Url for DeleteProperty
         /// </summary>
-        /// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-        /// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
+        /// <param name="attributeFQN"></param>
+        /// <param name="productCode"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -211,10 +211,10 @@ public static MozuUrl DeletePropertyUrl(string productCode, string attributeFQN)
 		/// <summary>
         /// Get Resource Url for DeletePropertyValueLocalizedContent
         /// </summary>
-        /// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-        /// <param name="localeCode">Language used for the entity. Currently, only "en-US" is supported.</param>
-        /// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-        /// <param name="value">The value string to create.</param>
+        /// <param name="attributeFQN"></param>
+        /// <param name="localeCode"></param>
+        /// <param name="productCode"></param>
+        /// <param name="value"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Catalog/Admin/Products/ProductVariationUrl.cs b/Mozu.Api/Urls/Commerce/Catalog/Admin/Products/ProductVariationUrl.cs
old mode 100644
new mode 100755
index d93e5ee1..c79e5cd4
--- a/Mozu.Api/Urls/Commerce/Catalog/Admin/Products/ProductVariationUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Catalog/Admin/Products/ProductVariationUrl.cs
@@ -19,8 +19,8 @@ public partial class ProductVariationUrl
 		/// <summary>
         /// Get Resource Url for GetProductVariationLocalizedDeltaPrices
         /// </summary>
-        /// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-        /// <param name="variationKey">System-generated key that represents the attribute values that uniquely identify a specific product variation.</param>
+        /// <param name="productCode"></param>
+        /// <param name="variationKey"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -36,10 +36,10 @@ public static MozuUrl GetProductVariationLocalizedDeltaPricesUrl(string productC
 		/// <summary>
         /// Get Resource Url for GetProductVariationLocalizedDeltaPrice
         /// </summary>
-        /// <param name="currencyCode">The three character ISO currency code, such as USD for US Dollars.</param>
-        /// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="variationKey">System-generated key that represents the attribute values that uniquely identify a specific product variation.</param>
+        /// <param name="currencyCode"></param>
+        /// <param name="productCode"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="variationKey"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -57,8 +57,8 @@ public static MozuUrl GetProductVariationLocalizedDeltaPriceUrl(string productCo
 		/// <summary>
         /// Get Resource Url for GetProductVariationLocalizedPrices
         /// </summary>
-        /// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-        /// <param name="variationKey">System-generated key that represents the attribute values that uniquely identify a specific product variation.</param>
+        /// <param name="productCode"></param>
+        /// <param name="variationKey"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -74,10 +74,10 @@ public static MozuUrl GetProductVariationLocalizedPricesUrl(string productCode,
 		/// <summary>
         /// Get Resource Url for GetProductVariationLocalizedPrice
         /// </summary>
-        /// <param name="currencyCode">The three character ISO currency code, such as USD for US Dollars.</param>
-        /// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-        /// <param name="variationKey">System-generated key that represents the attribute values that uniquely identify a specific product variation.</param>
+        /// <param name="currencyCode"></param>
+        /// <param name="productCode"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="variationKey"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -95,8 +95,8 @@ public static MozuUrl GetProductVariationLocalizedPriceUrl(string productCode, s
 		/// <summary>
         /// Get Resource Url for GetProductVariation
         /// </summary>
-        /// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="productCode"></param>
+        /// <param name="responseFields"></param>
         /// <param name="variationKey">System-generated key that represents the attribute values that uniquely identify a specific product variation.</param>
         /// <returns>
         /// String - Resource Url
@@ -114,12 +114,12 @@ public static MozuUrl GetProductVariationUrl(string productCode, string variatio
 		/// <summary>
         /// Get Resource Url for GetProductVariations
         /// </summary>
-        /// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-        /// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-        /// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-        /// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+        /// <param name="filter"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="productCode"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="sortBy"></param>
+        /// <param name="startIndex"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -139,9 +139,9 @@ public static MozuUrl GetProductVariationsUrl(string productCode, int? startInde
 				/// <summary>
         /// Get Resource Url for AddProductVariationLocalizedDeltaPrice
         /// </summary>
-        /// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="variationKey">System-generated key that represents the attribute values that uniquely identify a specific product variation.</param>
+        /// <param name="productCode"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="variationKey"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -158,9 +158,9 @@ public static MozuUrl AddProductVariationLocalizedDeltaPriceUrl(string productCo
 		/// <summary>
         /// Get Resource Url for AddProductVariationLocalizedPrice
         /// </summary>
-        /// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-        /// <param name="variationKey">System-generated key that represents the attribute values that uniquely identify a specific product variation.</param>
+        /// <param name="productCode"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="variationKey"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -177,8 +177,8 @@ public static MozuUrl AddProductVariationLocalizedPriceUrl(string productCode, s
 				/// <summary>
         /// Get Resource Url for UpdateProductVariationLocalizedDeltaPrices
         /// </summary>
-        /// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-        /// <param name="variationKey">System-generated key that represents the attribute values that uniquely identify a specific product variation.</param>
+        /// <param name="productCode"></param>
+        /// <param name="variationKey"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -194,10 +194,10 @@ public static MozuUrl UpdateProductVariationLocalizedDeltaPricesUrl(string produ
 		/// <summary>
         /// Get Resource Url for UpdateProductVariationLocalizedDeltaPrice
         /// </summary>
-        /// <param name="currencyCode">The three character ISO currency code, such as USD for US Dollars.</param>
-        /// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="variationKey">System-generated key that represents the attribute values that uniquely identify a specific product variation.</param>
+        /// <param name="currencyCode"></param>
+        /// <param name="productCode"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="variationKey"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -215,8 +215,8 @@ public static MozuUrl UpdateProductVariationLocalizedDeltaPriceUrl(string produc
 		/// <summary>
         /// Get Resource Url for UpdateProductVariationLocalizedPrices
         /// </summary>
-        /// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-        /// <param name="variationKey">System-generated key that represents the attribute values that uniquely identify a specific product variation.</param>
+        /// <param name="productCode"></param>
+        /// <param name="variationKey"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -232,10 +232,10 @@ public static MozuUrl UpdateProductVariationLocalizedPricesUrl(string productCod
 		/// <summary>
         /// Get Resource Url for UpdateProductVariationLocalizedPrice
         /// </summary>
-        /// <param name="currencyCode">The three character ISO currency code, such as USD for US Dollars.</param>
-        /// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-        /// <param name="variationKey">System-generated key that represents the attribute values that uniquely identify a specific product variation.</param>
+        /// <param name="currencyCode"></param>
+        /// <param name="productCode"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="variationKey"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -253,8 +253,8 @@ public static MozuUrl UpdateProductVariationLocalizedPriceUrl(string productCode
 		/// <summary>
         /// Get Resource Url for UpdateProductVariation
         /// </summary>
-        /// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="productCode"></param>
+        /// <param name="responseFields"></param>
         /// <param name="variationKey">System-generated key that represents the attribute values that uniquely identify a specific product variation.</param>
         /// <returns>
         /// String - Resource Url
@@ -272,8 +272,8 @@ public static MozuUrl UpdateProductVariationUrl(string productCode, string varia
 		/// <summary>
         /// Get Resource Url for UpdateProductVariations
         /// </summary>
-        /// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="productCode"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -289,7 +289,7 @@ public static MozuUrl UpdateProductVariationsUrl(string productCode, string resp
 				/// <summary>
         /// Get Resource Url for DeleteProductVariation
         /// </summary>
-        /// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
+        /// <param name="productCode"></param>
         /// <param name="variationKey">System-generated key that represents the attribute values that uniquely identify a specific product variation.</param>
         /// <returns>
         /// String - Resource Url
@@ -306,9 +306,9 @@ public static MozuUrl DeleteProductVariationUrl(string productCode, string varia
 		/// <summary>
         /// Get Resource Url for DeleteProductVariationLocalizedDeltaPrice
         /// </summary>
-        /// <param name="currencyCode">The three character ISO currency code, such as USD for US Dollars.</param>
-        /// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-        /// <param name="variationKey">System-generated key that represents the attribute values that uniquely identify a specific product variation.</param>
+        /// <param name="currencyCode"></param>
+        /// <param name="productCode"></param>
+        /// <param name="variationKey"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -325,9 +325,9 @@ public static MozuUrl DeleteProductVariationLocalizedDeltaPriceUrl(string produc
 		/// <summary>
         /// Get Resource Url for DeleteProductVariationLocalizedPrice
         /// </summary>
-        /// <param name="currencyCode">The three character ISO currency code, such as USD for US Dollars.</param>
-        /// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-        /// <param name="variationKey">System-generated key that represents the attribute values that uniquely identify a specific product variation.</param>
+        /// <param name="currencyCode"></param>
+        /// <param name="productCode"></param>
+        /// <param name="variationKey"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Catalog/Admin/PublishingScopeUrl.cs b/Mozu.Api/Urls/Commerce/Catalog/Admin/PublishingScopeUrl.cs
old mode 100644
new mode 100755
index 6438c0b7..3b6255cb
--- a/Mozu.Api/Urls/Commerce/Catalog/Admin/PublishingScopeUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Catalog/Admin/PublishingScopeUrl.cs
@@ -19,8 +19,8 @@ public partial class PublishingScopeUrl
 		/// <summary>
         /// Get Resource Url for GetPublishSet
         /// </summary>
-        /// <param name="publishSetCode">The unique identifier of the publish set.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="publishSetCode"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -36,7 +36,7 @@ public static MozuUrl GetPublishSetUrl(string publishSetCode, string responseFie
 		/// <summary>
         /// Get Resource Url for GetPublishSets
         /// </summary>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -77,7 +77,7 @@ public static MozuUrl PublishDraftsUrl()
 		/// <summary>
         /// Get Resource Url for AssignProductsToPublishSet
         /// </summary>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -92,8 +92,8 @@ public static MozuUrl AssignProductsToPublishSetUrl(string responseFields =  nul
 						/// <summary>
         /// Get Resource Url for DeletePublishSet
         /// </summary>
-        /// <param name="discardDrafts">Specifies whether to discard all the drafts assigned to the publish set when the publish set is deleted.</param>
-        /// <param name="publishSetCode">The unique identifier of the publish set.</param>
+        /// <param name="discardDrafts"></param>
+        /// <param name="publishSetCode"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Catalog/Admin/SearchUrl.cs b/Mozu.Api/Urls/Commerce/Catalog/Admin/SearchUrl.cs
old mode 100644
new mode 100755
index 7ae071cf..2d53036f
--- a/Mozu.Api/Urls/Commerce/Catalog/Admin/SearchUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Catalog/Admin/SearchUrl.cs
@@ -19,8 +19,8 @@ public partial class SearchUrl
 		/// <summary>
         /// Get Resource Url for GetSearchTuningRule
         /// </summary>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-        /// <param name="searchTuningRuleCode">The unique identifier of the search tuning rule.</param>
+        /// <param name="responseFields"></param>
+        /// <param name="searchTuningRuleCode"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -36,11 +36,11 @@ public static MozuUrl GetSearchTuningRuleUrl(string searchTuningRuleCode, string
 		/// <summary>
         /// Get Resource Url for GetSearchTuningRules
         /// </summary>
-        /// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-        /// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-        /// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-        /// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
+        /// <param name="filter"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="sortBy"></param>
+        /// <param name="startIndex"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -59,7 +59,7 @@ public static MozuUrl GetSearchTuningRulesUrl(int? startIndex =  null, int? page
 		/// <summary>
         /// Get Resource Url for GetSearchTuningRuleSortFields
         /// </summary>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -74,7 +74,7 @@ public static MozuUrl GetSearchTuningRuleSortFieldsUrl(string responseFields =
 		/// <summary>
         /// Get Resource Url for GetSettings
         /// </summary>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -89,8 +89,8 @@ public static MozuUrl GetSettingsUrl(string responseFields =  null)
 		/// <summary>
         /// Get Resource Url for GetSynonymDefinitionCollection
         /// </summary>
-        /// <param name="localeCode">The two character country code that sets the locale, such as US for United States. Sites, tenants, and catalogs use locale codes for localizing content, such as translated product text per supported country.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="localeCode"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -106,11 +106,11 @@ public static MozuUrl GetSynonymDefinitionCollectionUrl(string localeCode, strin
 		/// <summary>
         /// Get Resource Url for GetSynonymDefinitions
         /// </summary>
-        /// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-        /// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-        /// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-        /// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
+        /// <param name="filter"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="sortBy"></param>
+        /// <param name="startIndex"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -129,8 +129,8 @@ public static MozuUrl GetSynonymDefinitionsUrl(int? startIndex =  null, int? pag
 		/// <summary>
         /// Get Resource Url for GetSynonymDefinition
         /// </summary>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-        /// <param name="synonymId">The unique identifier of the synonym definition.</param>
+        /// <param name="responseFields"></param>
+        /// <param name="synonymId"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -146,7 +146,7 @@ public static MozuUrl GetSynonymDefinitionUrl(int synonymId, string responseFiel
 				/// <summary>
         /// Get Resource Url for AddSearchTuningRule
         /// </summary>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -161,7 +161,7 @@ public static MozuUrl AddSearchTuningRuleUrl(string responseFields =  null)
 		/// <summary>
         /// Get Resource Url for UpdateSearchTuningRuleSortFields
         /// </summary>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -176,8 +176,8 @@ public static MozuUrl UpdateSearchTuningRuleSortFieldsUrl(string responseFields
 		/// <summary>
         /// Get Resource Url for UpdateSynonymDefinitionCollection
         /// </summary>
-        /// <param name="localeCode">The two character country code that sets the locale, such as US for United States. Sites, tenants, and catalogs use locale codes for localizing content, such as translated product text per supported country.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="localeCode"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -193,7 +193,7 @@ public static MozuUrl UpdateSynonymDefinitionCollectionUrl(string localeCode, st
 		/// <summary>
         /// Get Resource Url for AddSynonymDefinition
         /// </summary>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -208,8 +208,8 @@ public static MozuUrl AddSynonymDefinitionUrl(string responseFields =  null)
 				/// <summary>
         /// Get Resource Url for UpdateSearchTuningRule
         /// </summary>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-        /// <param name="searchTuningRuleCode">The unique identifier of the search tuning rule.</param>
+        /// <param name="responseFields"></param>
+        /// <param name="searchTuningRuleCode"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -225,7 +225,7 @@ public static MozuUrl UpdateSearchTuningRuleUrl(string searchTuningRuleCode, str
 		/// <summary>
         /// Get Resource Url for UpdateSettings
         /// </summary>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -240,8 +240,8 @@ public static MozuUrl UpdateSettingsUrl(string responseFields =  null)
 		/// <summary>
         /// Get Resource Url for UpdateSynonymDefinition
         /// </summary>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-        /// <param name="synonymId">The unique identifier of the synonym definition.</param>
+        /// <param name="responseFields"></param>
+        /// <param name="synonymId"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -257,7 +257,7 @@ public static MozuUrl UpdateSynonymDefinitionUrl(int synonymId, string responseF
 				/// <summary>
         /// Get Resource Url for DeleteSearchTuningRule
         /// </summary>
-        /// <param name="searchTuningRuleCode">The unique identifier of the search tuning rule.</param>
+        /// <param name="searchTuningRuleCode"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -272,7 +272,7 @@ public static MozuUrl DeleteSearchTuningRuleUrl(string searchTuningRuleCode)
 		/// <summary>
         /// Get Resource Url for DeleteSynonymDefinition
         /// </summary>
-        /// <param name="synonymId">The unique identifier of the synonym definition.</param>
+        /// <param name="synonymId"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Catalog/Admin/SoftAllocationUrl.cs b/Mozu.Api/Urls/Commerce/Catalog/Admin/SoftAllocationUrl.cs
old mode 100644
new mode 100755
index e15bee73..41cf6760
--- a/Mozu.Api/Urls/Commerce/Catalog/Admin/SoftAllocationUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Catalog/Admin/SoftAllocationUrl.cs
@@ -19,11 +19,11 @@ public partial class SoftAllocationUrl
 		/// <summary>
         /// Get Resource Url for GetSoftAllocations
         /// </summary>
-        /// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-        /// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-        /// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-        /// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
+        /// <param name="filter"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="sortBy"></param>
+        /// <param name="startIndex"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -42,8 +42,8 @@ public static MozuUrl GetSoftAllocationsUrl(int? startIndex =  null, int? pageSi
 		/// <summary>
         /// Get Resource Url for GetSoftAllocation
         /// </summary>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-        /// <param name="softAllocationId">The unique identifier of the soft allocation.</param>
+        /// <param name="responseFields"></param>
+        /// <param name="softAllocationId"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -111,7 +111,7 @@ public static MozuUrl UpdateSoftAllocationsUrl()
 				/// <summary>
         /// Get Resource Url for DeleteSoftAllocation
         /// </summary>
-        /// <param name="softAllocationId">The unique identifier of the soft allocation.</param>
+        /// <param name="softAllocationId"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Catalog/Storefront/CategoryUrl.cs b/Mozu.Api/Urls/Commerce/Catalog/Storefront/CategoryUrl.cs
old mode 100644
new mode 100755
index e1b5c2ea..369f6baa
--- a/Mozu.Api/Urls/Commerce/Catalog/Storefront/CategoryUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Catalog/Storefront/CategoryUrl.cs
@@ -19,9 +19,9 @@ public partial class CategoryUrl
 		/// <summary>
         /// Get Resource Url for GetCategories
         /// </summary>
-        /// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-        /// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. You can filter product category search results by any of its properties, including its position in the category hierarchy. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
+        /// <param name="pageSize"></param>
+        /// <param name="responseFields"></param>
         /// <param name="sortBy"></param>
         /// <param name="startIndex"></param>
         /// <returns>
@@ -43,8 +43,8 @@ public static MozuUrl GetCategoriesUrl(string filter =  null, int? startIndex =
         /// Get Resource Url for GetCategory
         /// </summary>
         /// <param name="allowInactive">If true, allow inactive categories to be retrieved in the category list response. If false, the categories retrieved will not include ones marked inactive.</param>
-        /// <param name="categoryId">Unique identifier for the storefront container used to organize products.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="categoryId">Unique identifier of the product category.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -61,7 +61,7 @@ public static MozuUrl GetCategoryUrl(int categoryId, bool? allowInactive =  null
 		/// <summary>
         /// Get Resource Url for GetCategoryTree
         /// </summary>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Catalog/Storefront/OrderTaxContextUrl.cs b/Mozu.Api/Urls/Commerce/Catalog/Storefront/OrderTaxContextUrl.cs
old mode 100644
new mode 100755
index ae2760db..c9b49bfb
--- a/Mozu.Api/Urls/Commerce/Catalog/Storefront/OrderTaxContextUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Catalog/Storefront/OrderTaxContextUrl.cs
@@ -19,7 +19,7 @@ public partial class OrderTaxContextUrl
 				/// <summary>
         /// Get Resource Url for EstimateTaxes
         /// </summary>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Catalog/Storefront/PriceListUrl.cs b/Mozu.Api/Urls/Commerce/Catalog/Storefront/PriceListUrl.cs
old mode 100644
new mode 100755
index 639f0e5b..f36eef4b
--- a/Mozu.Api/Urls/Commerce/Catalog/Storefront/PriceListUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Catalog/Storefront/PriceListUrl.cs
@@ -19,8 +19,8 @@ public partial class PriceListUrl
 		/// <summary>
         /// Get Resource Url for GetPriceList
         /// </summary>
-        /// <param name="priceListCode">The unique code of the price list for which you want to retrieve the details.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="priceListCode"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -36,8 +36,8 @@ public static MozuUrl GetPriceListUrl(string priceListCode, string responseField
 		/// <summary>
         /// Get Resource Url for GetResolvedPriceList
         /// </summary>
-        /// <param name="customerAccountId">The unique identifier of the customer account for which to retrieve wish lists.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="customerAccountId"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Catalog/Storefront/ProductSearchResultUrl.cs b/Mozu.Api/Urls/Commerce/Catalog/Storefront/ProductSearchResultUrl.cs
old mode 100644
new mode 100755
index c0824ec1..472d5ba8
--- a/Mozu.Api/Urls/Commerce/Catalog/Storefront/ProductSearchResultUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Catalog/Storefront/ProductSearchResultUrl.cs
@@ -19,10 +19,10 @@ public partial class ProductSearchResultUrl
 		/// <summary>
         /// Get Resource Url for GetRandomAccessCursor
         /// </summary>
-        /// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-        /// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-        /// <param name="query">Properties for the product location inventory provided for queries to locate products by their location.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="filter"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="query"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -40,31 +40,31 @@ public static MozuUrl GetRandomAccessCursorUrl(string query =  null, string filt
 		/// <summary>
         /// Get Resource Url for Search
         /// </summary>
-        /// <param name="cursorMark">In your first deep paged request, set this parameter to . Then, in all subsequent requests, set this parameter to the subsequent values of  that's returned in each response to continue paging through the results. Continue this pattern until  is null, which signifies the end of the paged results.</param>
-        /// <param name="enableSearchTuningRules">Enables search tuning rules on your site.</param>
+        /// <param name="cursorMark"></param>
+        /// <param name="enableSearchTuningRules"></param>
         /// <param name="facet">Individually list the facet fields you want to display in a web storefront product search.</param>
         /// <param name="facetFieldRangeQuery">Display a range facet not specified in a template in a web storefront product search by listing the facet field and the range to display.</param>
         /// <param name="facetHierDepth">If filtering using category facets in a hierarchy, the number of category hierarchy levels to return for the facet. This option is only available for category facets.</param>
         /// <param name="facetHierPrefix">If filtering using category facets in a hierarchy, the parent categories you want to skip in the storefront product search. This parameter is only available for category facets.</param>
         /// <param name="facetHierValue">If filtering using category facets in a hierarchy, the category in the hierarchy to begin faceting on. This parameter is only available for category facets.</param>
         /// <param name="facetPageSize">The number of facet values to return for one or more facets.</param>
-        /// <param name="facetPrefix">Use this parameter to filter facet values that are returned by an associated search result by a prefix.For example, to filter on colors that start with b, such as blue, black, or brown you can specify the following:</param>
+        /// <param name="facetPrefix"></param>
         /// <param name="facetSettings">Settings reserved for future facet search functionality on a web storefront product search.</param>
         /// <param name="facetStartIndex">When paging through multiple facets, the startIndex value for each facet.</param>
         /// <param name="facetTemplate">The facet template to use on the storefront. A template displays all facets associated with the template on the web storefront product search. Currently, only category-level facet templates are available.</param>
-        /// <param name="facetTemplateExclude">A comma-separated list of the facets to exclude from the facetTemplate.        </param>
+        /// <param name="facetTemplateExclude"></param>
         /// <param name="facetTemplateSubset">Display a subset of the facets defined in the template specified in facetTemplate parameter.</param>
         /// <param name="facetValueFilter">The facet values to apply to the filter.</param>
-        /// <param name="facetValueSort">Use this parameter to specify facet sorting outside the predefined facet definitions (which require a category). The most common options are:*  (default)—Sorts by product count (highest count first).* —Sorts by lexicographic order. In most cases, this means alphabetical order.The following code demonstrates an example of  sort:</param>
-        /// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-        /// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-        /// <param name="query">Properties for the product location inventory provided for queries to locate products by their location.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="responseOptions">Options you can specify for the response. This parameter is null by default.You can primarily use this parameter to return volume price band information in product details, which you can then display on category pages and search results depanding on your theme configuration. To return volume price band information, set this parameter to .</param>
-        /// <param name="searchSettings">The settings to control product search and indexing behavior.</param>
-        /// <param name="searchTuningRuleCode">The unique identifier of the search tuning rule.</param>
-        /// <param name="searchTuningRuleContext">The category ID that the search tuning rule applies to.</param>
-        /// <param name="sortBy"></param>
+        /// <param name="facetValueSort"></param>
+        /// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. You can filter product search results by any of its properties, including product code, type, category, and name. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=categoryId+eq+12"</param>
+        /// <param name="pageSize">Used to page results from a query. Indicates the maximum number of entities to return from a query. Default value: 12. Max value is 200.</param>
+        /// <param name="query">The terms to search on.</param>
+        /// <param name="responseFields"></param>
+        /// <param name="responseOptions"></param>
+        /// <param name="searchSettings"></param>
+        /// <param name="searchTuningRuleCode"></param>
+        /// <param name="searchTuningRuleContext"></param>
+        /// <param name="sortBy">The element to sort the results by and the order in which the results appear. Either ascending order (a-z) which accepts 'asc' or 'asc' or descending order (z-a) which accepts 'desc' or 'desc'. The sortBy parameter follows an available property.</param>
         /// <param name="startIndex"></param>
         /// <returns>
         /// String - Resource Url
@@ -105,10 +105,10 @@ public static MozuUrl SearchUrl(string query =  null, string filter =  null, str
 		/// <summary>
         /// Get Resource Url for Suggest
         /// </summary>
-        /// <param name="groups">Specifies the group that you want this operation to return in the response. This parameter accepts one or more values, separated by comma.For example, if you set this parameter to , then this operation returns a  object that contains suggestions for products that match the user entered characters in the search field.The valid values for this parameter are the following:*  — Indicates that products should be matched against and returned in the response. The search  value is compared against product name and code. The response contains a  with a name of  and a collection of . Each collection item has a  of Product and contains a  equal to a complete product object.*  — Indicates that categories should be matched against and returned in the response. The search  value is compared to category name.  The response contains a  with a name of  and a collection of . Each collection item has a  of Category and contains a  equal to a complete category object.*  — Indicates that previously used search terms (keywords) should be matched against and returned in the response, sorted by frequency of use. Keep in mind that it is not currently possible to edit or remove search terms that may be considered undesirable via the  API. The response contains a  with a name of  and a collection of . Each collection item has a  of Term and contains a  equal to a string value of the matched search term.The default value is ; however, the  Core Theme only integrates  and ignores the  group.This operation only returns data that is then made available to your theme. If you set this paramter to multiple values,  returns multiple  in the response. Depending on your requirements, you can then customize your theme to display the groups together or as separate lists in the displayed search suggestions.</param>
-        /// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-        /// <param name="query">Properties for the product location inventory provided for queries to locate products by their location.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="groups"></param>
+        /// <param name="pageSize">Indicates the maximum number of entities to return from a query. Default value: 10. Max value: 200.</param>
+        /// <param name="query"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Catalog/Storefront/ProductUrl.cs b/Mozu.Api/Urls/Commerce/Catalog/Storefront/ProductUrl.cs
old mode 100644
new mode 100755
index 34c67b95..1502778f
--- a/Mozu.Api/Urls/Commerce/Catalog/Storefront/ProductUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Catalog/Storefront/ProductUrl.cs
@@ -19,11 +19,11 @@ public partial class ProductUrl
 		/// <summary>
         /// Get Resource Url for GetProducts
         /// </summary>
-        /// <param name="cursorMark">In your first deep paged request, set this parameter to . Then, in all subsequent requests, set this parameter to the subsequent values of  that's returned in each response to continue paging through the results. Continue this pattern until  is null, which signifies the end of the paged results.</param>
-        /// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-        /// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-        /// <param name="responseOptions">Options you can specify for the response. This parameter is null by default.You can primarily use this parameter to return volume price band information in product details, which you can then display on category pages and search results depanding on your theme configuration. To return volume price band information, set this parameter to .</param>
+        /// <param name="cursorMark"></param>
+        /// <param name="filter"></param>
+        /// <param name="pageSize">Used to page results from a query. Indicates the maximum number of entities to return from a single query. Default value: 20. Maximum value: 200.</param>
+        /// <param name="responseFields"></param>
+        /// <param name="responseOptions"></param>
         /// <param name="sortBy"></param>
         /// <param name="startIndex"></param>
         /// <returns>
@@ -47,8 +47,8 @@ public static MozuUrl GetProductsUrl(string filter =  null, int? startIndex =  n
         /// Get Resource Url for GetProductInventory
         /// </summary>
         /// <param name="locationCodes">Array of location codes for which to retrieve product inventory information.</param>
-        /// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="productCode"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -65,24 +65,26 @@ public static MozuUrl GetProductInventoryUrl(string productCode, string location
 		/// <summary>
         /// Get Resource Url for GetProduct
         /// </summary>
-        /// <param name="acceptVariantProductCode">Specifies whether to accept a product variant's code as the .When you set this parameter to , you can pass in a product variant's code in the GetProduct call to retrieve the product variant details that are associated with the base product.</param>
-        /// <param name="allowInactive">If true, allow inactive categories to be retrieved in the category list response. If false, the categories retrieved will not include ones marked inactive.</param>
-        /// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-        /// <param name="quantity">The number of cart items in the shopper's active cart.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-        /// <param name="skipInventoryCheck">If true, skip the process to validate inventory when creating this product reservation.</param>
-        /// <param name="supressOutOfStock404">Specifies whether to supress the 404 error when the product is out of stock.</param>
+        /// <param name="acceptVariantProductCode"></param>
+        /// <param name="allowInactive">If true, returns an inactive product as part of the query.</param>
+        /// <param name="productCode"></param>
+        /// <param name="purchaseLocation"></param>
+        /// <param name="quantity"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="skipInventoryCheck">If true, skip the inventory validation process for the specified product.</param>
+        /// <param name="supressOutOfStock404"></param>
         /// <param name="variationProductCode">Merchant-created code associated with a specific product variation. Variation product codes maintain an association with the base product code.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
-        public static MozuUrl GetProductUrl(string productCode, string variationProductCode =  null, bool? allowInactive =  null, bool? skipInventoryCheck =  null, bool? supressOutOfStock404 =  null, int? quantity =  null, bool? acceptVariantProductCode =  null, string responseFields =  null)
+        public static MozuUrl GetProductUrl(string productCode, string variationProductCode =  null, bool? allowInactive =  null, bool? skipInventoryCheck =  null, bool? supressOutOfStock404 =  null, int? quantity =  null, bool? acceptVariantProductCode =  null, string purchaseLocation =  null, string responseFields =  null)
 		{
-			var url = "/api/commerce/catalog/storefront/products/{productCode}?variationProductCode={variationProductCode}&allowInactive={allowInactive}&skipInventoryCheck={skipInventoryCheck}&supressOutOfStock404={supressOutOfStock404}&quantity={quantity}&acceptVariantProductCode={acceptVariantProductCode}&responseFields={responseFields}";
+			var url = "/api/commerce/catalog/storefront/products/{productCode}?variationProductCode={variationProductCode}&allowInactive={allowInactive}&skipInventoryCheck={skipInventoryCheck}&supressOutOfStock404={supressOutOfStock404}&quantity={quantity}&acceptVariantProductCode={acceptVariantProductCode}&purchaseLocation={purchaseLocation}&responseFields={responseFields}";
 			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
 			mozuUrl.FormatUrl( "acceptVariantProductCode", acceptVariantProductCode);
 			mozuUrl.FormatUrl( "allowInactive", allowInactive);
 			mozuUrl.FormatUrl( "productCode", productCode);
+			mozuUrl.FormatUrl( "purchaseLocation", purchaseLocation);
 			mozuUrl.FormatUrl( "quantity", quantity);
 			mozuUrl.FormatUrl( "responseFields", responseFields);
 			mozuUrl.FormatUrl( "skipInventoryCheck", skipInventoryCheck);
@@ -94,16 +96,16 @@ public static MozuUrl GetProductUrl(string productCode, string variationProductC
 		/// <summary>
         /// Get Resource Url for GetProductForIndexing
         /// </summary>
-        /// <param name="lastModifiedDate">The date when the product was last updated.</param>
-        /// <param name="productCode">The unique, user-defined product code of a product, used throughout  to reference and associate to a product.</param>
-        /// <param name="productVersion">The product version.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="lastModifiedDate"></param>
+        /// <param name="productCode"></param>
+        /// <param name="productVersion"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
         public static MozuUrl GetProductForIndexingUrl(string productCode, long? productVersion =  null, DateTime? lastModifiedDate =  null, string responseFields =  null)
 		{
-			var url = "/api/commerce/catalog/storefront/products/indexing/{productCode}&productVersion={productVersion}&lastModifiedDate={lastModifiedDate}?responseFields={responseFields}";
+			var url = "/api/commerce/catalog/storefront/products/indexing/{productCode}?productVersion={productVersion}&lastModifiedDate={lastModifiedDate}&responseFields={responseFields}";
 			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
 			mozuUrl.FormatUrl( "lastModifiedDate", lastModifiedDate);
 			mozuUrl.FormatUrl( "productCode", productCode);
@@ -116,19 +118,21 @@ public static MozuUrl GetProductForIndexingUrl(string productCode, long? product
         /// Get Resource Url for ConfiguredProduct
         /// </summary>
         /// <param name="includeOptionDetails">If true, the response returns details about the product. If false, returns a product summary such as the product name, price, and sale price.</param>
-        /// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-        /// <param name="quantity">The number of cart items in the shopper's active cart.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-        /// <param name="skipInventoryCheck">If true, skip the process to validate inventory when creating this product reservation.</param>
+        /// <param name="productCode"></param>
+        /// <param name="purchaseLocation"></param>
+        /// <param name="quantity"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="skipInventoryCheck">If true, skip the inventory validation process for the specified product.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
-        public static MozuUrl ConfiguredProductUrl(string productCode, bool? includeOptionDetails =  null, bool? skipInventoryCheck =  null, int? quantity =  null, string responseFields =  null)
+        public static MozuUrl ConfiguredProductUrl(string productCode, bool? includeOptionDetails =  null, bool? skipInventoryCheck =  null, int? quantity =  null, string purchaseLocation =  null, string responseFields =  null)
 		{
-			var url = "/api/commerce/catalog/storefront/products/{productCode}/configure?includeOptionDetails={includeOptionDetails}&skipInventoryCheck={skipInventoryCheck}&quantity={quantity}&responseFields={responseFields}";
+			var url = "/api/commerce/catalog/storefront/products/{productCode}/configure?includeOptionDetails={includeOptionDetails}&skipInventoryCheck={skipInventoryCheck}&quantity={quantity}&purchaseLocation={purchaseLocation}&responseFields={responseFields}";
 			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
 			mozuUrl.FormatUrl( "includeOptionDetails", includeOptionDetails);
 			mozuUrl.FormatUrl( "productCode", productCode);
+			mozuUrl.FormatUrl( "purchaseLocation", purchaseLocation);
 			mozuUrl.FormatUrl( "quantity", quantity);
 			mozuUrl.FormatUrl( "responseFields", responseFields);
 			mozuUrl.FormatUrl( "skipInventoryCheck", skipInventoryCheck);
@@ -138,19 +142,21 @@ public static MozuUrl ConfiguredProductUrl(string productCode, bool? includeOpti
 		/// <summary>
         /// Get Resource Url for ValidateProduct
         /// </summary>
-        /// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-        /// <param name="quantity">The number of cart items in the shopper's active cart.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="skipDefaults">Normally, product validation applies default extras to products that do not have options specified. If , product validation does not apply default extras to products.</param>
-        /// <param name="skipInventoryCheck">If true, skip the process to validate inventory when creating this product reservation.</param>
+        /// <param name="productCode"></param>
+        /// <param name="purchaseLocation"></param>
+        /// <param name="quantity"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="skipDefaults"></param>
+        /// <param name="skipInventoryCheck">If true, skip the inventory validation process for the specified product.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
-        public static MozuUrl ValidateProductUrl(string productCode, bool? skipInventoryCheck =  null, int? quantity =  null, bool? skipDefaults =  null, string responseFields =  null)
+        public static MozuUrl ValidateProductUrl(string productCode, bool? skipInventoryCheck =  null, int? quantity =  null, bool? skipDefaults =  null, string purchaseLocation =  null, string responseFields =  null)
 		{
-			var url = "/api/commerce/catalog/storefront/products/{productCode}/validate?skipInventoryCheck={skipInventoryCheck}&quantity={quantity}&skipDefaults={skipDefaults}&responseFields={responseFields}";
+			var url = "/api/commerce/catalog/storefront/products/{productCode}/validate?skipInventoryCheck={skipInventoryCheck}&quantity={quantity}&skipDefaults={skipDefaults}&purchaseLocation={purchaseLocation}&responseFields={responseFields}";
 			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
 			mozuUrl.FormatUrl( "productCode", productCode);
+			mozuUrl.FormatUrl( "purchaseLocation", purchaseLocation);
 			mozuUrl.FormatUrl( "quantity", quantity);
 			mozuUrl.FormatUrl( "responseFields", responseFields);
 			mozuUrl.FormatUrl( "skipDefaults", skipDefaults);
@@ -161,11 +167,11 @@ public static MozuUrl ValidateProductUrl(string productCode, bool? skipInventory
 		/// <summary>
         /// Get Resource Url for ValidateDiscounts
         /// </summary>
-        /// <param name="allowInactive">If true, allow inactive categories to be retrieved in the category list response. If false, the categories retrieved will not include ones marked inactive.</param>
-        /// <param name="customerAccountId">The unique identifier of the customer account for which to retrieve wish lists.</param>
-        /// <param name="productCode">Merchant-created code that uniquely identifies the product such as a SKU or item number. Once created, the product code is read-only.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-        /// <param name="skipInventoryCheck">If true, skip the process to validate inventory when creating this product reservation.</param>
+        /// <param name="allowInactive">If true, this operation returns inactive product discounts as part of the POST.</param>
+        /// <param name="customerAccountId">Unique ID of the customer account associated with the shopper requesting the discount.</param>
+        /// <param name="productCode"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="skipInventoryCheck">If true, do not validate the product inventory when evaluating the list of discounts.</param>
         /// <param name="variationProductCode">Merchant-created code associated with a specific product variation. Variation product codes maintain an association with the base product code.</param>
         /// <returns>
         /// String - Resource Url
@@ -186,7 +192,7 @@ public static MozuUrl ValidateDiscountsUrl(string productCode, string variationP
 		/// <summary>
         /// Get Resource Url for GetProductCosts
         /// </summary>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -201,7 +207,7 @@ public static MozuUrl GetProductCostsUrl(string responseFields =  null)
 		/// <summary>
         /// Get Resource Url for GetProductInventories
         /// </summary>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Catalog/Storefront/ShippingUrl.cs b/Mozu.Api/Urls/Commerce/Catalog/Storefront/ShippingUrl.cs
old mode 100644
new mode 100755
index d60aa719..bcf1314c
--- a/Mozu.Api/Urls/Commerce/Catalog/Storefront/ShippingUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Catalog/Storefront/ShippingUrl.cs
@@ -17,10 +17,25 @@ public partial class ShippingUrl
 	{
 
 				/// <summary>
+        /// Get Resource Url for GetMultiRates
+        /// </summary>
+        /// <param name="includeRawResponse"></param>
+        /// <returns>
+        /// String - Resource Url
+        /// </returns>
+        public static MozuUrl GetMultiRatesUrl(bool? includeRawResponse =  null)
+		{
+			var url = "/api/commerce/catalog/storefront/shipping/request-multi-rates";
+			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
+			mozuUrl.FormatUrl( "includeRawResponse", includeRawResponse);
+			return mozuUrl;
+		}
+
+		/// <summary>
         /// Get Resource Url for GetRates
         /// </summary>
-        /// <param name="includeRawResponse">Set this parameter to  to retrieve the full raw JSON response from a shipping carrier (instead of just the shipping rate).</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="includeRawResponse"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/ChannelGroupUrl.cs b/Mozu.Api/Urls/Commerce/ChannelGroupUrl.cs
old mode 100644
new mode 100755
index 15bfc300..3d791c4d
--- a/Mozu.Api/Urls/Commerce/ChannelGroupUrl.cs
+++ b/Mozu.Api/Urls/Commerce/ChannelGroupUrl.cs
@@ -19,11 +19,11 @@ public partial class ChannelGroupUrl
 		/// <summary>
         /// Get Resource Url for GetChannelGroups
         /// </summary>
-        /// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-        /// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-        /// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+        /// <param name="filter"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="sortBy"></param>
+        /// <param name="startIndex"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -42,8 +42,8 @@ public static MozuUrl GetChannelGroupsUrl(int? startIndex =  null, int? pageSize
 		/// <summary>
         /// Get Resource Url for GetChannelGroup
         /// </summary>
-        /// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="code">The code that uniquely identifies the channel group.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -59,7 +59,7 @@ public static MozuUrl GetChannelGroupUrl(string code, string responseFields =  n
 				/// <summary>
         /// Get Resource Url for CreateChannelGroup
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -74,8 +74,8 @@ public static MozuUrl CreateChannelGroupUrl(string responseFields =  null)
 				/// <summary>
         /// Get Resource Url for UpdateChannelGroup
         /// </summary>
-        /// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="code">Code that identifies the channel group.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/ChannelUrl.cs b/Mozu.Api/Urls/Commerce/ChannelUrl.cs
old mode 100644
new mode 100755
index 75e30042..31ee63dc
--- a/Mozu.Api/Urls/Commerce/ChannelUrl.cs
+++ b/Mozu.Api/Urls/Commerce/ChannelUrl.cs
@@ -19,11 +19,11 @@ public partial class ChannelUrl
 		/// <summary>
         /// Get Resource Url for GetChannels
         /// </summary>
-        /// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-        /// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-        /// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+        /// <param name="filter"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="sortBy"></param>
+        /// <param name="startIndex"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -42,8 +42,8 @@ public static MozuUrl GetChannelsUrl(int? startIndex =  null, int? pageSize =  n
 		/// <summary>
         /// Get Resource Url for GetChannel
         /// </summary>
-        /// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="code">User-defined code that identifies the channel to retrieve.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -59,7 +59,7 @@ public static MozuUrl GetChannelUrl(string code, string responseFields =  null)
 				/// <summary>
         /// Get Resource Url for CreateChannel
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -74,8 +74,8 @@ public static MozuUrl CreateChannelUrl(string responseFields =  null)
 				/// <summary>
         /// Get Resource Url for UpdateChannel
         /// </summary>
-        /// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="code">User-defined code that identifies the channel to update.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -91,7 +91,7 @@ public static MozuUrl UpdateChannelUrl(string code, string responseFields =  nul
 				/// <summary>
         /// Get Resource Url for DeleteChannel
         /// </summary>
-        /// <param name="code">User-defined code that uniqely identifies the channel group.</param>
+        /// <param name="code">User-defined code that identifies the channel to delete.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/CheckoutUrl.cs b/Mozu.Api/Urls/Commerce/CheckoutUrl.cs
new file mode 100755
index 00000000..606dda79
--- /dev/null
+++ b/Mozu.Api/Urls/Commerce/CheckoutUrl.cs
@@ -0,0 +1,215 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+
+namespace Mozu.Api.Urls.Commerce
+{
+	public partial class CheckoutUrl 
+	{
+
+		/// <summary>
+        /// Get Resource Url for GetCheckouts
+        /// </summary>
+        /// <param name="filter"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="q"></param>
+        /// <param name="qLimit"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="sortBy"></param>
+        /// <param name="startIndex"></param>
+        /// <returns>
+        /// String - Resource Url
+        /// </returns>
+        public static MozuUrl GetCheckoutsUrl(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string q =  null, int? qLimit =  null, string responseFields =  null)
+		{
+			var url = "/api/commerce/checkouts/?startIndex={startIndex}&pageSize={pageSize}&sortBy={sortBy}&filter={filter}&q={q}&qLimit={qLimit}&responseFields={responseFields}";
+			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
+			mozuUrl.FormatUrl( "filter", filter);
+			mozuUrl.FormatUrl( "pageSize", pageSize);
+			mozuUrl.FormatUrl( "q", q);
+			mozuUrl.FormatUrl( "qLimit", qLimit);
+			mozuUrl.FormatUrl( "responseFields", responseFields);
+			mozuUrl.FormatUrl( "sortBy", sortBy);
+			mozuUrl.FormatUrl( "startIndex", startIndex);
+			return mozuUrl;
+		}
+
+		/// <summary>
+        /// Get Resource Url for GetAvailableActions
+        /// </summary>
+        /// <param name="checkoutId"></param>
+        /// <returns>
+        /// String - Resource Url
+        /// </returns>
+        public static MozuUrl GetAvailableActionsUrl(string checkoutId)
+		{
+			var url = "/api/commerce/checkouts/{checkoutId}/actions";
+			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
+			mozuUrl.FormatUrl( "checkoutId", checkoutId);
+			return mozuUrl;
+		}
+
+		/// <summary>
+        /// Get Resource Url for GetAvailableShippingMethods
+        /// </summary>
+        /// <param name="checkoutId"></param>
+        /// <returns>
+        /// String - Resource Url
+        /// </returns>
+        public static MozuUrl GetAvailableShippingMethodsUrl(string checkoutId)
+		{
+			var url = "/api/commerce/checkouts/{checkoutId}/shippingMethods";
+			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
+			mozuUrl.FormatUrl( "checkoutId", checkoutId);
+			return mozuUrl;
+		}
+
+		/// <summary>
+        /// Get Resource Url for GetCheckout
+        /// </summary>
+        /// <param name="checkoutId"></param>
+        /// <param name="responseFields"></param>
+        /// <returns>
+        /// String - Resource Url
+        /// </returns>
+        public static MozuUrl GetCheckoutUrl(string checkoutId, string responseFields =  null)
+		{
+			var url = "/api/commerce/checkouts/{checkoutId}?responseFields={responseFields}";
+			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
+			mozuUrl.FormatUrl( "checkoutId", checkoutId);
+			mozuUrl.FormatUrl( "responseFields", responseFields);
+			return mozuUrl;
+		}
+
+				/// <summary>
+        /// Get Resource Url for CreateCheckoutFromCart
+        /// </summary>
+        /// <param name="cartId"></param>
+        /// <param name="responseFields"></param>
+        /// <returns>
+        /// String - Resource Url
+        /// </returns>
+        public static MozuUrl CreateCheckoutFromCartUrl(string cartId, string responseFields =  null)
+		{
+			var url = "/api/commerce/checkouts/?cartId={cartId}&responseFields={responseFields}";
+			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
+			mozuUrl.FormatUrl( "cartId", cartId);
+			mozuUrl.FormatUrl( "responseFields", responseFields);
+			return mozuUrl;
+		}
+
+		/// <summary>
+        /// Get Resource Url for PerformCheckoutAction
+        /// </summary>
+        /// <param name="checkoutId"></param>
+        /// <param name="responseFields"></param>
+        /// <returns>
+        /// String - Resource Url
+        /// </returns>
+        public static MozuUrl PerformCheckoutActionUrl(string checkoutId, string responseFields =  null)
+		{
+			var url = "/api/commerce/checkouts/{checkoutId}/actions?responseFields={responseFields}";
+			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
+			mozuUrl.FormatUrl( "checkoutId", checkoutId);
+			mozuUrl.FormatUrl( "responseFields", responseFields);
+			return mozuUrl;
+		}
+
+		/// <summary>
+        /// Get Resource Url for ResendCheckoutConfirmationEmail
+        /// </summary>
+        /// <param name="checkoutId"></param>
+        /// <returns>
+        /// String - Resource Url
+        /// </returns>
+        public static MozuUrl ResendCheckoutConfirmationEmailUrl(string checkoutId)
+		{
+			var url = "/api/commerce/checkouts/{checkoutId}/email/resend";
+			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
+			mozuUrl.FormatUrl( "checkoutId", checkoutId);
+			return mozuUrl;
+		}
+
+		/// <summary>
+        /// Get Resource Url for SetShippingMethods
+        /// </summary>
+        /// <param name="checkoutId"></param>
+        /// <param name="responseFields"></param>
+        /// <returns>
+        /// String - Resource Url
+        /// </returns>
+        public static MozuUrl SetShippingMethodsUrl(string checkoutId, string responseFields =  null)
+		{
+			var url = "/api/commerce/checkouts/{checkoutId}/shippingMethods?responseFields={responseFields}";
+			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
+			mozuUrl.FormatUrl( "checkoutId", checkoutId);
+			mozuUrl.FormatUrl( "responseFields", responseFields);
+			return mozuUrl;
+		}
+
+		/// <summary>
+        /// Get Resource Url for UpdateCheckout
+        /// </summary>
+        /// <param name="checkoutId"></param>
+        /// <param name="responseFields"></param>
+        /// <returns>
+        /// String - Resource Url
+        /// </returns>
+        public static MozuUrl UpdateCheckoutUrl(string checkoutId, string responseFields =  null)
+		{
+			var url = "/api/commerce/checkouts/{checkoutId}?responseFields={responseFields}";
+			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
+			mozuUrl.FormatUrl( "checkoutId", checkoutId);
+			mozuUrl.FormatUrl( "responseFields", responseFields);
+			return mozuUrl;
+		}
+
+				/// <summary>
+        /// Get Resource Url for ProcessDigitalWallet
+        /// </summary>
+        /// <param name="checkoutId"></param>
+        /// <param name="digitalWalletType"></param>
+        /// <param name="responseFields"></param>
+        /// <returns>
+        /// String - Resource Url
+        /// </returns>
+        public static MozuUrl ProcessDigitalWalletUrl(string checkoutId, string digitalWalletType, string responseFields =  null)
+		{
+			var url = "/api/commerce/checkouts/{checkoutId}/digitalWallet/{digitalWalletType}?responseFields={responseFields}";
+			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
+			mozuUrl.FormatUrl( "checkoutId", checkoutId);
+			mozuUrl.FormatUrl( "digitalWalletType", digitalWalletType);
+			mozuUrl.FormatUrl( "responseFields", responseFields);
+			return mozuUrl;
+		}
+
+		/// <summary>
+        /// Get Resource Url for ChangeCheckoutPriceList
+        /// </summary>
+        /// <param name="checkoutId"></param>
+        /// <param name="responseFields"></param>
+        /// <returns>
+        /// String - Resource Url
+        /// </returns>
+        public static MozuUrl ChangeCheckoutPriceListUrl(string checkoutId, string responseFields =  null)
+		{
+			var url = "/api/commerce/checkouts/{checkoutId}/priceList?responseFields={responseFields}";
+			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
+			mozuUrl.FormatUrl( "checkoutId", checkoutId);
+			mozuUrl.FormatUrl( "responseFields", responseFields);
+			return mozuUrl;
+		}
+
+				
+	}
+}
+
diff --git a/Mozu.Api/Urls/Commerce/Checkouts/AppliedDiscountUrl.cs b/Mozu.Api/Urls/Commerce/Checkouts/AppliedDiscountUrl.cs
new file mode 100755
index 00000000..545c63b3
--- /dev/null
+++ b/Mozu.Api/Urls/Commerce/Checkouts/AppliedDiscountUrl.cs
@@ -0,0 +1,73 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+
+namespace Mozu.Api.Urls.Commerce.Checkouts
+{
+	public partial class AppliedDiscountUrl 
+	{
+
+						/// <summary>
+        /// Get Resource Url for ApplyCoupon
+        /// </summary>
+        /// <param name="checkoutId"></param>
+        /// <param name="couponCode"></param>
+        /// <param name="responseFields"></param>
+        /// <returns>
+        /// String - Resource Url
+        /// </returns>
+        public static MozuUrl ApplyCouponUrl(string checkoutId, string couponCode, string responseFields =  null)
+		{
+			var url = "/api/commerce/checkouts/{checkoutId}/coupons/{couponCode}?responseFields={responseFields}";
+			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
+			mozuUrl.FormatUrl( "checkoutId", checkoutId);
+			mozuUrl.FormatUrl( "couponCode", couponCode);
+			mozuUrl.FormatUrl( "responseFields", responseFields);
+			return mozuUrl;
+		}
+
+				/// <summary>
+        /// Get Resource Url for RemoveCoupons
+        /// </summary>
+        /// <param name="checkoutId"></param>
+        /// <returns>
+        /// String - Resource Url
+        /// </returns>
+        public static MozuUrl RemoveCouponsUrl(string checkoutId)
+		{
+			var url = "/api/commerce/checkouts/{checkoutId}/coupons";
+			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
+			mozuUrl.FormatUrl( "checkoutId", checkoutId);
+			return mozuUrl;
+		}
+
+		/// <summary>
+        /// Get Resource Url for RemoveCoupon
+        /// </summary>
+        /// <param name="checkoutId"></param>
+        /// <param name="couponCode"></param>
+        /// <returns>
+        /// String - Resource Url
+        /// </returns>
+        public static MozuUrl RemoveCouponUrl(string checkoutId, string couponCode)
+		{
+			var url = "/api/commerce/checkouts/{checkoutId}/coupons/{couponcode}";
+			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
+			mozuUrl.FormatUrl( "checkoutId", checkoutId);
+			mozuUrl.FormatUrl( "couponCode", couponCode);
+			return mozuUrl;
+		}
+
+		
+	}
+}
+
diff --git a/Mozu.Api/Urls/Commerce/Checkouts/DestinationUrl.cs b/Mozu.Api/Urls/Commerce/Checkouts/DestinationUrl.cs
new file mode 100755
index 00000000..1f1994ea
--- /dev/null
+++ b/Mozu.Api/Urls/Commerce/Checkouts/DestinationUrl.cs
@@ -0,0 +1,109 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+
+namespace Mozu.Api.Urls.Commerce.Checkouts
+{
+	public partial class DestinationUrl 
+	{
+
+		/// <summary>
+        /// Get Resource Url for GetDestinations
+        /// </summary>
+        /// <param name="checkoutId"></param>
+        /// <returns>
+        /// String - Resource Url
+        /// </returns>
+        public static MozuUrl GetDestinationsUrl(string checkoutId)
+		{
+			var url = "/api/commerce/checkouts/{checkoutId}/destinations";
+			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
+			mozuUrl.FormatUrl( "checkoutId", checkoutId);
+			return mozuUrl;
+		}
+
+		/// <summary>
+        /// Get Resource Url for GetDestination
+        /// </summary>
+        /// <param name="checkoutId"></param>
+        /// <param name="destinationId"></param>
+        /// <param name="responseFields"></param>
+        /// <returns>
+        /// String - Resource Url
+        /// </returns>
+        public static MozuUrl GetDestinationUrl(string checkoutId, string destinationId, string responseFields =  null)
+		{
+			var url = "/api/commerce/checkouts/{checkoutId}/destinations/{destinationId}?responseFields={responseFields}";
+			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
+			mozuUrl.FormatUrl( "checkoutId", checkoutId);
+			mozuUrl.FormatUrl( "destinationId", destinationId);
+			mozuUrl.FormatUrl( "responseFields", responseFields);
+			return mozuUrl;
+		}
+
+				/// <summary>
+        /// Get Resource Url for AddDestination
+        /// </summary>
+        /// <param name="checkoutId"></param>
+        /// <param name="responseFields"></param>
+        /// <returns>
+        /// String - Resource Url
+        /// </returns>
+        public static MozuUrl AddDestinationUrl(string checkoutId, string responseFields =  null)
+		{
+			var url = "/api/commerce/checkouts/{checkoutId}/destinations?responseFields={responseFields}";
+			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
+			mozuUrl.FormatUrl( "checkoutId", checkoutId);
+			mozuUrl.FormatUrl( "responseFields", responseFields);
+			return mozuUrl;
+		}
+
+				/// <summary>
+        /// Get Resource Url for UpdateDestination
+        /// </summary>
+        /// <param name="checkoutId"></param>
+        /// <param name="destinationId"></param>
+        /// <param name="responseFields"></param>
+        /// <returns>
+        /// String - Resource Url
+        /// </returns>
+        public static MozuUrl UpdateDestinationUrl(string checkoutId, string destinationId, string responseFields =  null)
+		{
+			var url = "/api/commerce/checkouts/{checkoutId}/destinations/{destinationId}?responseFields={responseFields}";
+			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
+			mozuUrl.FormatUrl( "checkoutId", checkoutId);
+			mozuUrl.FormatUrl( "destinationId", destinationId);
+			mozuUrl.FormatUrl( "responseFields", responseFields);
+			return mozuUrl;
+		}
+
+				/// <summary>
+        /// Get Resource Url for RemoveDestination
+        /// </summary>
+        /// <param name="checkoutId"></param>
+        /// <param name="destinationId"></param>
+        /// <returns>
+        /// String - Resource Url
+        /// </returns>
+        public static MozuUrl RemoveDestinationUrl(string checkoutId, string destinationId)
+		{
+			var url = "/api/commerce/checkouts/{checkoutId}/destinations/{destinationId}";
+			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
+			mozuUrl.FormatUrl( "checkoutId", checkoutId);
+			mozuUrl.FormatUrl( "destinationId", destinationId);
+			return mozuUrl;
+		}
+
+		
+	}
+}
+
diff --git a/Mozu.Api/Urls/Commerce/Checkouts/OrderAttributeUrl.cs b/Mozu.Api/Urls/Commerce/Checkouts/OrderAttributeUrl.cs
new file mode 100755
index 00000000..6f6ec93b
--- /dev/null
+++ b/Mozu.Api/Urls/Commerce/Checkouts/OrderAttributeUrl.cs
@@ -0,0 +1,69 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+
+namespace Mozu.Api.Urls.Commerce.Checkouts
+{
+	public partial class OrderAttributeUrl 
+	{
+
+		/// <summary>
+        /// Get Resource Url for GetCheckoutAttributes
+        /// </summary>
+        /// <param name="checkoutId"></param>
+        /// <returns>
+        /// String - Resource Url
+        /// </returns>
+        public static MozuUrl GetCheckoutAttributesUrl(string checkoutId)
+		{
+			var url = "/api/commerce/checkouts/{checkoutId}/attributes";
+			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
+			mozuUrl.FormatUrl( "checkoutId", checkoutId);
+			return mozuUrl;
+		}
+
+				/// <summary>
+        /// Get Resource Url for CreateCheckoutAttributes
+        /// </summary>
+        /// <param name="checkoutId"></param>
+        /// <returns>
+        /// String - Resource Url
+        /// </returns>
+        public static MozuUrl CreateCheckoutAttributesUrl(string checkoutId)
+		{
+			var url = "/api/commerce/checkouts/{checkoutId}/attributes";
+			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
+			mozuUrl.FormatUrl( "checkoutId", checkoutId);
+			return mozuUrl;
+		}
+
+				/// <summary>
+        /// Get Resource Url for UpdateCheckoutAttribute
+        /// </summary>
+        /// <param name="checkoutId"></param>
+        /// <param name="removeMissing"></param>
+        /// <returns>
+        /// String - Resource Url
+        /// </returns>
+        public static MozuUrl UpdateCheckoutAttributeUrl(string checkoutId, bool? removeMissing =  null)
+		{
+			var url = "/api/commerce/checkouts/{checkoutId}/attributes?removeMissing={removeMissing}";
+			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
+			mozuUrl.FormatUrl( "checkoutId", checkoutId);
+			mozuUrl.FormatUrl( "removeMissing", removeMissing);
+			return mozuUrl;
+		}
+
+				
+	}
+}
+
diff --git a/Mozu.Api/Urls/Commerce/Checkouts/OrderItemUrl.cs b/Mozu.Api/Urls/Commerce/Checkouts/OrderItemUrl.cs
new file mode 100755
index 00000000..dc2098f7
--- /dev/null
+++ b/Mozu.Api/Urls/Commerce/Checkouts/OrderItemUrl.cs
@@ -0,0 +1,81 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+
+namespace Mozu.Api.Urls.Commerce.Checkouts
+{
+	public partial class OrderItemUrl 
+	{
+
+				/// <summary>
+        /// Get Resource Url for SplitItem
+        /// </summary>
+        /// <param name="checkoutId"></param>
+        /// <param name="itemId"></param>
+        /// <param name="quantity"></param>
+        /// <param name="responseFields"></param>
+        /// <returns>
+        /// String - Resource Url
+        /// </returns>
+        public static MozuUrl SplitItemUrl(string checkoutId, string itemId, int? quantity =  null, string responseFields =  null)
+		{
+			var url = "/api/commerce/checkouts/{checkoutId}/items/{itemId}/split?quantity={quantity}&responseFields={responseFields}";
+			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
+			mozuUrl.FormatUrl( "checkoutId", checkoutId);
+			mozuUrl.FormatUrl( "itemId", itemId);
+			mozuUrl.FormatUrl( "quantity", quantity);
+			mozuUrl.FormatUrl( "responseFields", responseFields);
+			return mozuUrl;
+		}
+
+		/// <summary>
+        /// Get Resource Url for BulkUpdateItemDestinations
+        /// </summary>
+        /// <param name="checkoutId"></param>
+        /// <param name="responseFields"></param>
+        /// <returns>
+        /// String - Resource Url
+        /// </returns>
+        public static MozuUrl BulkUpdateItemDestinationsUrl(string checkoutId, string responseFields =  null)
+		{
+			var url = "/api/commerce/checkouts/{checkoutId}/items/destinations?responseFields={responseFields}";
+			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
+			mozuUrl.FormatUrl( "checkoutId", checkoutId);
+			mozuUrl.FormatUrl( "responseFields", responseFields);
+			return mozuUrl;
+		}
+
+				/// <summary>
+        /// Get Resource Url for UpdateItemDestination
+        /// </summary>
+        /// <param name="checkoutId"></param>
+        /// <param name="destinationId"></param>
+        /// <param name="itemId"></param>
+        /// <param name="responseFields"></param>
+        /// <returns>
+        /// String - Resource Url
+        /// </returns>
+        public static MozuUrl UpdateItemDestinationUrl(string checkoutId, string itemId, string destinationId, string responseFields =  null)
+		{
+			var url = "/api/commerce/checkouts/{checkoutId}/items/{itemId}/destination/{destinationId}?responseFields={responseFields}";
+			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
+			mozuUrl.FormatUrl( "checkoutId", checkoutId);
+			mozuUrl.FormatUrl( "destinationId", destinationId);
+			mozuUrl.FormatUrl( "itemId", itemId);
+			mozuUrl.FormatUrl( "responseFields", responseFields);
+			return mozuUrl;
+		}
+
+				
+	}
+}
+
diff --git a/Mozu.Api/Urls/Commerce/Checkouts/PaymentUrl.cs b/Mozu.Api/Urls/Commerce/Checkouts/PaymentUrl.cs
new file mode 100755
index 00000000..5de8bf38
--- /dev/null
+++ b/Mozu.Api/Urls/Commerce/Checkouts/PaymentUrl.cs
@@ -0,0 +1,58 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+
+namespace Mozu.Api.Urls.Commerce.Checkouts
+{
+	public partial class PaymentUrl 
+	{
+
+				/// <summary>
+        /// Get Resource Url for PerformPaymentAction
+        /// </summary>
+        /// <param name="checkoutId"></param>
+        /// <param name="paymentId"></param>
+        /// <param name="responseFields"></param>
+        /// <returns>
+        /// String - Resource Url
+        /// </returns>
+        public static MozuUrl PerformPaymentActionUrl(string checkoutId, string paymentId, string responseFields =  null)
+		{
+			var url = "/api/commerce/checkouts/{checkoutId}/payments/{paymentId}/actions?responseFields={responseFields}";
+			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
+			mozuUrl.FormatUrl( "checkoutId", checkoutId);
+			mozuUrl.FormatUrl( "paymentId", paymentId);
+			mozuUrl.FormatUrl( "responseFields", responseFields);
+			return mozuUrl;
+		}
+
+		/// <summary>
+        /// Get Resource Url for CreatePaymentAction
+        /// </summary>
+        /// <param name="checkoutId"></param>
+        /// <param name="responseFields"></param>
+        /// <returns>
+        /// String - Resource Url
+        /// </returns>
+        public static MozuUrl CreatePaymentActionUrl(string checkoutId, string responseFields =  null)
+		{
+			var url = "/api/commerce/checkouts/{checkoutId}/payments/actions?responseFields={responseFields}";
+			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
+			mozuUrl.FormatUrl( "checkoutId", checkoutId);
+			mozuUrl.FormatUrl( "responseFields", responseFields);
+			return mozuUrl;
+		}
+
+						
+	}
+}
+
diff --git a/Mozu.Api/Urls/Commerce/Customer/Accounts/CardUrl.cs b/Mozu.Api/Urls/Commerce/Customer/Accounts/CardUrl.cs
old mode 100644
new mode 100755
index 1bb5978e..c6310de1
--- a/Mozu.Api/Urls/Commerce/Customer/Accounts/CardUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Customer/Accounts/CardUrl.cs
@@ -21,7 +21,7 @@ public partial class CardUrl
         /// </summary>
         /// <param name="accountId">Unique identifier of the customer account.</param>
         /// <param name="cardId">Unique identifier of the card associated with the customer account billing contact.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -39,7 +39,7 @@ public static MozuUrl GetAccountCardUrl(int accountId, string cardId, string res
         /// Get Resource Url for GetAccountCards
         /// </summary>
         /// <param name="accountId">Unique identifier of the customer account.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -56,7 +56,7 @@ public static MozuUrl GetAccountCardsUrl(int accountId, string responseFields =
         /// Get Resource Url for AddAccountCard
         /// </summary>
         /// <param name="accountId">Unique identifier of the customer account.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -73,8 +73,8 @@ public static MozuUrl AddAccountCardUrl(int accountId, string responseFields =
         /// Get Resource Url for UpdateAccountCard
         /// </summary>
         /// <param name="accountId">Unique identifier of the customer account.</param>
-        /// <param name="cardId">Unique identifier of the card associated with the customer account billing contact.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="cardId">Unique identifier of the credit card.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -92,7 +92,7 @@ public static MozuUrl UpdateAccountCardUrl(int accountId, string cardId, string
         /// Get Resource Url for DeleteAccountCard
         /// </summary>
         /// <param name="accountId">Unique identifier of the customer account.</param>
-        /// <param name="cardId">Unique identifier of the card associated with the customer account billing contact.</param>
+        /// <param name="cardId">Unique identifier of the credit card to delete.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Customer/Accounts/CustomerAttributeUrl.cs b/Mozu.Api/Urls/Commerce/Customer/Accounts/CustomerAttributeUrl.cs
old mode 100644
new mode 100755
index 8f5be10b..8e70211c
--- a/Mozu.Api/Urls/Commerce/Customer/Accounts/CustomerAttributeUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Customer/Accounts/CustomerAttributeUrl.cs
@@ -19,9 +19,9 @@ public partial class CustomerAttributeUrl
 		/// <summary>
         /// Get Resource Url for GetAccountAttribute
         /// </summary>
-        /// <param name="accountId">Unique identifier of the customer account.</param>
-        /// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="accountId">Identifier of the customer account associated with the attribute to retrieve.</param>
+        /// <param name="attributeFQN"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -38,10 +38,10 @@ public static MozuUrl GetAccountAttributeUrl(int accountId, string attributeFQN,
 		/// <summary>
         /// Get Resource Url for GetAccountAttributes
         /// </summary>
-        /// <param name="accountId">Unique identifier of the customer account.</param>
+        /// <param name="accountId">Identifier of the customer account associated with the attributes to retrieve.</param>
         /// <param name="filter"></param>
         /// <param name="pageSize"></param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <param name="sortBy"></param>
         /// <param name="startIndex"></param>
         /// <returns>
@@ -64,7 +64,7 @@ public static MozuUrl GetAccountAttributesUrl(int accountId, int? startIndex =
         /// Get Resource Url for AddAccountAttribute
         /// </summary>
         /// <param name="accountId">Unique identifier of the customer account.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -80,9 +80,9 @@ public static MozuUrl AddAccountAttributeUrl(int accountId, string responseField
 				/// <summary>
         /// Get Resource Url for UpdateAccountAttribute
         /// </summary>
-        /// <param name="accountId">Unique identifier of the customer account.</param>
-        /// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="accountId">Identifier of the customer account associated with the attribute.</param>
+        /// <param name="attributeFQN"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -100,7 +100,7 @@ public static MozuUrl UpdateAccountAttributeUrl(int accountId, string attributeF
         /// Get Resource Url for DeleteAccountAttribute
         /// </summary>
         /// <param name="accountId">Unique identifier of the customer account.</param>
-        /// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
+        /// <param name="attributeFQN"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Customer/Accounts/CustomerAuditEntryUrl.cs b/Mozu.Api/Urls/Commerce/Customer/Accounts/CustomerAuditEntryUrl.cs
old mode 100644
new mode 100755
index 1b3d256c..96606cd6
--- a/Mozu.Api/Urls/Commerce/Customer/Accounts/CustomerAuditEntryUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Customer/Accounts/CustomerAuditEntryUrl.cs
@@ -19,12 +19,12 @@ public partial class CustomerAuditEntryUrl
 		/// <summary>
         /// Get Resource Url for GetAccountAuditLog
         /// </summary>
-        /// <param name="accountId">Unique identifier of the customer account.</param>
-        /// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-        /// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-        /// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-        /// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
+        /// <param name="accountId"></param>
+        /// <param name="filter"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="sortBy"></param>
+        /// <param name="startIndex"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Customer/Accounts/CustomerContactUrl.cs b/Mozu.Api/Urls/Commerce/Customer/Accounts/CustomerContactUrl.cs
old mode 100644
new mode 100755
index 20ca94b0..c2c5519b
--- a/Mozu.Api/Urls/Commerce/Customer/Accounts/CustomerContactUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Customer/Accounts/CustomerContactUrl.cs
@@ -19,9 +19,9 @@ public partial class CustomerContactUrl
 		/// <summary>
         /// Get Resource Url for GetAccountContact
         /// </summary>
-        /// <param name="accountId">Unique identifier of the customer account.</param>
-        /// <param name="contactId">Unique identifer of the customer account contact being updated.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="accountId">Unique identifier of the customer account whose contact information is being retrieved.</param>
+        /// <param name="contactId">Unique identifier of the customer account contact to retrieve.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -38,10 +38,10 @@ public static MozuUrl GetAccountContactUrl(int accountId, int contactId, string
 		/// <summary>
         /// Get Resource Url for GetAccountContacts
         /// </summary>
-        /// <param name="accountId">Unique identifier of the customer account.</param>
-        /// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-        /// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="accountId">Unique identifier of the customer account associated with the contact information to retrieve.</param>
+        /// <param name="filter"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="responseFields"></param>
         /// <param name="sortBy"></param>
         /// <param name="startIndex"></param>
         /// <returns>
@@ -63,8 +63,8 @@ public static MozuUrl GetAccountContactsUrl(int accountId, int? startIndex =  nu
 				/// <summary>
         /// Get Resource Url for AddAccountContact
         /// </summary>
-        /// <param name="accountId">Unique identifier of the customer account.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="accountId">Unique identifier of the customer account containing the new contact.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -80,9 +80,9 @@ public static MozuUrl AddAccountContactUrl(int accountId, string responseFields
 				/// <summary>
         /// Get Resource Url for UpdateAccountContact
         /// </summary>
-        /// <param name="accountId">Unique identifier of the customer account.</param>
+        /// <param name="accountId">Unique identifier of the customer account whose contact information is being updated.</param>
         /// <param name="contactId">Unique identifer of the customer account contact being updated.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -96,11 +96,28 @@ public static MozuUrl UpdateAccountContactUrl(int accountId, int contactId, stri
 			return mozuUrl;
 		}
 
+		/// <summary>
+        /// Get Resource Url for AddAccountContactList
+        /// </summary>
+        /// <param name="accountId"></param>
+        /// <param name="responseFields"></param>
+        /// <returns>
+        /// String - Resource Url
+        /// </returns>
+        public static MozuUrl AddAccountContactListUrl(int accountId, string responseFields =  null)
+		{
+			var url = "/api/commerce/customer/accounts/{accountId}/contacts?responseFields={responseFields}";
+			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
+			mozuUrl.FormatUrl( "accountId", accountId);
+			mozuUrl.FormatUrl( "responseFields", responseFields);
+			return mozuUrl;
+		}
+
 				/// <summary>
         /// Get Resource Url for DeleteAccountContact
         /// </summary>
         /// <param name="accountId">Unique identifier of the customer account.</param>
-        /// <param name="contactId">Unique identifer of the customer account contact being updated.</param>
+        /// <param name="contactId">Unique identifier of the customer account contact to delete.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Customer/Accounts/CustomerNoteUrl.cs b/Mozu.Api/Urls/Commerce/Customer/Accounts/CustomerNoteUrl.cs
old mode 100644
new mode 100755
index d3bfdd69..cd180d1c
--- a/Mozu.Api/Urls/Commerce/Customer/Accounts/CustomerNoteUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Customer/Accounts/CustomerNoteUrl.cs
@@ -19,9 +19,9 @@ public partial class CustomerNoteUrl
 		/// <summary>
         /// Get Resource Url for GetAccountNote
         /// </summary>
-        /// <param name="accountId">Unique identifier of the customer account.</param>
+        /// <param name="accountId">Unique identifier of the customer account that contains the note being retrieved.</param>
         /// <param name="noteId">Unique identifier of a particular note to retrieve.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -39,11 +39,11 @@ public static MozuUrl GetAccountNoteUrl(int accountId, int noteId, string respon
         /// Get Resource Url for GetAccountNotes
         /// </summary>
         /// <param name="accountId">Unique identifier of the customer account.</param>
-        /// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-        /// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-        /// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+        /// <param name="filter"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="sortBy"></param>
+        /// <param name="startIndex"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -63,8 +63,8 @@ public static MozuUrl GetAccountNotesUrl(int accountId, int? startIndex =  null,
 				/// <summary>
         /// Get Resource Url for AddAccountNote
         /// </summary>
-        /// <param name="accountId">Unique identifier of the customer account.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="accountId">Unique identifier of the customer account for which to create the note.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -80,9 +80,9 @@ public static MozuUrl AddAccountNoteUrl(int accountId, string responseFields =
 				/// <summary>
         /// Get Resource Url for UpdateAccountNote
         /// </summary>
-        /// <param name="accountId">Unique identifier of the customer account.</param>
-        /// <param name="noteId">Unique identifier of a particular note to retrieve.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="accountId">Unique identifier of the customer account note to modify.</param>
+        /// <param name="noteId">Unique identifier of the note to update.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -99,8 +99,8 @@ public static MozuUrl UpdateAccountNoteUrl(int accountId, int noteId, string res
 				/// <summary>
         /// Get Resource Url for DeleteAccountNote
         /// </summary>
-        /// <param name="accountId">Unique identifier of the customer account.</param>
-        /// <param name="noteId">Unique identifier of a particular note to retrieve.</param>
+        /// <param name="accountId">Unique identifier of the customer account that contains the note being deleted.</param>
+        /// <param name="noteId">Unique identifier of the customer account note being deleted.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Customer/Accounts/CustomerPurchaseOrderAccountUrl.cs b/Mozu.Api/Urls/Commerce/Customer/Accounts/CustomerPurchaseOrderAccountUrl.cs
old mode 100644
new mode 100755
index fff8aa2b..3ef34ba2
--- a/Mozu.Api/Urls/Commerce/Customer/Accounts/CustomerPurchaseOrderAccountUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Customer/Accounts/CustomerPurchaseOrderAccountUrl.cs
@@ -19,8 +19,8 @@ public partial class CustomerPurchaseOrderAccountUrl
 		/// <summary>
         /// Get Resource Url for GetCustomerPurchaseOrderAccount
         /// </summary>
-        /// <param name="accountId">Unique identifier of the customer account.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="accountId"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -36,12 +36,12 @@ public static MozuUrl GetCustomerPurchaseOrderAccountUrl(int accountId, string r
 		/// <summary>
         /// Get Resource Url for GetCustomerPurchaseOrderTransactions
         /// </summary>
-        /// <param name="accountId">Unique identifier of the customer account.</param>
-        /// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-        /// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-        /// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-        /// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
+        /// <param name="accountId"></param>
+        /// <param name="filter"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="sortBy"></param>
+        /// <param name="startIndex"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -61,8 +61,8 @@ public static MozuUrl GetCustomerPurchaseOrderTransactionsUrl(int accountId, int
 				/// <summary>
         /// Get Resource Url for CreateCustomerPurchaseOrderAccount
         /// </summary>
-        /// <param name="accountId">Unique identifier of the customer account.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="accountId"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -78,8 +78,8 @@ public static MozuUrl CreateCustomerPurchaseOrderAccountUrl(int accountId, strin
 		/// <summary>
         /// Get Resource Url for CreatePurchaseOrderTransaction
         /// </summary>
-        /// <param name="accountId">Unique identifier of the customer account.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="accountId"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -95,8 +95,8 @@ public static MozuUrl CreatePurchaseOrderTransactionUrl(int accountId, string re
 				/// <summary>
         /// Get Resource Url for UpdateCustomerPurchaseOrderAccount
         /// </summary>
-        /// <param name="accountId">Unique identifier of the customer account.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="accountId"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -112,7 +112,7 @@ public static MozuUrl UpdateCustomerPurchaseOrderAccountUrl(int accountId, strin
 				/// <summary>
         /// Get Resource Url for DeleteCustomerPurchaseOrderAccount
         /// </summary>
-        /// <param name="accountId">Unique identifier of the customer account.</param>
+        /// <param name="accountId"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Customer/Accounts/CustomerSegmentUrl.cs b/Mozu.Api/Urls/Commerce/Customer/Accounts/CustomerSegmentUrl.cs
old mode 100644
new mode 100755
index 7453c125..b53b50fc
--- a/Mozu.Api/Urls/Commerce/Customer/Accounts/CustomerSegmentUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Customer/Accounts/CustomerSegmentUrl.cs
@@ -20,11 +20,11 @@ public partial class CustomerSegmentUrl
         /// Get Resource Url for GetAccountSegments
         /// </summary>
         /// <param name="accountId">Unique identifier of the customer account.</param>
-        /// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-        /// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-        /// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+        /// <param name="filter"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="sortBy"></param>
+        /// <param name="startIndex"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Customer/Accounts/TransactionUrl.cs b/Mozu.Api/Urls/Commerce/Customer/Accounts/TransactionUrl.cs
old mode 100644
new mode 100755
index f3e1d570..cd6c2baa
--- a/Mozu.Api/Urls/Commerce/Customer/Accounts/TransactionUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Customer/Accounts/TransactionUrl.cs
@@ -19,7 +19,7 @@ public partial class TransactionUrl
 		/// <summary>
         /// Get Resource Url for GetTransactions
         /// </summary>
-        /// <param name="accountId">Unique identifier of the customer account.</param>
+        /// <param name="accountId">Unique identifier of the customer account for which to retrieve transactions.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -35,7 +35,7 @@ public static MozuUrl GetTransactionsUrl(int accountId)
         /// Get Resource Url for AddTransaction
         /// </summary>
         /// <param name="accountId">Unique identifier of the customer account.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -51,7 +51,7 @@ public static MozuUrl AddTransactionUrl(int accountId, string responseFields =
 						/// <summary>
         /// Get Resource Url for RemoveTransaction
         /// </summary>
-        /// <param name="accountId">Unique identifier of the customer account.</param>
+        /// <param name="accountId">Unique identifier of the customer account from which to delete the transaction.</param>
         /// <param name="transactionId">Unique identifier of the transaction to delete.</param>
         /// <returns>
         /// String - Resource Url
diff --git a/Mozu.Api/Urls/Commerce/Customer/AddressValidationRequestUrl.cs b/Mozu.Api/Urls/Commerce/Customer/AddressValidationRequestUrl.cs
old mode 100644
new mode 100755
index 7d984cea..9a01ad29
--- a/Mozu.Api/Urls/Commerce/Customer/AddressValidationRequestUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Customer/AddressValidationRequestUrl.cs
@@ -19,7 +19,7 @@ public partial class AddressValidationRequestUrl
 				/// <summary>
         /// Get Resource Url for ValidateAddress
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Customer/Attributedefinition/AttributeUrl.cs b/Mozu.Api/Urls/Commerce/Customer/Attributedefinition/AttributeUrl.cs
old mode 100644
new mode 100755
index 93bb605a..155c503b
--- a/Mozu.Api/Urls/Commerce/Customer/Attributedefinition/AttributeUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Customer/Attributedefinition/AttributeUrl.cs
@@ -19,11 +19,11 @@ public partial class AttributeUrl
 		/// <summary>
         /// Get Resource Url for GetAttributes
         /// </summary>
-        /// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-        /// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-        /// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+        /// <param name="filter"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="sortBy"></param>
+        /// <param name="startIndex"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -42,7 +42,7 @@ public static MozuUrl GetAttributesUrl(int? startIndex =  null, int? pageSize =
 		/// <summary>
         /// Get Resource Url for GetAttributeVocabularyValues
         /// </summary>
-        /// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
+        /// <param name="attributeFQN"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -57,8 +57,8 @@ public static MozuUrl GetAttributeVocabularyValuesUrl(string attributeFQN)
 		/// <summary>
         /// Get Resource Url for GetAttribute
         /// </summary>
-        /// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="attributeFQN"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -71,7 +71,39 @@ public static MozuUrl GetAttributeUrl(string attributeFQN, string responseFields
 			return mozuUrl;
 		}
 
-								
+				/// <summary>
+        /// Get Resource Url for CreateAttribute
+        /// </summary>
+        /// <param name="responseFields"></param>
+        /// <returns>
+        /// String - Resource Url
+        /// </returns>
+        public static MozuUrl CreateAttributeUrl(string responseFields =  null)
+		{
+			var url = "/api/commerce/customer/attributedefinition/attributes/?responseFields={responseFields}";
+			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
+			mozuUrl.FormatUrl( "responseFields", responseFields);
+			return mozuUrl;
+		}
+
+				/// <summary>
+        /// Get Resource Url for UpdateAttribute
+        /// </summary>
+        /// <param name="attributeFQN"></param>
+        /// <param name="responseFields"></param>
+        /// <returns>
+        /// String - Resource Url
+        /// </returns>
+        public static MozuUrl UpdateAttributeUrl(string attributeFQN, string responseFields =  null)
+		{
+			var url = "/api/commerce/customer/attributedefinition/attributes/{attributeFQN}?responseFields={responseFields}";
+			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
+			mozuUrl.FormatUrl( "attributeFQN", attributeFQN);
+			mozuUrl.FormatUrl( "responseFields", responseFields);
+			return mozuUrl;
+		}
+
+				
 	}
 }
 
diff --git a/Mozu.Api/Urls/Commerce/Customer/CreditUrl.cs b/Mozu.Api/Urls/Commerce/Customer/CreditUrl.cs
old mode 100644
new mode 100755
index 9056c89d..2a878a37
--- a/Mozu.Api/Urls/Commerce/Customer/CreditUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Customer/CreditUrl.cs
@@ -19,11 +19,11 @@ public partial class CreditUrl
 		/// <summary>
         /// Get Resource Url for GetCredits
         /// </summary>
-        /// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-        /// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-        /// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+        /// <param name="filter"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="sortBy"></param>
+        /// <param name="startIndex"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -42,8 +42,8 @@ public static MozuUrl GetCreditsUrl(int? startIndex =  null, int? pageSize =  nu
 		/// <summary>
         /// Get Resource Url for GetCredit
         /// </summary>
-        /// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="code">User-defined code that identifies the store credit to retrieve.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -59,7 +59,7 @@ public static MozuUrl GetCreditUrl(string code, string responseFields =  null)
 				/// <summary>
         /// Get Resource Url for AddCredit
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -74,8 +74,8 @@ public static MozuUrl AddCreditUrl(string responseFields =  null)
 				/// <summary>
         /// Get Resource Url for AssociateCreditToShopper
         /// </summary>
-        /// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="code">The code that represents the credit to claim for the shopper.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -91,7 +91,7 @@ public static MozuUrl AssociateCreditToShopperUrl(string code, string responseFi
 		/// <summary>
         /// Get Resource Url for ResendCreditCreatedEmail
         /// </summary>
-        /// <param name="code">User-defined code that uniqely identifies the channel group.</param>
+        /// <param name="code"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -106,8 +106,8 @@ public static MozuUrl ResendCreditCreatedEmailUrl(string code)
 		/// <summary>
         /// Get Resource Url for UpdateCredit
         /// </summary>
-        /// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="code">User-defined code of the store credit to update.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -123,7 +123,7 @@ public static MozuUrl UpdateCreditUrl(string code, string responseFields =  null
 				/// <summary>
         /// Get Resource Url for DeleteCredit
         /// </summary>
-        /// <param name="code">User-defined code that uniqely identifies the channel group.</param>
+        /// <param name="code">User-defined code of the store credit to delete.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Customer/Credits/CreditAuditEntryUrl.cs b/Mozu.Api/Urls/Commerce/Customer/Credits/CreditAuditEntryUrl.cs
old mode 100644
new mode 100755
index 61d3cc78..c29e9dd9
--- a/Mozu.Api/Urls/Commerce/Customer/Credits/CreditAuditEntryUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Customer/Credits/CreditAuditEntryUrl.cs
@@ -19,12 +19,12 @@ public partial class CreditAuditEntryUrl
 		/// <summary>
         /// Get Resource Url for GetAuditEntries
         /// </summary>
-        /// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-        /// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-        /// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-        /// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+        /// <param name="code">User-defined code of the credit for which to retrieve audit entries.</param>
+        /// <param name="filter"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="sortBy"></param>
+        /// <param name="startIndex"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Customer/Credits/CreditTransactionUrl.cs b/Mozu.Api/Urls/Commerce/Customer/Credits/CreditTransactionUrl.cs
old mode 100644
new mode 100755
index c5d96654..f4c16595
--- a/Mozu.Api/Urls/Commerce/Customer/Credits/CreditTransactionUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Customer/Credits/CreditTransactionUrl.cs
@@ -19,12 +19,12 @@ public partial class CreditTransactionUrl
 		/// <summary>
         /// Get Resource Url for GetTransactions
         /// </summary>
-        /// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-        /// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-        /// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-        /// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+        /// <param name="code">User-defined code that identifies the customer credit.</param>
+        /// <param name="filter"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="sortBy"></param>
+        /// <param name="startIndex"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -44,8 +44,8 @@ public static MozuUrl GetTransactionsUrl(string code, int? startIndex =  null, i
 				/// <summary>
         /// Get Resource Url for AddTransaction
         /// </summary>
-        /// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="code">User-defined code that identifies the customer credit to update.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Customer/CustomerAccountUrl.cs b/Mozu.Api/Urls/Commerce/Customer/CustomerAccountUrl.cs
old mode 100644
new mode 100755
index 7ab2fd1d..b86c7fe7
--- a/Mozu.Api/Urls/Commerce/Customer/CustomerAccountUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Customer/CustomerAccountUrl.cs
@@ -20,12 +20,12 @@ public partial class CustomerAccountUrl
         /// Get Resource Url for GetAccounts
         /// </summary>
         /// <param name="fields">The fields to include in the response.</param>
-        /// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
+        /// <param name="filter"></param>
         /// <param name="isAnonymous">If true, retrieve anonymous shopper accounts in the response.</param>
         /// <param name="pageSize"></param>
-        /// <param name="q">A list of order search terms (not phrases) to use in the query when searching across order number and the name or email of the billing contact. When entering, separate multiple search terms with a space character.</param>
+        /// <param name="q">A list of customer account search terms to use in the query when searching across customer name and email. Separate multiple search terms with a space character.</param>
         /// <param name="qLimit">The maximum number of search results to return in the response. You can limit any range between 1-100.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <param name="sortBy"></param>
         /// <param name="startIndex"></param>
         /// <returns>
@@ -51,7 +51,7 @@ public static MozuUrl GetAccountsUrl(int? startIndex =  null, int? pageSize =  n
         /// Get Resource Url for GetLoginState
         /// </summary>
         /// <param name="accountId">Unique identifier of the customer account.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -67,8 +67,8 @@ public static MozuUrl GetLoginStateUrl(int accountId, string responseFields =  n
 		/// <summary>
         /// Get Resource Url for GetAccount
         /// </summary>
-        /// <param name="accountId">Unique identifier of the customer account.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="accountId">Unique identifier of the customer account to retrieve.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -84,7 +84,7 @@ public static MozuUrl GetAccountUrl(int accountId, string responseFields =  null
 				/// <summary>
         /// Get Resource Url for AddAccount
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -99,8 +99,8 @@ public static MozuUrl AddAccountUrl(string responseFields =  null)
 		/// <summary>
         /// Get Resource Url for ChangePassword
         /// </summary>
-        /// <param name="accountId">Unique identifier of the customer account.</param>
-        /// <param name="unlockAccount">Specifies whether to unlock the specified customer account.</param>
+        /// <param name="accountId">The customer account information required to change the userpassword.</param>
+        /// <param name="unlockAccount"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -117,7 +117,7 @@ public static MozuUrl ChangePasswordUrl(int accountId, bool? unlockAccount =  nu
         /// Get Resource Url for AddLoginToExistingCustomer
         /// </summary>
         /// <param name="accountId">Unique identifier of the customer account.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -133,7 +133,7 @@ public static MozuUrl AddLoginToExistingCustomerUrl(int accountId, string respon
 		/// <summary>
         /// Get Resource Url for RecomputeCustomerLifetimeValue
         /// </summary>
-        /// <param name="accountId">Unique identifier of the customer account.</param>
+        /// <param name="accountId">The unique identifier of the customer account for which to calculate customer lifetime value.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -148,7 +148,7 @@ public static MozuUrl RecomputeCustomerLifetimeValueUrl(int accountId)
 		/// <summary>
         /// Get Resource Url for SetLoginLocked
         /// </summary>
-        /// <param name="accountId">Unique identifier of the customer account.</param>
+        /// <param name="accountId">The unique identifier of the customer account.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -178,7 +178,7 @@ public static MozuUrl SetPasswordChangeRequiredUrl(int accountId)
 		/// <summary>
         /// Get Resource Url for AddAccountAndLogin
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -193,7 +193,7 @@ public static MozuUrl AddAccountAndLoginUrl(string responseFields =  null)
 		/// <summary>
         /// Get Resource Url for AddAccounts
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -208,7 +208,7 @@ public static MozuUrl AddAccountsUrl(string responseFields =  null)
 		/// <summary>
         /// Get Resource Url for ChangePasswords
         /// </summary>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -223,9 +223,9 @@ public static MozuUrl ChangePasswordsUrl(string responseFields =  null)
 		/// <summary>
         /// Get Resource Url for GetLoginStateByEmailAddress
         /// </summary>
-        /// <param name="customerSetCode">The unique idenfitier of the customer set.</param>
+        /// <param name="customerSetCode"></param>
         /// <param name="emailAddress">The email address associated with the customer account.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -242,8 +242,8 @@ public static MozuUrl GetLoginStateByEmailAddressUrl(string emailAddress, string
 		/// <summary>
         /// Get Resource Url for GetLoginStateByUserName
         /// </summary>
-        /// <param name="customerSetCode">The unique idenfitier of the customer set.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="customerSetCode"></param>
+        /// <param name="responseFields"></param>
         /// <param name="userName">The user name associated with the customer account.</param>
         /// <returns>
         /// String - Resource Url
@@ -261,10 +261,10 @@ public static MozuUrl GetLoginStateByUserNameUrl(string userName, string custome
 		/// <summary>
         /// Get Resource Url for GetCustomersPurchaseOrderAccounts
         /// </summary>
-        /// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-        /// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-        /// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
+        /// <param name="pageSize"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="sortBy"></param>
+        /// <param name="startIndex"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -296,7 +296,7 @@ public static MozuUrl ResetPasswordUrl()
         /// Get Resource Url for UpdateAccount
         /// </summary>
         /// <param name="accountId">Unique identifier of the customer account.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -312,7 +312,7 @@ public static MozuUrl UpdateAccountUrl(int accountId, string responseFields =  n
 				/// <summary>
         /// Get Resource Url for DeleteAccount
         /// </summary>
-        /// <param name="accountId">Unique identifier of the customer account.</param>
+        /// <param name="accountId">Unique identifier of the customer account to delete.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Customer/CustomerAuthTicketUrl.cs b/Mozu.Api/Urls/Commerce/Customer/CustomerAuthTicketUrl.cs
old mode 100644
new mode 100755
index 9c4140a7..eac7dafe
--- a/Mozu.Api/Urls/Commerce/Customer/CustomerAuthTicketUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Customer/CustomerAuthTicketUrl.cs
@@ -19,7 +19,7 @@ public partial class CustomerAuthTicketUrl
 		/// <summary>
         /// Get Resource Url for CreateAnonymousShopperAuthTicket
         /// </summary>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -34,7 +34,7 @@ public static MozuUrl CreateAnonymousShopperAuthTicketUrl(string responseFields
 				/// <summary>
         /// Get Resource Url for CreateUserAuthTicket
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -49,8 +49,8 @@ public static MozuUrl CreateUserAuthTicketUrl(string responseFields =  null)
 				/// <summary>
         /// Get Resource Url for RefreshUserAuthTicket
         /// </summary>
-        /// <param name="refreshToken">Alphanumeric string used for access tokens. This token refreshes access for accounts by generating a new developer or application account authentication ticket after an access token expires.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="refreshToken">The refresh token string required to refresh a user's authentication ticket.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Customer/CustomerSegmentUrl.cs b/Mozu.Api/Urls/Commerce/Customer/CustomerSegmentUrl.cs
old mode 100644
new mode 100755
index 591c3082..c7f58cba
--- a/Mozu.Api/Urls/Commerce/Customer/CustomerSegmentUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Customer/CustomerSegmentUrl.cs
@@ -19,11 +19,11 @@ public partial class CustomerSegmentUrl
 		/// <summary>
         /// Get Resource Url for GetSegments
         /// </summary>
-        /// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-        /// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-        /// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+        /// <param name="filter"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="sortBy"></param>
+        /// <param name="startIndex"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -43,7 +43,7 @@ public static MozuUrl GetSegmentsUrl(int? startIndex =  null, int? pageSize =  n
         /// Get Resource Url for GetSegment
         /// </summary>
         /// <param name="id">Unique identifier of the customer segment to retrieve.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -59,7 +59,7 @@ public static MozuUrl GetSegmentUrl(int id, string responseFields =  null)
 				/// <summary>
         /// Get Resource Url for AddSegment
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -74,7 +74,7 @@ public static MozuUrl AddSegmentUrl(string responseFields =  null)
 		/// <summary>
         /// Get Resource Url for AddSegmentAccounts
         /// </summary>
-        /// <param name="id">Unique identifier of the customer segment to retrieve.</param>
+        /// <param name="id">Unique identifier of the customer segment for which to add the associated customer accounts.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -89,8 +89,8 @@ public static MozuUrl AddSegmentAccountsUrl(int id)
 				/// <summary>
         /// Get Resource Url for UpdateSegment
         /// </summary>
-        /// <param name="id">Unique identifier of the customer segment to retrieve.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="id">Unique identifier of the customer segment.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -106,7 +106,7 @@ public static MozuUrl UpdateSegmentUrl(int id, string responseFields =  null)
 				/// <summary>
         /// Get Resource Url for DeleteSegment
         /// </summary>
-        /// <param name="id">Unique identifier of the customer segment to retrieve.</param>
+        /// <param name="id">Unique identifier of the customer segment to delete.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -121,8 +121,8 @@ public static MozuUrl DeleteSegmentUrl(int id)
 		/// <summary>
         /// Get Resource Url for RemoveSegmentAccount
         /// </summary>
-        /// <param name="accountId">Unique identifier of the customer account.</param>
-        /// <param name="id">Unique identifier of the customer segment to retrieve.</param>
+        /// <param name="accountId"></param>
+        /// <param name="id"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Customer/CustomerSetUrl.cs b/Mozu.Api/Urls/Commerce/Customer/CustomerSetUrl.cs
old mode 100644
new mode 100755
index 78a88f08..1fd8a038
--- a/Mozu.Api/Urls/Commerce/Customer/CustomerSetUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Customer/CustomerSetUrl.cs
@@ -19,10 +19,10 @@ public partial class CustomerSetUrl
 		/// <summary>
         /// Get Resource Url for GetCustomerSets
         /// </summary>
-        /// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-        /// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-        /// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
+        /// <param name="pageSize"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="sortBy"></param>
+        /// <param name="startIndex"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -40,8 +40,8 @@ public static MozuUrl GetCustomerSetsUrl(int? startIndex =  null, int? pageSize
 		/// <summary>
         /// Get Resource Url for GetCustomerSet
         /// </summary>
-        /// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="code"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Customer/VisitUrl.cs b/Mozu.Api/Urls/Commerce/Customer/VisitUrl.cs
old mode 100644
new mode 100755
index 64b58b22..aad9d153
--- a/Mozu.Api/Urls/Commerce/Customer/VisitUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Customer/VisitUrl.cs
@@ -19,11 +19,11 @@ public partial class VisitUrl
 		/// <summary>
         /// Get Resource Url for GetVisits
         /// </summary>
-        /// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-        /// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-        /// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+        /// <param name="filter"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="sortBy"></param>
+        /// <param name="startIndex"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -42,8 +42,8 @@ public static MozuUrl GetVisitsUrl(int? startIndex =  null, int? pageSize =  nul
 		/// <summary>
         /// Get Resource Url for GetVisit
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="visitId">Unique identifier of the customer visit to update.</param>
+        /// <param name="responseFields"></param>
+        /// <param name="visitId">Unique identifier of the customer visit to retrieve.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -59,7 +59,7 @@ public static MozuUrl GetVisitUrl(string visitId, string responseFields =  null)
 				/// <summary>
         /// Get Resource Url for AddVisit
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -74,7 +74,7 @@ public static MozuUrl AddVisitUrl(string responseFields =  null)
 				/// <summary>
         /// Get Resource Url for UpdateVisit
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <param name="visitId">Unique identifier of the customer visit to update.</param>
         /// <returns>
         /// String - Resource Url
diff --git a/Mozu.Api/Urls/Commerce/InStockNotificationSubscriptionUrl.cs b/Mozu.Api/Urls/Commerce/InStockNotificationSubscriptionUrl.cs
old mode 100644
new mode 100755
index d03b3a66..f4762895
--- a/Mozu.Api/Urls/Commerce/InStockNotificationSubscriptionUrl.cs
+++ b/Mozu.Api/Urls/Commerce/InStockNotificationSubscriptionUrl.cs
@@ -19,11 +19,11 @@ public partial class InStockNotificationSubscriptionUrl
 		/// <summary>
         /// Get Resource Url for GetInStockNotificationSubscriptions
         /// </summary>
-        /// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-        /// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-        /// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+        /// <param name="filter"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="sortBy"></param>
+        /// <param name="startIndex"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -42,8 +42,8 @@ public static MozuUrl GetInStockNotificationSubscriptionsUrl(int? startIndex =
 		/// <summary>
         /// Get Resource Url for GetInStockNotificationSubscription
         /// </summary>
-        /// <param name="id">Unique identifier of the customer segment to retrieve.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="id">Unique identifier of the in-stock notification subscription to retrieve.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -59,7 +59,7 @@ public static MozuUrl GetInStockNotificationSubscriptionUrl(int id, string respo
 				/// <summary>
         /// Get Resource Url for AddInStockNotificationSubscription
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -74,7 +74,7 @@ public static MozuUrl AddInStockNotificationSubscriptionUrl(string responseField
 						/// <summary>
         /// Get Resource Url for DeleteInStockNotificationSubscription
         /// </summary>
-        /// <param name="id">Unique identifier of the customer segment to retrieve.</param>
+        /// <param name="id">Unique identifier of the customer in-stock notification subscription to delete.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/LocationUrl.cs b/Mozu.Api/Urls/Commerce/LocationUrl.cs
old mode 100644
new mode 100755
index 2fde0cd3..4ca276cd
--- a/Mozu.Api/Urls/Commerce/LocationUrl.cs
+++ b/Mozu.Api/Urls/Commerce/LocationUrl.cs
@@ -19,16 +19,18 @@ public partial class LocationUrl
 		/// <summary>
         /// Get Resource Url for GetLocation
         /// </summary>
-        /// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="includeAttributeDefinition"></param>
+        /// <param name="locationCode"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
-        public static MozuUrl GetLocationUrl(string code, string responseFields =  null)
+        public static MozuUrl GetLocationUrl(string locationCode, bool? includeAttributeDefinition =  null, string responseFields =  null)
 		{
-			var url = "/api/commerce/storefront/locations/{code}?responseFields={responseFields}";
+			var url = "/api/commerce/storefront/locations/{locationCode}?includeAttributeDefinition={includeAttributeDefinition}&responseFields={responseFields}";
 			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
-			mozuUrl.FormatUrl( "code", code);
+			mozuUrl.FormatUrl( "includeAttributeDefinition", includeAttributeDefinition);
+			mozuUrl.FormatUrl( "locationCode", locationCode);
 			mozuUrl.FormatUrl( "responseFields", responseFields);
 			return mozuUrl;
 		}
@@ -36,20 +38,22 @@ public static MozuUrl GetLocationUrl(string code, string responseFields =  null)
 		/// <summary>
         /// Get Resource Url for GetLocationsInUsageType
         /// </summary>
-        /// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
+        /// <param name="filter"></param>
+        /// <param name="includeAttributeDefinition"></param>
         /// <param name="locationUsageType">System-defined location usage type code, which is DS for direct ship, SP for in-store pickup, or storeFinder.</param>
-        /// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-        /// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+        /// <param name="pageSize"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="sortBy"></param>
+        /// <param name="startIndex"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
-        public static MozuUrl GetLocationsInUsageTypeUrl(string locationUsageType, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
+        public static MozuUrl GetLocationsInUsageTypeUrl(string locationUsageType, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, bool? includeAttributeDefinition =  null, string responseFields =  null)
 		{
-			var url = "/api/commerce/storefront/locationUsageTypes/{locationUsageType}/locations?startIndex={startIndex}&pageSize={pageSize}&sortBy={sortBy}&filter={filter}&responseFields={responseFields}";
+			var url = "/api/commerce/storefront/locationUsageTypes/{locationUsageType}/locations?startIndex={startIndex}&pageSize={pageSize}&sortBy={sortBy}&filter={filter}&includeAttributeDefinition={includeAttributeDefinition}&responseFields={responseFields}";
 			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
 			mozuUrl.FormatUrl( "filter", filter);
+			mozuUrl.FormatUrl( "includeAttributeDefinition", includeAttributeDefinition);
 			mozuUrl.FormatUrl( "locationUsageType", locationUsageType);
 			mozuUrl.FormatUrl( "pageSize", pageSize);
 			mozuUrl.FormatUrl( "responseFields", responseFields);
@@ -61,14 +65,16 @@ public static MozuUrl GetLocationsInUsageTypeUrl(string locationUsageType, int?
 		/// <summary>
         /// Get Resource Url for GetDirectShipLocation
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="includeAttributeDefinition"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
-        public static MozuUrl GetDirectShipLocationUrl(string responseFields =  null)
+        public static MozuUrl GetDirectShipLocationUrl(bool? includeAttributeDefinition =  null, string responseFields =  null)
 		{
-			var url = "/api/commerce/storefront/locationUsageTypes/DS/location?responseFields={responseFields}";
+			var url = "/api/commerce/storefront/locationUsageTypes/DS/location?includeAttributeDefinition={includeAttributeDefinition}&responseFields={responseFields}";
 			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
+			mozuUrl.FormatUrl( "includeAttributeDefinition", includeAttributeDefinition);
 			mozuUrl.FormatUrl( "responseFields", responseFields);
 			return mozuUrl;
 		}
@@ -76,16 +82,18 @@ public static MozuUrl GetDirectShipLocationUrl(string responseFields =  null)
 		/// <summary>
         /// Get Resource Url for GetInStorePickupLocation
         /// </summary>
-        /// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="includeAttributeDefinition"></param>
+        /// <param name="locationCode"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
-        public static MozuUrl GetInStorePickupLocationUrl(string code, string responseFields =  null)
+        public static MozuUrl GetInStorePickupLocationUrl(string locationCode, bool? includeAttributeDefinition =  null, string responseFields =  null)
 		{
-			var url = "/api/commerce/storefront/locationUsageTypes/SP/locations/{code}?responseFields={responseFields}";
+			var url = "/api/commerce/storefront/locationUsageTypes/SP/locations/{locationCode}?includeAttributeDefinition={includeAttributeDefinition}&responseFields={responseFields}";
 			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
-			mozuUrl.FormatUrl( "code", code);
+			mozuUrl.FormatUrl( "includeAttributeDefinition", includeAttributeDefinition);
+			mozuUrl.FormatUrl( "locationCode", locationCode);
 			mozuUrl.FormatUrl( "responseFields", responseFields);
 			return mozuUrl;
 		}
@@ -93,19 +101,21 @@ public static MozuUrl GetInStorePickupLocationUrl(string code, string responseFi
 		/// <summary>
         /// Get Resource Url for GetInStorePickupLocations
         /// </summary>
-        /// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-        /// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-        /// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+        /// <param name="filter"></param>
+        /// <param name="includeAttributeDefinition"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="sortBy"></param>
+        /// <param name="startIndex"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
-        public static MozuUrl GetInStorePickupLocationsUrl(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
+        public static MozuUrl GetInStorePickupLocationsUrl(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, bool? includeAttributeDefinition =  null, string responseFields =  null)
 		{
-			var url = "/api/commerce/storefront/locationUsageTypes/SP/locations?startIndex={startIndex}&pageSize={pageSize}&sortBy={sortBy}&filter={filter}&responseFields={responseFields}";
+			var url = "/api/commerce/storefront/locationUsageTypes/SP/locations?startIndex={startIndex}&pageSize={pageSize}&sortBy={sortBy}&filter={filter}&includeAttributeDefinition={includeAttributeDefinition}&responseFields={responseFields}";
 			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
 			mozuUrl.FormatUrl( "filter", filter);
+			mozuUrl.FormatUrl( "includeAttributeDefinition", includeAttributeDefinition);
 			mozuUrl.FormatUrl( "pageSize", pageSize);
 			mozuUrl.FormatUrl( "responseFields", responseFields);
 			mozuUrl.FormatUrl( "sortBy", sortBy);
diff --git a/Mozu.Api/Urls/Commerce/OrderUrl.cs b/Mozu.Api/Urls/Commerce/OrderUrl.cs
old mode 100644
new mode 100755
index 6b34b67c..7246fa5e
--- a/Mozu.Api/Urls/Commerce/OrderUrl.cs
+++ b/Mozu.Api/Urls/Commerce/OrderUrl.cs
@@ -19,21 +19,23 @@ public partial class OrderUrl
 		/// <summary>
         /// Get Resource Url for GetOrders
         /// </summary>
-        /// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-        /// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-        /// <param name="q">A list of order search terms (not phrases) to use in the query when searching across order number and the name or email of the billing contact. When entering, separate multiple search terms with a space character.</param>
+        /// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. You can filter an order's search results by any of its properties, including status, contact information, or total. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=Status+eq+Submitted"</param>
+        /// <param name="includeBin"></param>
+        /// <param name="pageSize">Used to page results from a query. Indicates the maximum number of entities to return from a query. Default value: 20. Max value: 200.</param>
+        /// <param name="q">A list of order search terms to use in the query when searching across order number and the name or email of the billing contact. Separate multiple search terms with a space character.</param>
         /// <param name="qLimit">The maximum number of search results to return in the response. You can limit any range between 1-100.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="sortBy"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="sortBy">The element to sort the results by and the order in which the results appear. Either ascending order (a-z) which accepts 'asc' or 'asc' or descending order (z-a) which accepts 'desc' or 'desc'. The sortBy parameter follows an available property. For examp</param>
         /// <param name="startIndex"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
-        public static MozuUrl GetOrdersUrl(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string q =  null, int? qLimit =  null, string responseFields =  null)
+        public static MozuUrl GetOrdersUrl(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string q =  null, int? qLimit =  null, bool? includeBin =  null, string responseFields =  null)
 		{
-			var url = "/api/commerce/orders/?startIndex={startIndex}&pageSize={pageSize}&sortBy={sortBy}&filter={filter}&q={q}&qLimit={qLimit}&responseFields={responseFields}";
+			var url = "/api/commerce/orders/?startIndex={startIndex}&pageSize={pageSize}&sortBy={sortBy}&filter={filter}&q={q}&qLimit={qLimit}&includeBin={includeBin}&responseFields={responseFields}";
 			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
 			mozuUrl.FormatUrl( "filter", filter);
+			mozuUrl.FormatUrl( "includeBin", includeBin);
 			mozuUrl.FormatUrl( "pageSize", pageSize);
 			mozuUrl.FormatUrl( "q", q);
 			mozuUrl.FormatUrl( "qLimit", qLimit);
@@ -46,7 +48,7 @@ public static MozuUrl GetOrdersUrl(int? startIndex =  null, int? pageSize =  nul
 		/// <summary>
         /// Get Resource Url for GetAvailableActions
         /// </summary>
-        /// <param name="orderId">Unique identifier of the order.</param>
+        /// <param name="orderId">Unique identifier of the available order actions to get.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -61,7 +63,7 @@ public static MozuUrl GetAvailableActionsUrl(string orderId)
 		/// <summary>
         /// Get Resource Url for GetTaxableOrders
         /// </summary>
-        /// <param name="orderId">Unique identifier of the order.</param>
+        /// <param name="orderId">Unique identifier of the order to retrieve.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -77,16 +79,18 @@ public static MozuUrl GetTaxableOrdersUrl(string orderId)
         /// Get Resource Url for GetOrder
         /// </summary>
         /// <param name="draft">If true, retrieve the draft version of the order, which might include uncommitted changes to the order or its components.</param>
-        /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="includeBin"></param>
+        /// <param name="orderId">Unique identifier of the order details to get.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
-        public static MozuUrl GetOrderUrl(string orderId, bool? draft =  null, string responseFields =  null)
+        public static MozuUrl GetOrderUrl(string orderId, bool? draft =  null, bool? includeBin =  null, string responseFields =  null)
 		{
-			var url = "/api/commerce/orders/{orderId}?draft={draft}&responseFields={responseFields}";
+			var url = "/api/commerce/orders/{orderId}?draft={draft}&includeBin={includeBin}&responseFields={responseFields}";
 			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
 			mozuUrl.FormatUrl( "draft", draft);
+			mozuUrl.FormatUrl( "includeBin", includeBin);
 			mozuUrl.FormatUrl( "orderId", orderId);
 			mozuUrl.FormatUrl( "responseFields", responseFields);
 			return mozuUrl;
@@ -95,8 +99,8 @@ public static MozuUrl GetOrderUrl(string orderId, bool? draft =  null, string re
 				/// <summary>
         /// Get Resource Url for CreateOrderFromCart
         /// </summary>
-        /// <param name="cartId">Identifier of the cart to delete.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="cartId">Unique identifier of the cart. This is the original cart ID expressed as a GUID.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -112,7 +116,7 @@ public static MozuUrl CreateOrderFromCartUrl(string cartId, string responseField
 		/// <summary>
         /// Get Resource Url for CreateOrder
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -128,7 +132,7 @@ public static MozuUrl CreateOrderUrl(string responseFields =  null)
         /// Get Resource Url for PerformOrderAction
         /// </summary>
         /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -141,12 +145,31 @@ public static MozuUrl PerformOrderActionUrl(string orderId, string responseField
 			return mozuUrl;
 		}
 
+		/// <summary>
+        /// Get Resource Url for PriceOrder
+        /// </summary>
+        /// <param name="couponCodeToApply"></param>
+        /// <param name="refreshShipping"></param>
+        /// <param name="responseFields"></param>
+        /// <returns>
+        /// String - Resource Url
+        /// </returns>
+        public static MozuUrl PriceOrderUrl(bool refreshShipping, string couponCodeToApply =  null, string responseFields =  null)
+		{
+			var url = "/api/commerce/orders/price?refreshShipping={refreshShipping}&couponCodeToApply={couponCodeToApply}&responseFields={responseFields}";
+			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
+			mozuUrl.FormatUrl( "couponCodeToApply", couponCodeToApply);
+			mozuUrl.FormatUrl( "refreshShipping", refreshShipping);
+			mozuUrl.FormatUrl( "responseFields", responseFields);
+			return mozuUrl;
+		}
+
 				/// <summary>
         /// Get Resource Url for ProcessDigitalWallet
         /// </summary>
-        /// <param name="digitalWalletType">The type of digital wallet to be processed.</param>
-        /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="digitalWalletType"></param>
+        /// <param name="orderId"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -163,11 +186,11 @@ public static MozuUrl ProcessDigitalWalletUrl(string orderId, string digitalWall
 		/// <summary>
         /// Get Resource Url for UpdateOrderDiscount
         /// </summary>
-        /// <param name="discountId">discountId parameter description DOCUMENT_HERE </param>
-        /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-        /// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
+        /// <param name="discountId">Unique identifier of the discount. System-supplied and read only.</param>
+        /// <param name="orderId">Unique identifier of the order discount. System-supplied and read only.</param>
+        /// <param name="responseFields"></param>
+        /// <param name="updateMode">Specifies whether to modify the discount by updating the original order, updating the order in draft mode, or updating the order in draft mode and then committing the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
+        /// <param name="version"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -186,8 +209,8 @@ public static MozuUrl UpdateOrderDiscountUrl(string orderId, int discountId, str
 		/// <summary>
         /// Get Resource Url for DeleteOrderDraft
         /// </summary>
-        /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="version">Determines whether or not to check versioning of items for concurrency purposes.</param>
+        /// <param name="orderId">Unique identifier of the order associated with the draft to delete.</param>
+        /// <param name="version">If applicable, the version of the order draft to delete.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -203,7 +226,7 @@ public static MozuUrl DeleteOrderDraftUrl(string orderId, string version =  null
 		/// <summary>
         /// Get Resource Url for ResendOrderConfirmationEmail
         /// </summary>
-        /// <param name="orderId">Unique identifier of the order.</param>
+        /// <param name="orderId"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -218,10 +241,10 @@ public static MozuUrl ResendOrderConfirmationEmailUrl(string orderId)
 		/// <summary>
         /// Get Resource Url for ChangeOrderPriceList
         /// </summary>
-        /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-        /// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-        /// <param name="version">Determines whether or not to check versioning of items for concurrency purposes.</param>
+        /// <param name="orderId"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="updateMode"></param>
+        /// <param name="version"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -240,7 +263,7 @@ public static MozuUrl ChangeOrderPriceListUrl(string orderId, string updateMode
         /// Get Resource Url for ChangeOrderUserId
         /// </summary>
         /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -256,10 +279,10 @@ public static MozuUrl ChangeOrderUserIdUrl(string orderId, string responseFields
 		/// <summary>
         /// Get Resource Url for UpdateOrder
         /// </summary>
-        /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="orderId">Unique identifier of the order to update.</param>
+        /// <param name="responseFields"></param>
         /// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-        /// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
+        /// <param name="version"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Orders/AdjustmentUrl.cs b/Mozu.Api/Urls/Commerce/Orders/AdjustmentUrl.cs
old mode 100644
new mode 100755
index e1f39582..e0f8ec83
--- a/Mozu.Api/Urls/Commerce/Orders/AdjustmentUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Orders/AdjustmentUrl.cs
@@ -19,10 +19,10 @@ public partial class AdjustmentUrl
 						/// <summary>
         /// Get Resource Url for ApplyHandlingAdjustment
         /// </summary>
-        /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-        /// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-        /// <param name="version">Determines whether or not to check versioning of items for concurrency purposes.</param>
+        /// <param name="orderId"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="updateMode"></param>
+        /// <param name="version"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -40,10 +40,10 @@ public static MozuUrl ApplyHandlingAdjustmentUrl(string orderId, string updateMo
 		/// <summary>
         /// Get Resource Url for ApplyShippingAdjustment
         /// </summary>
-        /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-        /// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
+        /// <param name="orderId">Unique identifier of the order associated with the shipping adjustment.</param>
+        /// <param name="responseFields"></param>
+        /// <param name="updateMode">Specifies whether to apply the shipping adjustment by updating the original order, updating the order in draft mode, or updating the order in draft mode and then committing the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
+        /// <param name="version"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -61,10 +61,10 @@ public static MozuUrl ApplyShippingAdjustmentUrl(string orderId, string updateMo
 		/// <summary>
         /// Get Resource Url for ApplyAdjustment
         /// </summary>
-        /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-        /// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
+        /// <param name="orderId">Unique identifier of the order for which to apply the adjustment.</param>
+        /// <param name="responseFields"></param>
+        /// <param name="updateMode">Specifies whether to apply the adjustment by updating the original order, updating the order in draft mode, or updating the order in draft mode and then committing the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
+        /// <param name="version"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -82,9 +82,9 @@ public static MozuUrl ApplyAdjustmentUrl(string orderId, string updateMode =  nu
 				/// <summary>
         /// Get Resource Url for RemoveHandlingAdjustment
         /// </summary>
-        /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-        /// <param name="version">Determines whether or not to check versioning of items for concurrency purposes.</param>
+        /// <param name="orderId"></param>
+        /// <param name="updateMode"></param>
+        /// <param name="version"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -101,9 +101,9 @@ public static MozuUrl RemoveHandlingAdjustmentUrl(string orderId, string updateM
 		/// <summary>
         /// Get Resource Url for RemoveShippingAdjustment
         /// </summary>
-        /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-        /// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
+        /// <param name="orderId">Unique identifier of the order with the applied shipping adjustment.</param>
+        /// <param name="updateMode">Specifies whether to remove the shipping adjustment by updating the original order, updating the order in draft mode, or updating the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
+        /// <param name="version"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -120,9 +120,9 @@ public static MozuUrl RemoveShippingAdjustmentUrl(string orderId, string updateM
 		/// <summary>
         /// Get Resource Url for RemoveAdjustment
         /// </summary>
-        /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-        /// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
+        /// <param name="orderId">Unique identifier of the order for which to delete the adjustment.</param>
+        /// <param name="updateMode">Specifies whether to remove the adjustment by updating the original order, updating the order in draft mode, or updating the order in draft mode and then committing the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
+        /// <param name="version"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Orders/AppliedDiscountUrl.cs b/Mozu.Api/Urls/Commerce/Orders/AppliedDiscountUrl.cs
old mode 100644
new mode 100755
index 09cf0fa3..de5bb2af
--- a/Mozu.Api/Urls/Commerce/Orders/AppliedDiscountUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Orders/AppliedDiscountUrl.cs
@@ -19,11 +19,11 @@ public partial class AppliedDiscountUrl
 						/// <summary>
         /// Get Resource Url for ApplyCoupon
         /// </summary>
-        /// <param name="couponCode">Alphanumeric code associated with the coupon or promotion that results in a discounted price.</param>
-        /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-        /// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
+        /// <param name="couponCode"></param>
+        /// <param name="orderId">Unique identifier of the order to associate the coupon. System-supplied and read-only.</param>
+        /// <param name="responseFields"></param>
+        /// <param name="updateMode">Specifies whether to apply the coupon by updating the original order, updating the order in draft mode, or updating the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
+        /// <param name="version"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -42,10 +42,10 @@ public static MozuUrl ApplyCouponUrl(string orderId, string couponCode, string u
 				/// <summary>
         /// Get Resource Url for RemoveCoupon
         /// </summary>
-        /// <param name="couponCode">Alphanumeric code associated with the coupon or promotion that results in a discounted price.</param>
-        /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-        /// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
+        /// <param name="couponCode"></param>
+        /// <param name="orderId">Unique identifier of the order with the coupon to remove.</param>
+        /// <param name="updateMode">Specifies whether to remove the coupon by updating the original order, updating the order in draft mode, or updating the order in draft mode and then committing the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
+        /// <param name="version"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -63,9 +63,9 @@ public static MozuUrl RemoveCouponUrl(string orderId, string couponCode, string
 		/// <summary>
         /// Get Resource Url for RemoveCoupons
         /// </summary>
-        /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-        /// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
+        /// <param name="orderId">Unique identifier of the order with the coupons to remove.</param>
+        /// <param name="updateMode">Specifies whether to remove coupons by updating the original order, updating the order in draft mode, or updating the order in draft mode and then committing the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
+        /// <param name="version"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Orders/Attributedefinition/AttributeUrl.cs b/Mozu.Api/Urls/Commerce/Orders/Attributedefinition/AttributeUrl.cs
old mode 100644
new mode 100755
index 27792302..47f0bcb2
--- a/Mozu.Api/Urls/Commerce/Orders/Attributedefinition/AttributeUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Orders/Attributedefinition/AttributeUrl.cs
@@ -19,11 +19,11 @@ public partial class AttributeUrl
 		/// <summary>
         /// Get Resource Url for GetAttributes
         /// </summary>
-        /// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-        /// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-        /// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+        /// <param name="filter"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="sortBy"></param>
+        /// <param name="startIndex"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -42,7 +42,7 @@ public static MozuUrl GetAttributesUrl(int? startIndex =  null, int? pageSize =
 		/// <summary>
         /// Get Resource Url for GetAttributeVocabularyValues
         /// </summary>
-        /// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
+        /// <param name="attributeFQN"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -57,8 +57,8 @@ public static MozuUrl GetAttributeVocabularyValuesUrl(string attributeFQN)
 		/// <summary>
         /// Get Resource Url for GetAttribute
         /// </summary>
-        /// <param name="attributeFQN">The fully qualified name of the attribute, which is a user defined attribute identifier.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="attributeFQN"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -74,7 +74,7 @@ public static MozuUrl GetAttributeUrl(string attributeFQN, string responseFields
 				/// <summary>
         /// Get Resource Url for CreateAttribute
         /// </summary>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -89,8 +89,8 @@ public static MozuUrl CreateAttributeUrl(string responseFields =  null)
 				/// <summary>
         /// Get Resource Url for UpdateAttribute
         /// </summary>
-        /// <param name="attributeFQN">Fully qualified name for an attribute.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="attributeFQN"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Orders/BillingInfoUrl.cs b/Mozu.Api/Urls/Commerce/Orders/BillingInfoUrl.cs
old mode 100644
new mode 100755
index ac6b9244..52b5bf4c
--- a/Mozu.Api/Urls/Commerce/Orders/BillingInfoUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Orders/BillingInfoUrl.cs
@@ -19,9 +19,9 @@ public partial class BillingInfoUrl
 		/// <summary>
         /// Get Resource Url for GetBillingInfo
         /// </summary>
-        /// <param name="draft">If true, retrieve the draft version of the order, which might include uncommitted changes to the order or its components.</param>
+        /// <param name="draft">If true, retrieve the draft version of the order billing information, which might include uncommitted changes.</param>
         /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -39,9 +39,9 @@ public static MozuUrl GetBillingInfoUrl(string orderId, bool? draft =  null, str
         /// Get Resource Url for SetBillingInfo
         /// </summary>
         /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-        /// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
+        /// <param name="responseFields"></param>
+        /// <param name="updateMode">Specifies whether to set the billing information by updating the original order, updating the order in draft mode, or updating the order in draft mode and then committing the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
+        /// <param name="version"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Orders/DigitalPackageUrl.cs b/Mozu.Api/Urls/Commerce/Orders/DigitalPackageUrl.cs
old mode 100644
new mode 100755
index 3a2ac0df..52732737
--- a/Mozu.Api/Urls/Commerce/Orders/DigitalPackageUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Orders/DigitalPackageUrl.cs
@@ -20,7 +20,7 @@ public partial class DigitalPackageUrl
         /// Get Resource Url for GetAvailableDigitalPackageFulfillmentActions
         /// </summary>
         /// <param name="digitalPackageId">This parameter supplies package ID to get fulfillment actions for the digital package.</param>
-        /// <param name="orderId">Unique identifier of the order.</param>
+        /// <param name="orderId">This parameter provides the unique identifier of the order on which to get a list of available actions.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -36,9 +36,9 @@ public static MozuUrl GetAvailableDigitalPackageFulfillmentActionsUrl(string ord
 		/// <summary>
         /// Get Resource Url for GetDigitalPackage
         /// </summary>
-        /// <param name="digitalPackageId">This parameter supplies package ID to get fulfillment actions for the digital package.</param>
-        /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="digitalPackageId">This parameter provides the digital package Id.</param>
+        /// <param name="orderId">This parameter provides the unique identifier of the order with which to associate the digital package.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -55,8 +55,8 @@ public static MozuUrl GetDigitalPackageUrl(string orderId, string digitalPackage
 				/// <summary>
         /// Get Resource Url for CreateDigitalPackage
         /// </summary>
-        /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="orderId">The orderID is a required paramter for the digitalpackages operation. The orderId is a unique identifier of the order with which to associate the digital package.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -72,9 +72,9 @@ public static MozuUrl CreateDigitalPackageUrl(string orderId, string responseFie
 				/// <summary>
         /// Get Resource Url for UpdateDigitalPackage
         /// </summary>
-        /// <param name="digitalPackageId">This parameter supplies package ID to get fulfillment actions for the digital package.</param>
-        /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="digitalPackageId">This parameter specifies the digital package to update in the order.</param>
+        /// <param name="orderId">This parameter provides the unique identifier of the order with which to associate the digital package.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -91,8 +91,8 @@ public static MozuUrl UpdateDigitalPackageUrl(string orderId, string digitalPack
 				/// <summary>
         /// Get Resource Url for DeleteDigitalPackage
         /// </summary>
-        /// <param name="digitalPackageId">This parameter supplies package ID to get fulfillment actions for the digital package.</param>
-        /// <param name="orderId">Unique identifier of the order.</param>
+        /// <param name="digitalPackageId">The digitalPackage ID is unique package ID to update on the order.</param>
+        /// <param name="orderId">The orderId is unique identifier of the order with which to associate the package.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Orders/ExtendedPropertyUrl.cs b/Mozu.Api/Urls/Commerce/Orders/ExtendedPropertyUrl.cs
old mode 100644
new mode 100755
index b5b9b88f..2c020076
--- a/Mozu.Api/Urls/Commerce/Orders/ExtendedPropertyUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Orders/ExtendedPropertyUrl.cs
@@ -19,8 +19,8 @@ public partial class ExtendedPropertyUrl
 		/// <summary>
         /// Get Resource Url for GetExtendedProperties
         /// </summary>
-        /// <param name="draft">If true, retrieve the draft version of the order, which might include uncommitted changes to the order or its components.</param>
-        /// <param name="orderId">Unique identifier of the order.</param>
+        /// <param name="draft"></param>
+        /// <param name="orderId"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -36,9 +36,9 @@ public static MozuUrl GetExtendedPropertiesUrl(string orderId, bool? draft =  nu
 				/// <summary>
         /// Get Resource Url for AddExtendedProperties
         /// </summary>
-        /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-        /// <param name="version">Determines whether or not to check versioning of items for concurrency purposes.</param>
+        /// <param name="orderId"></param>
+        /// <param name="updateMode"></param>
+        /// <param name="version"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -55,12 +55,12 @@ public static MozuUrl AddExtendedPropertiesUrl(string orderId, string updateMode
 				/// <summary>
         /// Get Resource Url for UpdateExtendedProperty
         /// </summary>
-        /// <param name="key">The extended property key.</param>
-        /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-        /// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-        /// <param name="upsert">Inserts and updates an extended property.        </param>
-        /// <param name="version">Determines whether or not to check versioning of items for concurrency purposes.</param>
+        /// <param name="key"></param>
+        /// <param name="orderId"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="updateMode"></param>
+        /// <param name="upsert"></param>
+        /// <param name="version"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -80,10 +80,10 @@ public static MozuUrl UpdateExtendedPropertyUrl(string orderId, string key, stri
 		/// <summary>
         /// Get Resource Url for UpdateExtendedProperties
         /// </summary>
-        /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-        /// <param name="upsert">Inserts and updates the extended property.        </param>
-        /// <param name="version">Determines whether or not to check versioning of items for concurrency purposes.</param>
+        /// <param name="orderId"></param>
+        /// <param name="updateMode"></param>
+        /// <param name="upsert"></param>
+        /// <param name="version"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -101,10 +101,10 @@ public static MozuUrl UpdateExtendedPropertiesUrl(string orderId, string updateM
 				/// <summary>
         /// Get Resource Url for DeleteExtendedProperty
         /// </summary>
-        /// <param name="key">The extended property key.</param>
-        /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-        /// <param name="version">Determines whether or not to check versioning of items for concurrency purposes.</param>
+        /// <param name="key"></param>
+        /// <param name="orderId"></param>
+        /// <param name="updateMode"></param>
+        /// <param name="version"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -122,9 +122,9 @@ public static MozuUrl DeleteExtendedPropertyUrl(string orderId, string key, stri
 		/// <summary>
         /// Get Resource Url for DeleteExtendedProperties
         /// </summary>
-        /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-        /// <param name="version">Determines whether or not to check versioning of items for concurrency purposes.</param>
+        /// <param name="orderId"></param>
+        /// <param name="updateMode"></param>
+        /// <param name="version"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Orders/FulfillmentActionUrl.cs b/Mozu.Api/Urls/Commerce/Orders/FulfillmentActionUrl.cs
old mode 100644
new mode 100755
index 0ec29c82..ba7b57f1
--- a/Mozu.Api/Urls/Commerce/Orders/FulfillmentActionUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Orders/FulfillmentActionUrl.cs
@@ -19,8 +19,8 @@ public partial class FulfillmentActionUrl
 				/// <summary>
         /// Get Resource Url for PerformFulfillmentAction
         /// </summary>
-        /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="orderId">Unique identifier of the order for which to perform the fulfillment action.</param>
+        /// <param name="responseFields">Updated order with a new fulfillment status resulting from the action supplied in the request.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -36,8 +36,8 @@ public static MozuUrl PerformFulfillmentActionUrl(string orderId, string respons
 		/// <summary>
         /// Get Resource Url for ResendPackageFulfillmentEmail
         /// </summary>
-        /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="orderId"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Orders/FulfillmentInfoUrl.cs b/Mozu.Api/Urls/Commerce/Orders/FulfillmentInfoUrl.cs
old mode 100644
new mode 100755
index a4ab88df..2dea2d9f
--- a/Mozu.Api/Urls/Commerce/Orders/FulfillmentInfoUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Orders/FulfillmentInfoUrl.cs
@@ -19,9 +19,9 @@ public partial class FulfillmentInfoUrl
 		/// <summary>
         /// Get Resource Url for GetFulfillmentInfo
         /// </summary>
-        /// <param name="draft">If true, retrieve the draft version of the order, which might include uncommitted changes to the order or its components.</param>
+        /// <param name="draft">If true, retrieve the draft version of the order's fulfillment information, which might include uncommitted changes.</param>
         /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -39,9 +39,9 @@ public static MozuUrl GetFulfillmentInfoUrl(string orderId, bool? draft =  null,
         /// Get Resource Url for SetFulFillmentInfo
         /// </summary>
         /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-        /// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
+        /// <param name="responseFields"></param>
+        /// <param name="updateMode">Specifies whether to set the fulfillment information by updating the original order, updating the order in draft mode, or updating the order in draft mode and then committing the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
+        /// <param name="version"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Orders/OrderAttributeUrl.cs b/Mozu.Api/Urls/Commerce/Orders/OrderAttributeUrl.cs
old mode 100644
new mode 100755
index 36eb4277..607038be
--- a/Mozu.Api/Urls/Commerce/Orders/OrderAttributeUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Orders/OrderAttributeUrl.cs
@@ -19,7 +19,7 @@ public partial class OrderAttributeUrl
 		/// <summary>
         /// Get Resource Url for GetOrderAttributes
         /// </summary>
-        /// <param name="orderId">Unique identifier of the order.</param>
+        /// <param name="orderId">Unique identifier of the order for which to retrieve a list of defined attributes.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -34,7 +34,7 @@ public static MozuUrl GetOrderAttributesUrl(string orderId)
 				/// <summary>
         /// Get Resource Url for CreateOrderAttributes
         /// </summary>
-        /// <param name="orderId">Unique identifier of the order.</param>
+        /// <param name="orderId">Unique identifier of the order for which to assign the attributes.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -49,7 +49,7 @@ public static MozuUrl CreateOrderAttributesUrl(string orderId)
 				/// <summary>
         /// Get Resource Url for UpdateOrderAttributes
         /// </summary>
-        /// <param name="orderId">Unique identifier of the order.</param>
+        /// <param name="orderId">Identifier of the order for which to update attributes.</param>
         /// <param name="removeMissing">If true, the operation removes missing properties so that the updated order attributes will not show properties with a null value.</param>
         /// <returns>
         /// String - Resource Url
diff --git a/Mozu.Api/Urls/Commerce/Orders/OrderItemUrl.cs b/Mozu.Api/Urls/Commerce/Orders/OrderItemUrl.cs
old mode 100644
new mode 100755
index 54a9d8db..6b0287ab
--- a/Mozu.Api/Urls/Commerce/Orders/OrderItemUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Orders/OrderItemUrl.cs
@@ -19,10 +19,10 @@ public partial class OrderItemUrl
 		/// <summary>
         /// Get Resource Url for GetOrderItemViaLineId
         /// </summary>
-        /// <param name="draft">If true, retrieve the draft version of the order, which might include uncommitted changes to the order or its components.</param>
-        /// <param name="lineId">The specific line id that's associated with the order item.</param>
-        /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="draft"></param>
+        /// <param name="lineId"></param>
+        /// <param name="orderId"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -40,10 +40,10 @@ public static MozuUrl GetOrderItemViaLineIdUrl(string orderId, int lineId, bool?
 		/// <summary>
         /// Get Resource Url for GetOrderItem
         /// </summary>
-        /// <param name="draft">If true, retrieve the draft version of the order, which might include uncommitted changes to the order or its components.</param>
-        /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="orderItemId">Unique identifier of the item to remove from the order.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="draft">If true, retrieve the draft version of this order item, which might include uncommitted changes to the order item, the order, or other order components.</param>
+        /// <param name="orderId">Unique identifier of the order item to retrieve.</param>
+        /// <param name="orderItemId">Unique identifier of the order item details to retrieve.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -61,9 +61,9 @@ public static MozuUrl GetOrderItemUrl(string orderId, string orderItemId, bool?
 		/// <summary>
         /// Get Resource Url for GetOrderItems
         /// </summary>
-        /// <param name="draft">If true, retrieve the draft version of the order, which might include uncommitted changes to the order or its components.</param>
-        /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="draft">If true, retrieve the draft version of the order's items, which might include uncommitted changes to one or more order items, the order itself, or other order components.</param>
+        /// <param name="orderId">Unique identifier of the order items to retrieve.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -80,11 +80,11 @@ public static MozuUrl GetOrderItemsUrl(string orderId, bool? draft =  null, stri
 				/// <summary>
         /// Get Resource Url for CreateOrderItem
         /// </summary>
-        /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="skipInventoryCheck">If true, skip the process to validate inventory when creating this product reservation.</param>
-        /// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-        /// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
+        /// <param name="orderId">Unique identifier of the order for which to add the item.</param>
+        /// <param name="responseFields"></param>
+        /// <param name="skipInventoryCheck">If true, do not validate the product inventory when adding this item to the order.</param>
+        /// <param name="updateMode">Specifies whether to add the item by updating the original order, updating the order in draft mode, or updating the order in draft mode and then committing the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
+        /// <param name="version"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -103,12 +103,12 @@ public static MozuUrl CreateOrderItemUrl(string orderId, string updateMode =  nu
 				/// <summary>
         /// Get Resource Url for UpdateOrderItemDiscount
         /// </summary>
-        /// <param name="discountId">discountId parameter description DOCUMENT_HERE </param>
-        /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="orderItemId">Unique identifier of the item to remove from the order.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-        /// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
+        /// <param name="discountId">Unique identifier of the discount. System-supplied and read only.</param>
+        /// <param name="orderId">Unique identifier of the order associated with the item discount.</param>
+        /// <param name="orderItemId">Unique identifier of the item in the order.</param>
+        /// <param name="responseFields"></param>
+        /// <param name="updateMode">Specifies whether to change the item discount by updating the original order, updating the order in draft mode, or updating the order in draft mode and then committing the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
+        /// <param name="version"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -128,12 +128,12 @@ public static MozuUrl UpdateOrderItemDiscountUrl(string orderId, string orderIte
 		/// <summary>
         /// Get Resource Url for UpdateItemDuty
         /// </summary>
-        /// <param name="dutyAmount">The amount added to the order item for duty fees.        </param>
-        /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="orderItemId">Unique identifier of the item to remove from the order.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-        /// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-        /// <param name="version">Determines whether or not to check versioning of items for concurrency purposes.</param>
+        /// <param name="dutyAmount"></param>
+        /// <param name="orderId"></param>
+        /// <param name="orderItemId"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="updateMode"></param>
+        /// <param name="version"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -154,10 +154,10 @@ public static MozuUrl UpdateItemDutyUrl(string orderId, string orderItemId, deci
         /// Get Resource Url for UpdateItemFulfillment
         /// </summary>
         /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="orderItemId">Unique identifier of the item to remove from the order.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-        /// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
+        /// <param name="orderItemId">Unique identifier of the item in the order.</param>
+        /// <param name="responseFields"></param>
+        /// <param name="updateMode">Specifies whether to apply the coupon by updating the original order, updating the order in draft mode, or updating the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
+        /// <param name="version"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -176,12 +176,12 @@ public static MozuUrl UpdateItemFulfillmentUrl(string orderId, string orderItemI
 		/// <summary>
         /// Get Resource Url for UpdateItemProductPrice
         /// </summary>
-        /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="orderItemId">Unique identifier of the item to remove from the order.</param>
+        /// <param name="orderId">Unique identifier of the order containing the item to price override.</param>
+        /// <param name="orderItemId">Unique identifier of the item in the order to price override.</param>
         /// <param name="price">The override price to specify for this item in the specified order.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-        /// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
+        /// <param name="responseFields"></param>
+        /// <param name="updateMode">Specifies whether to change the product price by updating the original order, updating the order in draft mode, or updating the order in draft mode and then committing the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
+        /// <param name="version"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -201,12 +201,12 @@ public static MozuUrl UpdateItemProductPriceUrl(string orderId, string orderItem
 		/// <summary>
         /// Get Resource Url for UpdateItemQuantity
         /// </summary>
-        /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="orderItemId">Unique identifier of the item to remove from the order.</param>
-        /// <param name="quantity">The number of cart items in the shopper's active cart.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-        /// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
+        /// <param name="orderId">Unique identifier of the order containing the item to update quantity.</param>
+        /// <param name="orderItemId">Unique identifier of the item in the order to update quantity.</param>
+        /// <param name="quantity">The quantity of the item in the order to update.</param>
+        /// <param name="responseFields"></param>
+        /// <param name="updateMode">Specifies whether to change the item quantity by updating the original order, updating the order in draft mode, or updating the order in draft mode and then committing the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
+        /// <param name="version"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -226,10 +226,10 @@ public static MozuUrl UpdateItemQuantityUrl(string orderId, string orderItemId,
 				/// <summary>
         /// Get Resource Url for DeleteOrderItem
         /// </summary>
-        /// <param name="orderId">Unique identifier of the order.</param>
+        /// <param name="orderId">Unique identifier of the order with the item to remove.</param>
         /// <param name="orderItemId">Unique identifier of the item to remove from the order.</param>
-        /// <param name="updateMode">Specifies whether to update the original order, update the order in draft mode, or update the order in draft mode and then commit the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
-        /// <param name="version">System-supplied integer that represents the current version of the order, which prevents users from unintentionally overriding changes to the order. When a user performs an operation for a defined order, the system validates that the version of the updated order matches the version of the order on the server. After the operation completes successfully, the system increments the version number by one.</param>
+        /// <param name="updateMode">Specifies whether to remove the item by updating the original order, updating the order in draft mode, or updating the order in draft mode and then committing the changes to the original. Draft mode enables users to make incremental order changes before committing the changes to the original order. Valid values are "ApplyToOriginal," "ApplyToDraft," or "ApplyAndCommit."</param>
+        /// <param name="version"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Orders/OrderNoteUrl.cs b/Mozu.Api/Urls/Commerce/Orders/OrderNoteUrl.cs
old mode 100644
new mode 100755
index d362baf6..4fa7b7cc
--- a/Mozu.Api/Urls/Commerce/Orders/OrderNoteUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Orders/OrderNoteUrl.cs
@@ -34,9 +34,9 @@ public static MozuUrl GetOrderNotesUrl(string orderId)
 		/// <summary>
         /// Get Resource Url for GetOrderNote
         /// </summary>
-        /// <param name="noteId">Unique identifier of a particular note to retrieve.</param>
-        /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="noteId">Unique identifier of the order note to retrieve.</param>
+        /// <param name="orderId">Unique identifier of the order associated with the note.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -53,8 +53,8 @@ public static MozuUrl GetOrderNoteUrl(string orderId, string noteId, string resp
 				/// <summary>
         /// Get Resource Url for CreateOrderNote
         /// </summary>
-        /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="orderId">Unique identifier of the order for which to add a note.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -70,9 +70,9 @@ public static MozuUrl CreateOrderNoteUrl(string orderId, string responseFields =
 				/// <summary>
         /// Get Resource Url for UpdateOrderNote
         /// </summary>
-        /// <param name="noteId">Unique identifier of a particular note to retrieve.</param>
+        /// <param name="noteId">Unique identifier of the order note.</param>
         /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -89,8 +89,8 @@ public static MozuUrl UpdateOrderNoteUrl(string orderId, string noteId, string r
 				/// <summary>
         /// Get Resource Url for DeleteOrderNote
         /// </summary>
-        /// <param name="noteId">Unique identifier of a particular note to retrieve.</param>
-        /// <param name="orderId">Unique identifier of the order.</param>
+        /// <param name="noteId">Unique identifier of the order note to delete.</param>
+        /// <param name="orderId">Unique identifier of the order associated with the note.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Orders/OrderReturnableItemUrl.cs b/Mozu.Api/Urls/Commerce/Orders/OrderReturnableItemUrl.cs
old mode 100644
new mode 100755
index 30dce861..73447148
--- a/Mozu.Api/Urls/Commerce/Orders/OrderReturnableItemUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Orders/OrderReturnableItemUrl.cs
@@ -19,8 +19,8 @@ public partial class OrderReturnableItemUrl
 		/// <summary>
         /// Get Resource Url for GetOrderReturnableItems
         /// </summary>
-        /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="orderId"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Orders/OrderValidationResultUrl.cs b/Mozu.Api/Urls/Commerce/Orders/OrderValidationResultUrl.cs
old mode 100644
new mode 100755
index 2c4e0480..8d9a17c1
--- a/Mozu.Api/Urls/Commerce/Orders/OrderValidationResultUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Orders/OrderValidationResultUrl.cs
@@ -35,7 +35,7 @@ public static MozuUrl GetValidationResultsUrl(string orderId)
         /// Get Resource Url for AddValidationResult
         /// </summary>
         /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Orders/PackageUrl.cs b/Mozu.Api/Urls/Commerce/Orders/PackageUrl.cs
old mode 100644
new mode 100755
index ce76f779..56430c31
--- a/Mozu.Api/Urls/Commerce/Orders/PackageUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Orders/PackageUrl.cs
@@ -19,8 +19,8 @@ public partial class PackageUrl
 		/// <summary>
         /// Get Resource Url for GetAvailablePackageFulfillmentActions
         /// </summary>
-        /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="packageId">Unique identifier of the package for which to retrieve the label.</param>
+        /// <param name="orderId">Unique identifier of the order associated with the package fulfillment.</param>
+        /// <param name="packageId">Unique identifier of the package associated with the fulfillment actions to retrieve.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -36,7 +36,7 @@ public static MozuUrl GetAvailablePackageFulfillmentActionsUrl(string orderId, s
 		/// <summary>
         /// Get Resource Url for GetPackageLabel
         /// </summary>
-        /// <param name="orderId">Unique identifier of the order.</param>
+        /// <param name="orderId">Unique identifier of the order associated with the package label to retrieve.</param>
         /// <param name="packageId">Unique identifier of the package for which to retrieve the label.</param>
         /// <returns>
         /// String - Resource Url
@@ -53,9 +53,9 @@ public static MozuUrl GetPackageLabelUrl(string orderId, string packageId)
 		/// <summary>
         /// Get Resource Url for GetPackage
         /// </summary>
-        /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="packageId">Unique identifier of the package for which to retrieve the label.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="orderId">Unique identifier of the order associated with the package to retrieve.</param>
+        /// <param name="packageId">Unique identifier of the package to retrieve.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -72,8 +72,8 @@ public static MozuUrl GetPackageUrl(string orderId, string packageId, string res
 				/// <summary>
         /// Get Resource Url for CreatePackage
         /// </summary>
-        /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="orderId">Unique identifier of the order associated with this package.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -89,9 +89,9 @@ public static MozuUrl CreatePackageUrl(string orderId, string responseFields =
 				/// <summary>
         /// Get Resource Url for UpdatePackage
         /// </summary>
-        /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="packageId">Unique identifier of the package for which to retrieve the label.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="orderId">Unique identifier of the order associated with the package to update.</param>
+        /// <param name="packageId">Unique identifier of the package of order items to update.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -108,8 +108,8 @@ public static MozuUrl UpdatePackageUrl(string orderId, string packageId, string
 				/// <summary>
         /// Get Resource Url for DeletePackage
         /// </summary>
-        /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="packageId">Unique identifier of the package for which to retrieve the label.</param>
+        /// <param name="orderId">Unique identifier of the order associated with the package to delete.</param>
+        /// <param name="packageId">Unique identifier of the package to delete.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Orders/PaymentUrl.cs b/Mozu.Api/Urls/Commerce/Orders/PaymentUrl.cs
old mode 100644
new mode 100755
index fa7035ee..9a91f3a6
--- a/Mozu.Api/Urls/Commerce/Orders/PaymentUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Orders/PaymentUrl.cs
@@ -20,7 +20,7 @@ public partial class PaymentUrl
         /// Get Resource Url for GetPayments
         /// </summary>
         /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -36,8 +36,8 @@ public static MozuUrl GetPaymentsUrl(string orderId, string responseFields =  nu
 		/// <summary>
         /// Get Resource Url for GetAvailablePaymentActions
         /// </summary>
-        /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="paymentId">Unique identifier of the payment for which to perform the action.</param>
+        /// <param name="orderId">Unique identifier of the order associated with the payment.</param>
+        /// <param name="paymentId">Unique identifer of the payment for which to retrieve available actions.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -53,9 +53,9 @@ public static MozuUrl GetAvailablePaymentActionsUrl(string orderId, string payme
 		/// <summary>
         /// Get Resource Url for GetPayment
         /// </summary>
-        /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="paymentId">Unique identifier of the payment for which to perform the action.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="orderId">Unique identifier of the order associated with the payment transaction.</param>
+        /// <param name="paymentId">Unique identifier of the payment transaction submitted for the order.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -72,9 +72,9 @@ public static MozuUrl GetPaymentUrl(string orderId, string paymentId, string res
 				/// <summary>
         /// Get Resource Url for PerformPaymentAction
         /// </summary>
-        /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="paymentId">Unique identifier of the payment for which to perform the action.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="orderId">Unique identifier of the order associated with the payment.</param>
+        /// <param name="paymentId">Unique identifer of the payment for which to perform the action.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -91,8 +91,8 @@ public static MozuUrl PerformPaymentActionUrl(string orderId, string paymentId,
 		/// <summary>
         /// Get Resource Url for CreatePaymentAction
         /// </summary>
-        /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="orderId">Unique identifier of the order for which to apply the payment.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Orders/PickupUrl.cs b/Mozu.Api/Urls/Commerce/Orders/PickupUrl.cs
old mode 100644
new mode 100755
index 962788e8..4b352361
--- a/Mozu.Api/Urls/Commerce/Orders/PickupUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Orders/PickupUrl.cs
@@ -19,8 +19,8 @@ public partial class PickupUrl
 		/// <summary>
         /// Get Resource Url for GetAvailablePickupFulfillmentActions
         /// </summary>
-        /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="pickupId">Unique identifier of the pickup to remove.</param>
+        /// <param name="orderId">Unique identifier of the order associated with the pickup.</param>
+        /// <param name="pickupId">Unique identifier of the pickup for which to retrieve available actions.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -36,9 +36,9 @@ public static MozuUrl GetAvailablePickupFulfillmentActionsUrl(string orderId, st
 		/// <summary>
         /// Get Resource Url for GetPickup
         /// </summary>
-        /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="pickupId">Unique identifier of the pickup to remove.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="orderId">Unique identifier of the order associated with the pickup.</param>
+        /// <param name="pickupId">Unique identifier of the pickup to retrieve.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -56,7 +56,7 @@ public static MozuUrl GetPickupUrl(string orderId, string pickupId, string respo
         /// Get Resource Url for CreatePickup
         /// </summary>
         /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -72,9 +72,9 @@ public static MozuUrl CreatePickupUrl(string orderId, string responseFields =  n
 				/// <summary>
         /// Get Resource Url for UpdatePickup
         /// </summary>
-        /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="pickupId">Unique identifier of the pickup to remove.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="orderId">Unique identifier of the order associated with the in-store pickup.</param>
+        /// <param name="pickupId">Unique identifier of the pickup to update.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -91,7 +91,7 @@ public static MozuUrl UpdatePickupUrl(string orderId, string pickupId, string re
 				/// <summary>
         /// Get Resource Url for DeletePickup
         /// </summary>
-        /// <param name="orderId">Unique identifier of the order.</param>
+        /// <param name="orderId">Unique identifier of the order associated with the pickup.</param>
         /// <param name="pickupId">Unique identifier of the pickup to remove.</param>
         /// <returns>
         /// String - Resource Url
diff --git a/Mozu.Api/Urls/Commerce/Orders/RefundUrl.cs b/Mozu.Api/Urls/Commerce/Orders/RefundUrl.cs
old mode 100644
new mode 100755
index 507a6e56..d20e0ef6
--- a/Mozu.Api/Urls/Commerce/Orders/RefundUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Orders/RefundUrl.cs
@@ -19,8 +19,8 @@ public partial class RefundUrl
 				/// <summary>
         /// Get Resource Url for CreateRefund
         /// </summary>
-        /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="orderId"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -36,8 +36,8 @@ public static MozuUrl CreateRefundUrl(string orderId, string responseFields =  n
 				/// <summary>
         /// Get Resource Url for ResendRefundEmail
         /// </summary>
-        /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="refundId">Unique ID of the refund.        </param>
+        /// <param name="orderId"></param>
+        /// <param name="refundId"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Orders/ShipmentUrl.cs b/Mozu.Api/Urls/Commerce/Orders/ShipmentUrl.cs
old mode 100644
new mode 100755
index 13f65b04..dfc5602f
--- a/Mozu.Api/Urls/Commerce/Orders/ShipmentUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Orders/ShipmentUrl.cs
@@ -19,8 +19,8 @@ public partial class ShipmentUrl
 		/// <summary>
         /// Get Resource Url for GetShipment
         /// </summary>
-        /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="orderId">Unique identifier of the order associated with the shipment to retrieve.</param>
+        /// <param name="responseFields"></param>
         /// <param name="shipmentId">Unique identifier of the shipment to retrieve.</param>
         /// <returns>
         /// String - Resource Url
@@ -38,8 +38,8 @@ public static MozuUrl GetShipmentUrl(string orderId, string shipmentId, string r
 		/// <summary>
         /// Get Resource Url for GetAvailableShipmentMethods
         /// </summary>
-        /// <param name="draft">If true, retrieve the draft version of the order, which might include uncommitted changes to the order or its components.</param>
-        /// <param name="orderId">Unique identifier of the order.</param>
+        /// <param name="draft"></param>
+        /// <param name="orderId">Unique identifier of the order for the available shipment methods being retrieved.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -55,7 +55,7 @@ public static MozuUrl GetAvailableShipmentMethodsUrl(string orderId, bool? draft
 				/// <summary>
         /// Get Resource Url for CreatePackageShipments
         /// </summary>
-        /// <param name="orderId">Unique identifier of the order.</param>
+        /// <param name="orderId">Unique identifier of the order for this shipment.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -70,8 +70,8 @@ public static MozuUrl CreatePackageShipmentsUrl(string orderId)
 						/// <summary>
         /// Get Resource Url for DeleteShipment
         /// </summary>
-        /// <param name="orderId">Unique identifier of the order.</param>
-        /// <param name="shipmentId">Unique identifier of the shipment to retrieve.</param>
+        /// <param name="orderId">Unique identifier of the order to cancel shipment.</param>
+        /// <param name="shipmentId">Unique identifier of the shipment to cancel.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Payments/FraudScreenUrl.cs b/Mozu.Api/Urls/Commerce/Payments/FraudScreenUrl.cs
old mode 100644
new mode 100755
index 5d303d19..aee7964c
--- a/Mozu.Api/Urls/Commerce/Payments/FraudScreenUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Payments/FraudScreenUrl.cs
@@ -19,7 +19,7 @@ public partial class FraudScreenUrl
 				/// <summary>
         /// Get Resource Url for Screen
         /// </summary>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Payments/PublicCardUrl.cs b/Mozu.Api/Urls/Commerce/Payments/PublicCardUrl.cs
old mode 100644
new mode 100755
index e1181ce3..8a2f7cc1
--- a/Mozu.Api/Urls/Commerce/Payments/PublicCardUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Payments/PublicCardUrl.cs
@@ -19,7 +19,7 @@ public partial class PublicCardUrl
 				/// <summary>
         /// Get Resource Url for Create
         /// </summary>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -34,8 +34,8 @@ public static MozuUrl CreateUrl(string responseFields =  null)
 				/// <summary>
         /// Get Resource Url for Update
         /// </summary>
-        /// <param name="cardId">Unique identifier of the card associated with the customer account billing contact.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="cardId"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -51,7 +51,7 @@ public static MozuUrl UpdateUrl(string cardId, string responseFields =  null)
 				/// <summary>
         /// Get Resource Url for Delete
         /// </summary>
-        /// <param name="cardId">Unique identifier of the card associated with the customer account billing contact.</param>
+        /// <param name="cardId"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/ReturnUrl.cs b/Mozu.Api/Urls/Commerce/ReturnUrl.cs
old mode 100644
new mode 100755
index 4e95b66a..566837eb
--- a/Mozu.Api/Urls/Commerce/ReturnUrl.cs
+++ b/Mozu.Api/Urls/Commerce/ReturnUrl.cs
@@ -19,12 +19,12 @@ public partial class ReturnUrl
 		/// <summary>
         /// Get Resource Url for GetReturns
         /// </summary>
-        /// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-        /// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-        /// <param name="q">A list of order search terms (not phrases) to use in the query when searching across order number and the name or email of the billing contact. When entering, separate multiple search terms with a space character.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-        /// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+        /// <param name="filter"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="q"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="sortBy"></param>
+        /// <param name="startIndex"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -44,7 +44,7 @@ public static MozuUrl GetReturnsUrl(int? startIndex =  null, int? pageSize =  nu
 		/// <summary>
         /// Get Resource Url for GetAvailableReturnActions
         /// </summary>
-        /// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
+        /// <param name="returnId">Unique identifier of the return for which to retrieve available actions.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -59,9 +59,9 @@ public static MozuUrl GetAvailableReturnActionsUrl(string returnId)
 		/// <summary>
         /// Get Resource Url for GetReturnItem
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
-        /// <param name="returnItemId">Unique identifier of the return item whose details you want to get.</param>
+        /// <param name="responseFields"></param>
+        /// <param name="returnId"></param>
+        /// <param name="returnItemId"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -78,8 +78,8 @@ public static MozuUrl GetReturnItemUrl(string returnId, string returnItemId, str
 		/// <summary>
         /// Get Resource Url for GetReturnItems
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
+        /// <param name="responseFields"></param>
+        /// <param name="returnId"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -96,7 +96,7 @@ public static MozuUrl GetReturnItemsUrl(string returnId, string responseFields =
         /// Get Resource Url for GetAvailablePaymentActionsForReturn
         /// </summary>
         /// <param name="paymentId">Unique identifier of the payment for which to perform the action.</param>
-        /// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
+        /// <param name="returnId">Unique identifier of the return associated with the payment.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -112,9 +112,9 @@ public static MozuUrl GetAvailablePaymentActionsForReturnUrl(string returnId, st
 		/// <summary>
         /// Get Resource Url for GetPayment
         /// </summary>
-        /// <param name="paymentId">Unique identifier of the payment for which to perform the action.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
+        /// <param name="paymentId">Unique identifier of the return payment to retrieve.</param>
+        /// <param name="responseFields"></param>
+        /// <param name="returnId">Unique identifier of the return associated with the payment.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -131,8 +131,8 @@ public static MozuUrl GetPaymentUrl(string returnId, string paymentId, string re
 		/// <summary>
         /// Get Resource Url for GetPayments
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
+        /// <param name="responseFields"></param>
+        /// <param name="returnId">Returns the details of the refund payment associated with the return specified in the request.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -148,8 +148,8 @@ public static MozuUrl GetPaymentsUrl(string returnId, string responseFields =  n
 		/// <summary>
         /// Get Resource Url for GetReturn
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
+        /// <param name="responseFields"></param>
+        /// <param name="returnId">Returns the properties of the return specified in the request as well as system-supplied information.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -165,7 +165,7 @@ public static MozuUrl GetReturnUrl(string returnId, string responseFields =  nul
 		/// <summary>
         /// Get Resource Url for GetReasons
         /// </summary>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -180,7 +180,7 @@ public static MozuUrl GetReasonsUrl(string responseFields =  null)
 				/// <summary>
         /// Get Resource Url for CreateReturn
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -195,8 +195,8 @@ public static MozuUrl CreateReturnUrl(string responseFields =  null)
 		/// <summary>
         /// Get Resource Url for CreateReturnItem
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
+        /// <param name="responseFields"></param>
+        /// <param name="returnId"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -212,9 +212,9 @@ public static MozuUrl CreateReturnItemUrl(string returnId, string responseFields
 		/// <summary>
         /// Get Resource Url for PerformPaymentActionForReturn
         /// </summary>
-        /// <param name="paymentId">Unique identifier of the payment for which to perform the action.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
+        /// <param name="paymentId">Unique identifier of the return payment to update.</param>
+        /// <param name="responseFields"></param>
+        /// <param name="returnId">Unique identifier of the return associated with the refund payment.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -231,8 +231,8 @@ public static MozuUrl PerformPaymentActionForReturnUrl(string returnId, string p
 		/// <summary>
         /// Get Resource Url for CreatePaymentActionForReturn
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
+        /// <param name="responseFields"></param>
+        /// <param name="returnId">Unique identifier of the return associated with the payment action.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -248,8 +248,8 @@ public static MozuUrl CreatePaymentActionForReturnUrl(string returnId, string re
 		/// <summary>
         /// Get Resource Url for CreateReturnShippingOrder
         /// </summary>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-        /// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
+        /// <param name="responseFields"></param>
+        /// <param name="returnId"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -265,7 +265,7 @@ public static MozuUrl CreateReturnShippingOrderUrl(string returnId, string respo
 		/// <summary>
         /// Get Resource Url for PerformReturnActions
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -280,8 +280,8 @@ public static MozuUrl PerformReturnActionsUrl(string responseFields =  null)
 				/// <summary>
         /// Get Resource Url for UpdateReturn
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
+        /// <param name="responseFields"></param>
+        /// <param name="returnId">Unique identifier of the return.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -310,8 +310,8 @@ public static MozuUrl ResendReturnEmailUrl()
 				/// <summary>
         /// Get Resource Url for DeleteOrderItem
         /// </summary>
-        /// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
-        /// <param name="returnItemId">Unique identifier of the return item whose details you want to get.</param>
+        /// <param name="returnId"></param>
+        /// <param name="returnItemId"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -327,7 +327,7 @@ public static MozuUrl DeleteOrderItemUrl(string returnId, string returnItemId)
 		/// <summary>
         /// Get Resource Url for DeleteReturn
         /// </summary>
-        /// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
+        /// <param name="returnId">Unique identifier of the return to delete.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Returns/OrderNoteUrl.cs b/Mozu.Api/Urls/Commerce/Returns/OrderNoteUrl.cs
old mode 100644
new mode 100755
index 556bacf8..ae6e21c4
--- a/Mozu.Api/Urls/Commerce/Returns/OrderNoteUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Returns/OrderNoteUrl.cs
@@ -19,7 +19,7 @@ public partial class OrderNoteUrl
 		/// <summary>
         /// Get Resource Url for GetReturnNotes
         /// </summary>
-        /// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
+        /// <param name="returnId"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -34,9 +34,9 @@ public static MozuUrl GetReturnNotesUrl(string returnId)
 		/// <summary>
         /// Get Resource Url for GetReturnNote
         /// </summary>
-        /// <param name="noteId">Unique identifier of a particular note to retrieve.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-        /// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
+        /// <param name="noteId"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="returnId"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -53,8 +53,8 @@ public static MozuUrl GetReturnNoteUrl(string returnId, string noteId, string re
 				/// <summary>
         /// Get Resource Url for CreateReturnNote
         /// </summary>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-        /// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
+        /// <param name="responseFields"></param>
+        /// <param name="returnId"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -70,9 +70,9 @@ public static MozuUrl CreateReturnNoteUrl(string returnId, string responseFields
 				/// <summary>
         /// Get Resource Url for UpdateReturnNote
         /// </summary>
-        /// <param name="noteId">Unique identifier of a particular note to retrieve.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-        /// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
+        /// <param name="noteId"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="returnId"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -89,8 +89,8 @@ public static MozuUrl UpdateReturnNoteUrl(string returnId, string noteId, string
 				/// <summary>
         /// Get Resource Url for DeleteReturnNote
         /// </summary>
-        /// <param name="noteId">Unique identifier of a particular note to retrieve.</param>
-        /// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
+        /// <param name="noteId"></param>
+        /// <param name="returnId"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Returns/PackageUrl.cs b/Mozu.Api/Urls/Commerce/Returns/PackageUrl.cs
old mode 100644
new mode 100755
index 0cf29a98..032c12b2
--- a/Mozu.Api/Urls/Commerce/Returns/PackageUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Returns/PackageUrl.cs
@@ -19,9 +19,9 @@ public partial class PackageUrl
 		/// <summary>
         /// Get Resource Url for GetPackageLabel
         /// </summary>
-        /// <param name="packageId">Unique identifier of the package for which to retrieve the label.</param>
-        /// <param name="returnAsBase64Png">Specifies whether to return the RMA label image as Base64-encoded PNG image instead of as a byte array encoded in the original image format. The default is .</param>
-        /// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
+        /// <param name="packageId">Unique identifier of the return replacement package for which to retrieve the label.</param>
+        /// <param name="returnAsBase64Png"></param>
+        /// <param name="returnId">Unique identifier of the return associated with the replacement package label to retrieve.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -38,9 +38,9 @@ public static MozuUrl GetPackageLabelUrl(string returnId, string packageId, bool
 		/// <summary>
         /// Get Resource Url for GetPackage
         /// </summary>
-        /// <param name="packageId">Unique identifier of the package for which to retrieve the label.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
+        /// <param name="packageId">Unique identifier of the return replacement package to retrieve.</param>
+        /// <param name="responseFields"></param>
+        /// <param name="returnId">Unique identifier of the return associated with the replacement package to retrieve.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -57,8 +57,8 @@ public static MozuUrl GetPackageUrl(string returnId, string packageId, string re
 				/// <summary>
         /// Get Resource Url for CreatePackage
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
+        /// <param name="responseFields"></param>
+        /// <param name="returnId">Unique identifier of the return for which to create a replacement package.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -74,9 +74,9 @@ public static MozuUrl CreatePackageUrl(string returnId, string responseFields =
 				/// <summary>
         /// Get Resource Url for UpdatePackage
         /// </summary>
-        /// <param name="packageId">Unique identifier of the package for which to retrieve the label.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
+        /// <param name="packageId">Unique identifier of the return replacement package to update.</param>
+        /// <param name="responseFields"></param>
+        /// <param name="returnId">Unique identifier of the return associated with the replacement package to update.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -93,8 +93,8 @@ public static MozuUrl UpdatePackageUrl(string returnId, string packageId, string
 				/// <summary>
         /// Get Resource Url for DeletePackage
         /// </summary>
-        /// <param name="packageId">Unique identifier of the package for which to retrieve the label.</param>
-        /// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
+        /// <param name="packageId">Unique identifier of the return replacement package to delete.</param>
+        /// <param name="returnId">Unique identifier of the return associated with the replacement package to delete.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Returns/ShipmentUrl.cs b/Mozu.Api/Urls/Commerce/Returns/ShipmentUrl.cs
old mode 100644
new mode 100755
index 5bb06b86..4e154a17
--- a/Mozu.Api/Urls/Commerce/Returns/ShipmentUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Returns/ShipmentUrl.cs
@@ -19,9 +19,9 @@ public partial class ShipmentUrl
 		/// <summary>
         /// Get Resource Url for GetShipment
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
-        /// <param name="shipmentId">Unique identifier of the shipment to retrieve.</param>
+        /// <param name="responseFields"></param>
+        /// <param name="returnId">Unique identifier of the return associated with the replacement shipment to retrieve.</param>
+        /// <param name="shipmentId">Unique identifier of the return replacement shipment to retrieve.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -38,7 +38,7 @@ public static MozuUrl GetShipmentUrl(string returnId, string shipmentId, string
 				/// <summary>
         /// Get Resource Url for CreatePackageShipments
         /// </summary>
-        /// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
+        /// <param name="returnId">Unique identifier of the return for which to create replacement package shipments.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -53,8 +53,8 @@ public static MozuUrl CreatePackageShipmentsUrl(string returnId)
 						/// <summary>
         /// Get Resource Url for DeleteShipment
         /// </summary>
-        /// <param name="returnId">Unique identifier of the return whose items you want to get.</param>
-        /// <param name="shipmentId">Unique identifier of the shipment to retrieve.</param>
+        /// <param name="returnId">Unique identifier of the return associated with the replacement shipment to delete.</param>
+        /// <param name="shipmentId">Unique identifier of the return replacement shipment to delete.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Settings/ApplicationUrl.cs b/Mozu.Api/Urls/Commerce/Settings/ApplicationUrl.cs
old mode 100644
new mode 100755
index 3e7f3706..7e441964
--- a/Mozu.Api/Urls/Commerce/Settings/ApplicationUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Settings/ApplicationUrl.cs
@@ -19,7 +19,7 @@ public partial class ApplicationUrl
 		/// <summary>
         /// Get Resource Url for ThirdPartyGetApplication
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -34,7 +34,7 @@ public static MozuUrl ThirdPartyGetApplicationUrl(string responseFields =  null)
 						/// <summary>
         /// Get Resource Url for ThirdPartyUpdateApplication
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Settings/CartSettingsUrl.cs b/Mozu.Api/Urls/Commerce/Settings/CartSettingsUrl.cs
old mode 100644
new mode 100755
index 999a8bdf..8dd065b6
--- a/Mozu.Api/Urls/Commerce/Settings/CartSettingsUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Settings/CartSettingsUrl.cs
@@ -19,7 +19,7 @@ public partial class CartSettingsUrl
 		/// <summary>
         /// Get Resource Url for GetCartSettings
         /// </summary>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -34,7 +34,7 @@ public static MozuUrl GetCartSettingsUrl(string responseFields =  null)
 				/// <summary>
         /// Get Resource Url for CreateCartSettings
         /// </summary>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -49,7 +49,7 @@ public static MozuUrl CreateCartSettingsUrl(string responseFields =  null)
 				/// <summary>
         /// Get Resource Url for UpdateCartSettings
         /// </summary>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Settings/Checkout/CustomerCheckoutSettingsUrl.cs b/Mozu.Api/Urls/Commerce/Settings/Checkout/CustomerCheckoutSettingsUrl.cs
old mode 100644
new mode 100755
index 308d889e..793c1220
--- a/Mozu.Api/Urls/Commerce/Settings/Checkout/CustomerCheckoutSettingsUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Settings/Checkout/CustomerCheckoutSettingsUrl.cs
@@ -19,7 +19,7 @@ public partial class CustomerCheckoutSettingsUrl
 		/// <summary>
         /// Get Resource Url for GetCustomerCheckoutSettings
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -34,7 +34,7 @@ public static MozuUrl GetCustomerCheckoutSettingsUrl(string responseFields =  nu
 						/// <summary>
         /// Get Resource Url for UpdateCustomerCheckoutSettings
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Settings/Checkout/PaymentSettingsUrl.cs b/Mozu.Api/Urls/Commerce/Settings/Checkout/PaymentSettingsUrl.cs
old mode 100644
new mode 100755
index f29c9054..7584f114
--- a/Mozu.Api/Urls/Commerce/Settings/Checkout/PaymentSettingsUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Settings/Checkout/PaymentSettingsUrl.cs
@@ -19,8 +19,8 @@ public partial class PaymentSettingsUrl
 		/// <summary>
         /// Get Resource Url for GetThirdPartyPaymentWorkflowWithValues
         /// </summary>
-        /// <param name="fullyQualifiedName">Fully qualified name of the attribute for the third-party payment workflow.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="fullyQualifiedName"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -62,7 +62,7 @@ public static MozuUrl AddThirdPartyPaymentWorkflowUrl()
 				/// <summary>
         /// Get Resource Url for DeleteThirdPartyPaymentWorkflow
         /// </summary>
-        /// <param name="fullyQualifiedName">Fully qualified name of the attribute for the third-party payment workflow.</param>
+        /// <param name="fullyQualifiedName"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Settings/CheckoutSettingsUrl.cs b/Mozu.Api/Urls/Commerce/Settings/CheckoutSettingsUrl.cs
old mode 100644
new mode 100755
index d58aef59..a8af3ca7
--- a/Mozu.Api/Urls/Commerce/Settings/CheckoutSettingsUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Settings/CheckoutSettingsUrl.cs
@@ -19,7 +19,7 @@ public partial class CheckoutSettingsUrl
 		/// <summary>
         /// Get Resource Url for GetCheckoutSettings
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Settings/General/CustomRouteSettingsUrl.cs b/Mozu.Api/Urls/Commerce/Settings/General/CustomRouteSettingsUrl.cs
old mode 100644
new mode 100755
index f7218840..df5f76dc
--- a/Mozu.Api/Urls/Commerce/Settings/General/CustomRouteSettingsUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Settings/General/CustomRouteSettingsUrl.cs
@@ -19,7 +19,7 @@ public partial class CustomRouteSettingsUrl
 		/// <summary>
         /// Get Resource Url for GetCustomRouteSettings
         /// </summary>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -34,7 +34,7 @@ public static MozuUrl GetCustomRouteSettingsUrl(string responseFields =  null)
 				/// <summary>
         /// Get Resource Url for CreateCustomRouteSettings
         /// </summary>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -49,7 +49,7 @@ public static MozuUrl CreateCustomRouteSettingsUrl(string responseFields =  null
 				/// <summary>
         /// Get Resource Url for UpdateCustomRouteSettings
         /// </summary>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Settings/General/TaxableTerritoryUrl.cs b/Mozu.Api/Urls/Commerce/Settings/General/TaxableTerritoryUrl.cs
old mode 100644
new mode 100755
index 0e2b065a..9ba314f4
--- a/Mozu.Api/Urls/Commerce/Settings/General/TaxableTerritoryUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Settings/General/TaxableTerritoryUrl.cs
@@ -32,7 +32,7 @@ public static MozuUrl GetTaxableTerritoriesUrl()
 				/// <summary>
         /// Get Resource Url for AddTaxableTerritory
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Settings/GeneralSettingsUrl.cs b/Mozu.Api/Urls/Commerce/Settings/GeneralSettingsUrl.cs
old mode 100644
new mode 100755
index b03d5737..520c19d1
--- a/Mozu.Api/Urls/Commerce/Settings/GeneralSettingsUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Settings/GeneralSettingsUrl.cs
@@ -19,7 +19,7 @@ public partial class GeneralSettingsUrl
 		/// <summary>
         /// Get Resource Url for GetGeneralSettings
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -34,7 +34,7 @@ public static MozuUrl GetGeneralSettingsUrl(string responseFields =  null)
 						/// <summary>
         /// Get Resource Url for UpdateGeneralSettings
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Settings/LocationUsageUrl.cs b/Mozu.Api/Urls/Commerce/Settings/LocationUsageUrl.cs
old mode 100644
new mode 100755
index 4b1f01e9..d1aad4a9
--- a/Mozu.Api/Urls/Commerce/Settings/LocationUsageUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Settings/LocationUsageUrl.cs
@@ -19,7 +19,7 @@ public partial class LocationUsageUrl
 		/// <summary>
         /// Get Resource Url for GetLocationUsages
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -34,8 +34,8 @@ public static MozuUrl GetLocationUsagesUrl(string responseFields =  null)
 		/// <summary>
         /// Get Resource Url for GetLocationUsage
         /// </summary>
-        /// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="code">Code that identifies the location usage type, which is "DS" for direct ship, "SP" for in-store pickup, or "storeFinder" for store finder.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -51,8 +51,8 @@ public static MozuUrl GetLocationUsageUrl(string code, string responseFields =
 						/// <summary>
         /// Get Resource Url for UpdateLocationUsage
         /// </summary>
-        /// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="code">Code that identifies the location usage type, which is "DS" for direct ship, "SP" for in-store pickup, or "storeFinder" for store finder.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Settings/Shipping/SiteShippingHandlingFeeUrl.cs b/Mozu.Api/Urls/Commerce/Settings/Shipping/SiteShippingHandlingFeeUrl.cs
old mode 100644
new mode 100755
index 272efc59..463de8f4
--- a/Mozu.Api/Urls/Commerce/Settings/Shipping/SiteShippingHandlingFeeUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Settings/Shipping/SiteShippingHandlingFeeUrl.cs
@@ -19,7 +19,7 @@ public partial class SiteShippingHandlingFeeUrl
 		/// <summary>
         /// Get Resource Url for GetOrderHandlingFee
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -34,7 +34,7 @@ public static MozuUrl GetOrderHandlingFeeUrl(string responseFields =  null)
 				/// <summary>
         /// Get Resource Url for CreateOrderHandlingFee
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -49,7 +49,7 @@ public static MozuUrl CreateOrderHandlingFeeUrl(string responseFields =  null)
 				/// <summary>
         /// Get Resource Url for UpdateOrderHandlingFee
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Settings/SiteShippingSettingsUrl.cs b/Mozu.Api/Urls/Commerce/Settings/SiteShippingSettingsUrl.cs
old mode 100644
new mode 100755
index 5e25cdeb..4442323b
--- a/Mozu.Api/Urls/Commerce/Settings/SiteShippingSettingsUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Settings/SiteShippingSettingsUrl.cs
@@ -19,7 +19,7 @@ public partial class SiteShippingSettingsUrl
 		/// <summary>
         /// Get Resource Url for GetSiteShippingSettings
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Shipping/Admin/CarrierConfigurationUrl.cs b/Mozu.Api/Urls/Commerce/Shipping/Admin/CarrierConfigurationUrl.cs
old mode 100644
new mode 100755
index bccb5a04..ed6a085d
--- a/Mozu.Api/Urls/Commerce/Shipping/Admin/CarrierConfigurationUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Shipping/Admin/CarrierConfigurationUrl.cs
@@ -19,11 +19,11 @@ public partial class CarrierConfigurationUrl
 		/// <summary>
         /// Get Resource Url for GetConfigurations
         /// </summary>
-        /// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-        /// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-        /// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-        /// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
+        /// <param name="filter"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="sortBy"></param>
+        /// <param name="startIndex"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -42,8 +42,8 @@ public static MozuUrl GetConfigurationsUrl(int? startIndex =  null, int? pageSiz
 		/// <summary>
         /// Get Resource Url for GetConfiguration
         /// </summary>
-        /// <param name="carrierId">The unique identifier of the carrier.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="carrierId"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -59,8 +59,8 @@ public static MozuUrl GetConfigurationUrl(string carrierId, string responseField
 				/// <summary>
         /// Get Resource Url for CreateConfiguration
         /// </summary>
-        /// <param name="carrierId">The unique identifier of the carrier.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="carrierId"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -76,8 +76,8 @@ public static MozuUrl CreateConfigurationUrl(string carrierId, string responseFi
 				/// <summary>
         /// Get Resource Url for UpdateConfiguration
         /// </summary>
-        /// <param name="carrierId">The unique identifier of the carrier.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="carrierId"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -93,7 +93,7 @@ public static MozuUrl UpdateConfigurationUrl(string carrierId, string responseFi
 				/// <summary>
         /// Get Resource Url for DeleteConfiguration
         /// </summary>
-        /// <param name="carrierId">The unique identifier of the carrier configuration.</param>
+        /// <param name="carrierId"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Shipping/Admin/Profiles/OrderHandlingFeeRulesUrl.cs b/Mozu.Api/Urls/Commerce/Shipping/Admin/Profiles/OrderHandlingFeeRulesUrl.cs
new file mode 100755
index 00000000..04b43cd9
--- /dev/null
+++ b/Mozu.Api/Urls/Commerce/Shipping/Admin/Profiles/OrderHandlingFeeRulesUrl.cs
@@ -0,0 +1,111 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+
+namespace Mozu.Api.Urls.Commerce.Shipping.Admin.Profiles
+{
+	public partial class OrderHandlingFeeRulesUrl 
+	{
+
+		/// <summary>
+        /// Get Resource Url for GetOrderHandlingFeeRule
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="profilecode"></param>
+        /// <param name="responseFields"></param>
+        /// <returns>
+        /// String - Resource Url
+        /// </returns>
+        public static MozuUrl GetOrderHandlingFeeRuleUrl(string profilecode, string id, string responseFields =  null)
+		{
+			var url = "/api/commerce/shipping/admin/profiles/{profilecode}/rules/orderhandlingfees/{id}?responseFields={responseFields}";
+			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
+			mozuUrl.FormatUrl( "id", id);
+			mozuUrl.FormatUrl( "profilecode", profilecode);
+			mozuUrl.FormatUrl( "responseFields", responseFields);
+			return mozuUrl;
+		}
+
+		/// <summary>
+        /// Get Resource Url for GetOrderHandlingFeeRules
+        /// </summary>
+        /// <param name="profilecode"></param>
+        /// <param name="responseFields"></param>
+        /// <returns>
+        /// String - Resource Url
+        /// </returns>
+        public static MozuUrl GetOrderHandlingFeeRulesUrl(string profilecode, string responseFields =  null)
+		{
+			var url = "/api/commerce/shipping/admin/profiles/{profilecode}/rules/orderhandlingfees?responseFields={responseFields}";
+			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
+			mozuUrl.FormatUrl( "profilecode", profilecode);
+			mozuUrl.FormatUrl( "responseFields", responseFields);
+			return mozuUrl;
+		}
+
+				/// <summary>
+        /// Get Resource Url for CreateOrderHandlingFeeRule
+        /// </summary>
+        /// <param name="profilecode"></param>
+        /// <param name="responseFields"></param>
+        /// <returns>
+        /// String - Resource Url
+        /// </returns>
+        public static MozuUrl CreateOrderHandlingFeeRuleUrl(string profilecode, string responseFields =  null)
+		{
+			var url = "/api/commerce/shipping/admin/profiles/{profilecode}/rules/orderhandlingfees?responseFields={responseFields}";
+			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
+			mozuUrl.FormatUrl( "profilecode", profilecode);
+			mozuUrl.FormatUrl( "responseFields", responseFields);
+			return mozuUrl;
+		}
+
+				/// <summary>
+        /// Get Resource Url for UpdateOrderHandlingFeeRule
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="profilecode"></param>
+        /// <param name="responseFields"></param>
+        /// <returns>
+        /// String - Resource Url
+        /// </returns>
+        public static MozuUrl UpdateOrderHandlingFeeRuleUrl(string profilecode, string id, string responseFields =  null)
+		{
+			var url = "/api/commerce/shipping/admin/profiles/{profilecode}/rules/orderhandlingfees/{id}?responseFields={responseFields}";
+			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
+			mozuUrl.FormatUrl( "id", id);
+			mozuUrl.FormatUrl( "profilecode", profilecode);
+			mozuUrl.FormatUrl( "responseFields", responseFields);
+			return mozuUrl;
+		}
+
+				/// <summary>
+        /// Get Resource Url for DeleteOrderHandlingFeeRule
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="profilecode"></param>
+        /// <returns>
+        /// String - Resource Url
+        /// </returns>
+        public static MozuUrl DeleteOrderHandlingFeeRuleUrl(string profilecode, string id)
+		{
+			var url = "/api/commerce/shipping/admin/profiles/{profilecode}/rules/orderhandlingfees/{id}";
+			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
+			mozuUrl.FormatUrl( "id", id);
+			mozuUrl.FormatUrl( "profilecode", profilecode);
+			return mozuUrl;
+		}
+
+		
+	}
+}
+
diff --git a/Mozu.Api/Urls/Commerce/Shipping/Admin/Profiles/HandlingFeeRuleUrl.cs b/Mozu.Api/Urls/Commerce/Shipping/Admin/Profiles/ProductHandlingFeeRulesUrl.cs
old mode 100644
new mode 100755
similarity index 62%
rename from Mozu.Api/Urls/Commerce/Shipping/Admin/Profiles/HandlingFeeRuleUrl.cs
rename to Mozu.Api/Urls/Commerce/Shipping/Admin/Profiles/ProductHandlingFeeRulesUrl.cs
index c3581d81..4e2fc33a
--- a/Mozu.Api/Urls/Commerce/Shipping/Admin/Profiles/HandlingFeeRuleUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Shipping/Admin/Profiles/ProductHandlingFeeRulesUrl.cs
@@ -13,15 +13,15 @@
 
 namespace Mozu.Api.Urls.Commerce.Shipping.Admin.Profiles
 {
-	public partial class HandlingFeeRuleUrl 
+	public partial class ProductHandlingFeeRulesUrl 
 	{
 
 		/// <summary>
         /// Get Resource Url for GetProductHandlingFeeRule
         /// </summary>
-        /// <param name="id">Unique identifier of the customer segment to retrieve.</param>
-        /// <param name="profilecode">The unique, user-defined code of the profile with which the product handling fee rule is associated.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="id"></param>
+        /// <param name="profilecode"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -38,8 +38,8 @@ public static MozuUrl GetProductHandlingFeeRuleUrl(string profilecode, string id
 		/// <summary>
         /// Get Resource Url for GetProductHandlingFeeRules
         /// </summary>
-        /// <param name="profilecode">The unique, user-defined code of the profile with which the product handling fee rule is associated.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="profilecode"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -55,8 +55,8 @@ public static MozuUrl GetProductHandlingFeeRulesUrl(string profilecode, string r
 				/// <summary>
         /// Get Resource Url for CreateProductHandlingFeeRule
         /// </summary>
-        /// <param name="profilecode">The unique, user-defined code of the profile with which the product handling fee rule is associated.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="profilecode"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -72,9 +72,9 @@ public static MozuUrl CreateProductHandlingFeeRuleUrl(string profilecode, string
 				/// <summary>
         /// Get Resource Url for UpdateProductHandlingFeeRule
         /// </summary>
-        /// <param name="id">Unique identifier of the customer segment to retrieve.</param>
-        /// <param name="profilecode">The unique, user-defined code of the profile with which the product handling fee rule is associated.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="id"></param>
+        /// <param name="profilecode"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -91,8 +91,8 @@ public static MozuUrl UpdateProductHandlingFeeRuleUrl(string profilecode, string
 				/// <summary>
         /// Get Resource Url for DeleteProductHandlingFeeRule
         /// </summary>
-        /// <param name="id">Unique identifier of the customer segment to retrieve.</param>
-        /// <param name="profilecode">The unique, user-defined code of the profile with which the product handling fee rule is associated.</param>
+        /// <param name="id"></param>
+        /// <param name="profilecode"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Shipping/Admin/Profiles/ShippingInclusionRuleUrl.cs b/Mozu.Api/Urls/Commerce/Shipping/Admin/Profiles/ShippingInclusionRuleUrl.cs
old mode 100644
new mode 100755
index a0f9de50..64c7c0f2
--- a/Mozu.Api/Urls/Commerce/Shipping/Admin/Profiles/ShippingInclusionRuleUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Shipping/Admin/Profiles/ShippingInclusionRuleUrl.cs
@@ -19,9 +19,9 @@ public partial class ShippingInclusionRuleUrl
 		/// <summary>
         /// Get Resource Url for GetShippingInclusionRule
         /// </summary>
-        /// <param name="id">Unique identifier of the customer segment to retrieve.</param>
-        /// <param name="profilecode">The unique, user-defined code of the profile with which the shipping inclusion rule is associated.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="id"></param>
+        /// <param name="profilecode"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -38,8 +38,8 @@ public static MozuUrl GetShippingInclusionRuleUrl(string profilecode, string id,
 		/// <summary>
         /// Get Resource Url for GetShippingInclusionRules
         /// </summary>
-        /// <param name="profilecode">The unique, user-defined code of the profile with which the shipping inclusion rule is associated.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="profilecode"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -55,8 +55,8 @@ public static MozuUrl GetShippingInclusionRulesUrl(string profilecode, string re
 				/// <summary>
         /// Get Resource Url for CreateShippingInclusionRule
         /// </summary>
-        /// <param name="profilecode">The unique, user-defined code of the profile with which the shipping inclusion rule is associated.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="profilecode"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -72,9 +72,9 @@ public static MozuUrl CreateShippingInclusionRuleUrl(string profilecode, string
 				/// <summary>
         /// Get Resource Url for UpdateShippingInclusionRule
         /// </summary>
-        /// <param name="id">Unique identifier of the customer segment to retrieve.</param>
-        /// <param name="profilecode">The unique, user-defined code of the profile with which the shipping inclusion rule is associated.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="id"></param>
+        /// <param name="profilecode"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -91,8 +91,8 @@ public static MozuUrl UpdateShippingInclusionRuleUrl(string profilecode, string
 				/// <summary>
         /// Get Resource Url for DeleteShippingInclusionRule
         /// </summary>
-        /// <param name="id">Unique identifier of the customer segment to retrieve.</param>
-        /// <param name="profilecode">The unique, user-defined code of the profile with which the shipping inclusion rule is associated.</param>
+        /// <param name="id"></param>
+        /// <param name="profilecode"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Shipping/Admin/Profiles/ShippingStatesUrl.cs b/Mozu.Api/Urls/Commerce/Shipping/Admin/Profiles/ShippingStatesUrl.cs
old mode 100644
new mode 100755
index edbab35c..57373102
--- a/Mozu.Api/Urls/Commerce/Shipping/Admin/Profiles/ShippingStatesUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Shipping/Admin/Profiles/ShippingStatesUrl.cs
@@ -19,7 +19,7 @@ public partial class ShippingStatesUrl
 		/// <summary>
         /// Get Resource Url for GetStates
         /// </summary>
-        /// <param name="profileCode">The unique, user-defined code of the profile with which the shipping state is associated.</param>
+        /// <param name="profileCode"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -34,7 +34,7 @@ public static MozuUrl GetStatesUrl(string profileCode)
 						/// <summary>
         /// Get Resource Url for UpdateStates
         /// </summary>
-        /// <param name="profilecode">The unique, user-defined code of the profile with which the shipping state is associated.</param>
+        /// <param name="profilecode"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Shipping/Admin/ShippingProfileUrl.cs b/Mozu.Api/Urls/Commerce/Shipping/Admin/ShippingProfileUrl.cs
old mode 100644
new mode 100755
index 8a9bb084..124e12ac
--- a/Mozu.Api/Urls/Commerce/Shipping/Admin/ShippingProfileUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Shipping/Admin/ShippingProfileUrl.cs
@@ -19,7 +19,7 @@ public partial class ShippingProfileUrl
 		/// <summary>
         /// Get Resource Url for GetProfiles
         /// </summary>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/TargetRuleUrl.cs b/Mozu.Api/Urls/Commerce/TargetRuleUrl.cs
old mode 100644
new mode 100755
index dae50cd6..7f6fb524
--- a/Mozu.Api/Urls/Commerce/TargetRuleUrl.cs
+++ b/Mozu.Api/Urls/Commerce/TargetRuleUrl.cs
@@ -19,11 +19,11 @@ public partial class TargetRuleUrl
 		/// <summary>
         /// Get Resource Url for GetTargetRules
         /// </summary>
-        /// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-        /// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-        /// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-        /// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
+        /// <param name="filter"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="sortBy"></param>
+        /// <param name="startIndex"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -42,8 +42,8 @@ public static MozuUrl GetTargetRulesUrl(int? startIndex =  null, int? pageSize =
 		/// <summary>
         /// Get Resource Url for GetTargetRule
         /// </summary>
-        /// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="code"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -59,7 +59,7 @@ public static MozuUrl GetTargetRuleUrl(string code, string responseFields =  nul
 				/// <summary>
         /// Get Resource Url for CreateTargetRule
         /// </summary>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -87,8 +87,8 @@ public static MozuUrl ValidateTargetRuleUrl()
 				/// <summary>
         /// Get Resource Url for UpdateTargetRule
         /// </summary>
-        /// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="code"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -104,7 +104,7 @@ public static MozuUrl UpdateTargetRuleUrl(string code, string responseFields =
 				/// <summary>
         /// Get Resource Url for DeleteTargetRule
         /// </summary>
-        /// <param name="code">User-defined code that uniqely identifies the channel group.</param>
+        /// <param name="code"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/WishlistUrl.cs b/Mozu.Api/Urls/Commerce/WishlistUrl.cs
old mode 100644
new mode 100755
index c2335aa4..1034b8f5
--- a/Mozu.Api/Urls/Commerce/WishlistUrl.cs
+++ b/Mozu.Api/Urls/Commerce/WishlistUrl.cs
@@ -19,13 +19,13 @@ public partial class WishlistUrl
 		/// <summary>
         /// Get Resource Url for GetWishlists
         /// </summary>
-        /// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-        /// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-        /// <param name="q">A list of order search terms (not phrases) to use in the query when searching across order number and the name or email of the billing contact. When entering, separate multiple search terms with a space character.</param>
+        /// <param name="filter"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="q">A list of search terms to use in the query when searching across wish list name. Separate multiple search terms with a space character.</param>
         /// <param name="qLimit">The maximum number of search results to return in the response. You can limit any range between 1-100.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-        /// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+        /// <param name="responseFields"></param>
+        /// <param name="sortBy"></param>
+        /// <param name="startIndex"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -46,8 +46,8 @@ public static MozuUrl GetWishlistsUrl(int? startIndex =  null, int? pageSize =
 		/// <summary>
         /// Get Resource Url for GetWishlist
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="wishlistId">Unique identifier of the wish list.</param>
+        /// <param name="responseFields"></param>
+        /// <param name="wishlistId">Unique identifier of the shopper wish list to retrieve.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -64,7 +64,7 @@ public static MozuUrl GetWishlistUrl(string wishlistId, string responseFields =
         /// Get Resource Url for GetWishlistByName
         /// </summary>
         /// <param name="customerAccountId">The unique identifier of the customer account for which to retrieve wish lists.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <param name="wishlistName">The name of the wish list to retrieve.</param>
         /// <returns>
         /// String - Resource Url
@@ -82,7 +82,7 @@ public static MozuUrl GetWishlistByNameUrl(int customerAccountId, string wishlis
 				/// <summary>
         /// Get Resource Url for CreateWishlist
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -97,8 +97,8 @@ public static MozuUrl CreateWishlistUrl(string responseFields =  null)
 				/// <summary>
         /// Get Resource Url for UpdateWishlist
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="wishlistId">Unique identifier of the wish list.</param>
+        /// <param name="responseFields"></param>
+        /// <param name="wishlistId">Unique identifier of the shopper wish list to update.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -114,7 +114,7 @@ public static MozuUrl UpdateWishlistUrl(string wishlistId, string responseFields
 				/// <summary>
         /// Get Resource Url for DeleteWishlist
         /// </summary>
-        /// <param name="wishlistId">Unique identifier of the wish list.</param>
+        /// <param name="wishlistId">Unique identifier of the wish list to delete.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Commerce/Wishlists/WishlistItemUrl.cs b/Mozu.Api/Urls/Commerce/Wishlists/WishlistItemUrl.cs
old mode 100644
new mode 100755
index 4acf2f93..50c4e9ae
--- a/Mozu.Api/Urls/Commerce/Wishlists/WishlistItemUrl.cs
+++ b/Mozu.Api/Urls/Commerce/Wishlists/WishlistItemUrl.cs
@@ -19,9 +19,9 @@ public partial class WishlistItemUrl
 		/// <summary>
         /// Get Resource Url for GetWishlistItem
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="wishlistId">Unique identifier of the wish list.</param>
-        /// <param name="wishlistItemId">Unique identifier of the item to remove from the shopper wish list.</param>
+        /// <param name="responseFields"></param>
+        /// <param name="wishlistId">Unique identifier of the wish list item to retrieve.</param>
+        /// <param name="wishlistItemId">Unique identifier of the wish list associated with the item to retrieve.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -38,12 +38,12 @@ public static MozuUrl GetWishlistItemUrl(string wishlistId, string wishlistItemI
 		/// <summary>
         /// Get Resource Url for GetWishlistItems
         /// </summary>
-        /// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-        /// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-        /// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
-        /// <param name="wishlistId">Unique identifier of the wish list.</param>
+        /// <param name="filter"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="sortBy"></param>
+        /// <param name="startIndex"></param>
+        /// <param name="wishlistId">Unique identifier of the wish list associated with the items to retrieve.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -63,13 +63,13 @@ public static MozuUrl GetWishlistItemsUrl(string wishlistId, int? startIndex =
 		/// <summary>
         /// Get Resource Url for GetWishlistItemsByWishlistName
         /// </summary>
-        /// <param name="customerAccountId">The unique identifier of the customer account for which to retrieve wish lists.</param>
-        /// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-        /// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-        /// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
-        /// <param name="wishlistName">The name of the wish list to retrieve.</param>
+        /// <param name="customerAccountId">The unique identifier of the customer account associated with the wish list.</param>
+        /// <param name="filter"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="sortBy"></param>
+        /// <param name="startIndex"></param>
+        /// <param name="wishlistName">The name of the wish list that contains the items to retrieve.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -90,8 +90,8 @@ public static MozuUrl GetWishlistItemsByWishlistNameUrl(int customerAccountId, s
 				/// <summary>
         /// Get Resource Url for AddItemToWishlist
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="wishlistId">Unique identifier of the wish list.</param>
+        /// <param name="responseFields"></param>
+        /// <param name="wishlistId">Unique identifier of the wish list associated with the item to add.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -107,10 +107,10 @@ public static MozuUrl AddItemToWishlistUrl(string wishlistId, string responseFie
 				/// <summary>
         /// Get Resource Url for UpdateWishlistItemQuantity
         /// </summary>
-        /// <param name="quantity">The number of cart items in the shopper's active cart.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="wishlistId">Unique identifier of the wish list.</param>
-        /// <param name="wishlistItemId">Unique identifier of the item to remove from the shopper wish list.</param>
+        /// <param name="quantity">The quantity of the item in the wish list.</param>
+        /// <param name="responseFields"></param>
+        /// <param name="wishlistId">Unique identifier of the wish list associated with the item quantity to update.</param>
+        /// <param name="wishlistItemId">Unique identifier of the item in the wish list to update quantity.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -128,9 +128,9 @@ public static MozuUrl UpdateWishlistItemQuantityUrl(string wishlistId, string wi
 		/// <summary>
         /// Get Resource Url for UpdateWishlistItem
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="wishlistId">Unique identifier of the wish list.</param>
-        /// <param name="wishlistItemId">Unique identifier of the item to remove from the shopper wish list.</param>
+        /// <param name="responseFields"></param>
+        /// <param name="wishlistId">Unique identifier of the wish list associated with the item to update.</param>
+        /// <param name="wishlistItemId">Unique identifier of the item in the shopper wish list to update.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -147,7 +147,7 @@ public static MozuUrl UpdateWishlistItemUrl(string wishlistId, string wishlistIt
 				/// <summary>
         /// Get Resource Url for RemoveAllWishlistItems
         /// </summary>
-        /// <param name="wishlistId">Unique identifier of the wish list.</param>
+        /// <param name="wishlistId">Unique identifier of the wish list associated with the items to remove.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -162,7 +162,7 @@ public static MozuUrl RemoveAllWishlistItemsUrl(string wishlistId)
 		/// <summary>
         /// Get Resource Url for DeleteWishlistItem
         /// </summary>
-        /// <param name="wishlistId">Unique identifier of the wish list.</param>
+        /// <param name="wishlistId">Unique identifier of the wish list associated with the item to remove.</param>
         /// <param name="wishlistItemId">Unique identifier of the item to remove from the shopper wish list.</param>
         /// <returns>
         /// String - Resource Url
diff --git a/Mozu.Api/Urls/Content/DocumentDraftSummaryUrl.cs b/Mozu.Api/Urls/Content/DocumentDraftSummaryUrl.cs
old mode 100644
new mode 100755
index 635d4527..a2c6c1b2
--- a/Mozu.Api/Urls/Content/DocumentDraftSummaryUrl.cs
+++ b/Mozu.Api/Urls/Content/DocumentDraftSummaryUrl.cs
@@ -19,10 +19,10 @@ public partial class DocumentDraftSummaryUrl
 		/// <summary>
         /// Get Resource Url for ListDocumentDraftSummaries
         /// </summary>
-        /// <param name="documentLists">List of document lists that contain documents to delete.</param>
-        /// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+        /// <param name="documentLists">Lists that contain the document drafts.</param>
+        /// <param name="pageSize"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="startIndex"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -55,7 +55,7 @@ public static MozuUrl DeleteDocumentDraftsUrl(string documentLists =  null)
 				/// <summary>
         /// Get Resource Url for PublishDocuments
         /// </summary>
-        /// <param name="documentLists">List of document lists that contain documents to delete.</param>
+        /// <param name="documentLists">List of document lists that contain documents to publish.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Content/DocumentListTypeUrl.cs b/Mozu.Api/Urls/Content/DocumentListTypeUrl.cs
old mode 100644
new mode 100755
index f5858292..6c821c6b
--- a/Mozu.Api/Urls/Content/DocumentListTypeUrl.cs
+++ b/Mozu.Api/Urls/Content/DocumentListTypeUrl.cs
@@ -19,9 +19,9 @@ public partial class DocumentListTypeUrl
 		/// <summary>
         /// Get Resource Url for GetDocumentListTypes
         /// </summary>
-        /// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-        /// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
+        /// <param name="pageSize"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="startIndex"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -39,7 +39,7 @@ public static MozuUrl GetDocumentListTypesUrl(int? pageSize =  null, int? startI
         /// Get Resource Url for GetDocumentListType
         /// </summary>
         /// <param name="documentListTypeFQN"></param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -55,7 +55,7 @@ public static MozuUrl GetDocumentListTypeUrl(string documentListTypeFQN, string
 				/// <summary>
         /// Get Resource Url for CreateDocumentListType
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -71,7 +71,7 @@ public static MozuUrl CreateDocumentListTypeUrl(string responseFields =  null)
         /// Get Resource Url for UpdateDocumentListType
         /// </summary>
         /// <param name="documentListTypeFQN"></param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Content/DocumentListUrl.cs b/Mozu.Api/Urls/Content/DocumentListUrl.cs
old mode 100644
new mode 100755
index 01a6be20..b4b0f432
--- a/Mozu.Api/Urls/Content/DocumentListUrl.cs
+++ b/Mozu.Api/Urls/Content/DocumentListUrl.cs
@@ -19,8 +19,8 @@ public partial class DocumentListUrl
 		/// <summary>
         /// Get Resource Url for GetDocumentLists
         /// </summary>
-        /// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="pageSize"></param>
+        /// <param name="responseFields"></param>
         /// <param name="startIndex"></param>
         /// <returns>
         /// String - Resource Url
@@ -38,8 +38,8 @@ public static MozuUrl GetDocumentListsUrl(int? pageSize =  null, int? startIndex
 		/// <summary>
         /// Get Resource Url for GetDocumentList
         /// </summary>
-        /// <param name="documentListName">Name of content documentListName to delete</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="documentListName">The name of the document list.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -55,7 +55,7 @@ public static MozuUrl GetDocumentListUrl(string documentListName, string respons
 				/// <summary>
         /// Get Resource Url for CreateDocumentList
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -70,8 +70,8 @@ public static MozuUrl CreateDocumentListUrl(string responseFields =  null)
 				/// <summary>
         /// Get Resource Url for UpdateDocumentList
         /// </summary>
-        /// <param name="documentListName">Name of content documentListName to delete</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="documentListName"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -87,7 +87,7 @@ public static MozuUrl UpdateDocumentListUrl(string documentListName, string resp
 				/// <summary>
         /// Get Resource Url for DeleteDocumentList
         /// </summary>
-        /// <param name="documentListName">Name of content documentListName to delete</param>
+        /// <param name="documentListName"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Content/DocumentTypeUrl.cs b/Mozu.Api/Urls/Content/DocumentTypeUrl.cs
old mode 100644
new mode 100755
index 7021dd5c..39c9a303
--- a/Mozu.Api/Urls/Content/DocumentTypeUrl.cs
+++ b/Mozu.Api/Urls/Content/DocumentTypeUrl.cs
@@ -19,9 +19,9 @@ public partial class DocumentTypeUrl
 		/// <summary>
         /// Get Resource Url for GetDocumentTypes
         /// </summary>
-        /// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+        /// <param name="pageSize"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="startIndex"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -39,7 +39,7 @@ public static MozuUrl GetDocumentTypesUrl(int? pageSize =  null, int? startIndex
         /// Get Resource Url for GetDocumentType
         /// </summary>
         /// <param name="documentTypeName">The name of the document type to retrieve.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -55,7 +55,7 @@ public static MozuUrl GetDocumentTypeUrl(string documentTypeName, string respons
 				/// <summary>
         /// Get Resource Url for CreateDocumentType
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -70,8 +70,8 @@ public static MozuUrl CreateDocumentTypeUrl(string responseFields =  null)
 				/// <summary>
         /// Get Resource Url for UpdateDocumentType
         /// </summary>
-        /// <param name="documentTypeName">The name of the document type to retrieve.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="documentTypeName"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Content/Documentlists/DocumentTreeUrl.cs b/Mozu.Api/Urls/Content/Documentlists/DocumentTreeUrl.cs
old mode 100644
new mode 100755
index 060fed80..c960172b
--- a/Mozu.Api/Urls/Content/Documentlists/DocumentTreeUrl.cs
+++ b/Mozu.Api/Urls/Content/Documentlists/DocumentTreeUrl.cs
@@ -19,8 +19,8 @@ public partial class DocumentTreeUrl
 		/// <summary>
         /// Get Resource Url for GetTreeDocumentContent
         /// </summary>
-        /// <param name="documentListName">Name of content documentListName to delete</param>
-        /// <param name="documentName">The name of the document in the site.</param>
+        /// <param name="documentListName">The name of the document list associated with the document.</param>
+        /// <param name="documentName">The name of the document, which is unique within its folder.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -36,15 +36,15 @@ public static MozuUrl GetTreeDocumentContentUrl(string documentListName, string
 		/// <summary>
         /// Get Resource Url for TransformTreeDocumentContent
         /// </summary>
-        /// <param name="crop">Crops the image based on the specified coordinates. The reference point for positive coordinates is the top-left corner of the image, and the reference point for negative coordinates is the bottom-right corner of the image.Usage: Example:  removes 10 pixels from all edges of the image.  leaves the image uncropped.</param>
-        /// <param name="documentListName">Name of content documentListName to delete</param>
-        /// <param name="documentName">The name of the document in the site.</param>
-        /// <param name="height">Specifies an exact height dimension for the image, in pixels.</param>
-        /// <param name="max">Specifies a pixel limitation for the largest side of an image.</param>
-        /// <param name="maxHeight">Specifies a pixel limitation for the height of the image, preserving the aspect ratio if the image needs resizing.</param>
-        /// <param name="maxWidth">Specifies a pixel limitation for the width of the image, preserving the aspect ratio if the image needs resizing.</param>
-        /// <param name="quality">Adjusts the image compression. Accepts values from 0-100, where 100 = highest quality, least compression.</param>
-        /// <param name="width">Specifies an exact width dimension for the image, in pixels.</param>
+        /// <param name="crop"></param>
+        /// <param name="documentListName"></param>
+        /// <param name="documentName"></param>
+        /// <param name="height"></param>
+        /// <param name="max"></param>
+        /// <param name="maxHeight"></param>
+        /// <param name="maxWidth"></param>
+        /// <param name="quality"></param>
+        /// <param name="width"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -67,10 +67,10 @@ public static MozuUrl TransformTreeDocumentContentUrl(string documentListName, s
 		/// <summary>
         /// Get Resource Url for GetTreeDocument
         /// </summary>
-        /// <param name="documentListName">Name of content documentListName to delete</param>
-        /// <param name="documentName">The name of the document in the site.</param>
-        /// <param name="includeInactive">Include inactive content.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="documentListName">The name of the document list associated with the document.</param>
+        /// <param name="documentName">The name of the document, which is unique within its folder.</param>
+        /// <param name="includeInactive"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -88,8 +88,8 @@ public static MozuUrl GetTreeDocumentUrl(string documentListName, string documen
 						/// <summary>
         /// Get Resource Url for UpdateTreeDocumentContent
         /// </summary>
-        /// <param name="documentListName">Name of content documentListName to delete</param>
-        /// <param name="documentName">The name of the document in the site.</param>
+        /// <param name="documentListName">The name of the document list associated with the document.</param>
+        /// <param name="documentName">The name of the document, which is unique within its folder.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -105,8 +105,8 @@ public static MozuUrl UpdateTreeDocumentContentUrl(string documentListName, stri
 				/// <summary>
         /// Get Resource Url for DeleteTreeDocumentContent
         /// </summary>
-        /// <param name="documentListName">Name of content documentListName to delete</param>
-        /// <param name="documentName">The name of the document in the site.</param>
+        /// <param name="documentListName">The name of the document list associated with the document.</param>
+        /// <param name="documentName">The name of the document, which is unique within its folder.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Content/Documentlists/DocumentUrl.cs b/Mozu.Api/Urls/Content/Documentlists/DocumentUrl.cs
old mode 100644
new mode 100755
index de4b7569..cab2a7bf
--- a/Mozu.Api/Urls/Content/Documentlists/DocumentUrl.cs
+++ b/Mozu.Api/Urls/Content/Documentlists/DocumentUrl.cs
@@ -19,8 +19,8 @@ public partial class DocumentUrl
 		/// <summary>
         /// Get Resource Url for GetDocumentContent
         /// </summary>
-        /// <param name="documentId">Unique identifier for a document, used by content and document calls. Document IDs are associated with document types, document type lists, sites, and tenants.</param>
-        /// <param name="documentListName">Name of content documentListName to delete</param>
+        /// <param name="documentId">Unique identifier of the document.</param>
+        /// <param name="documentListName">The name of the document list associated with the document.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -36,15 +36,15 @@ public static MozuUrl GetDocumentContentUrl(string documentListName, string docu
 		/// <summary>
         /// Get Resource Url for TransformDocumentContent
         /// </summary>
-        /// <param name="crop">Crops the image based on the specified coordinates. The reference point for positive coordinates is the top-left corner of the image, and the reference point for negative coordinates is the bottom-right corner of the image.Usage: Example:  removes 10 pixels from all edges of the image.  leaves the image uncropped.</param>
-        /// <param name="documentId">Unique identifier for a document, used by content and document calls. Document IDs are associated with document types, document type lists, sites, and tenants.</param>
-        /// <param name="documentListName">Name of content documentListName to delete</param>
-        /// <param name="height">Specifies an exact height dimension for the image, in pixels.</param>
-        /// <param name="max">Specifies a pixel limitation for the largest side of an image.</param>
-        /// <param name="maxHeight">Specifies a pixel limitation for the height of the image, preserving the aspect ratio if the image needs resizing.</param>
-        /// <param name="maxWidth">Specifies a pixel limitation for the width of the image, preserving the aspect ratio if the image needs resizing.</param>
-        /// <param name="quality">Adjusts the image compression. Accepts values from 0-100, where 100 = highest quality, least compression.</param>
-        /// <param name="width">Specifies an exact width dimension for the image, in pixels.</param>
+        /// <param name="crop"></param>
+        /// <param name="documentId"></param>
+        /// <param name="documentListName"></param>
+        /// <param name="height"></param>
+        /// <param name="max"></param>
+        /// <param name="maxHeight"></param>
+        /// <param name="maxWidth"></param>
+        /// <param name="quality"></param>
+        /// <param name="width"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -67,10 +67,10 @@ public static MozuUrl TransformDocumentContentUrl(string documentListName, strin
 		/// <summary>
         /// Get Resource Url for GetDocument
         /// </summary>
-        /// <param name="documentId">Unique identifier for a document, used by content and document calls. Document IDs are associated with document types, document type lists, sites, and tenants.</param>
-        /// <param name="documentListName">Name of content documentListName to delete</param>
-        /// <param name="includeInactive">Include inactive content.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="documentId">Identifier of the document being retrieved.</param>
+        /// <param name="documentListName">The name of the document list associated with the document to retrieve.</param>
+        /// <param name="includeInactive"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -88,13 +88,13 @@ public static MozuUrl GetDocumentUrl(string documentListName, string documentId,
 		/// <summary>
         /// Get Resource Url for GetDocuments
         /// </summary>
-        /// <param name="documentListName">Name of content documentListName to delete</param>
-        /// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-        /// <param name="includeInactive">Include inactive content.</param>
-        /// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="sortBy">The property by which to sort results and whether the results appear in ascending (a-z) order, represented by ASC or in descending (z-a) order, represented by DESC. The sortBy parameter follows an available property. For example: "sortBy=productCode+asc"</param>
-        /// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+        /// <param name="documentListName">The name of the document list.</param>
+        /// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. You can filter a document's search results by any of its properties, including its name or folder path. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=Name+sw+Events"</param>
+        /// <param name="includeInactive"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="sortBy"></param>
+        /// <param name="startIndex"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -115,8 +115,8 @@ public static MozuUrl GetDocumentsUrl(string documentListName, string filter =
 				/// <summary>
         /// Get Resource Url for CreateDocument
         /// </summary>
-        /// <param name="documentListName">Name of content documentListName to delete</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="documentListName">The descriptive alphanumeric document list name being created.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -132,8 +132,8 @@ public static MozuUrl CreateDocumentUrl(string documentListName, string response
 				/// <summary>
         /// Get Resource Url for UpdateDocumentContent
         /// </summary>
-        /// <param name="documentId">Unique identifier for a document, used by content and document calls. Document IDs are associated with document types, document type lists, sites, and tenants.</param>
-        /// <param name="documentListName">Name of content documentListName to delete</param>
+        /// <param name="documentId">Unique identifier of the document.</param>
+        /// <param name="documentListName">The name of the document list associated with the document.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -149,9 +149,9 @@ public static MozuUrl UpdateDocumentContentUrl(string documentListName, string d
 		/// <summary>
         /// Get Resource Url for UpdateDocument
         /// </summary>
-        /// <param name="documentId">Unique identifier for a document, used by content and document calls. Document IDs are associated with document types, document type lists, sites, and tenants.</param>
-        /// <param name="documentListName">Name of content documentListName to delete</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="documentId">Unique identifier of the document to update.</param>
+        /// <param name="documentListName">Name of the document list associated with the document.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -168,8 +168,8 @@ public static MozuUrl UpdateDocumentUrl(string documentListName, string document
 				/// <summary>
         /// Get Resource Url for DeleteDocument
         /// </summary>
-        /// <param name="documentId">Unique identifier for a document, used by content and document calls. Document IDs are associated with document types, document type lists, sites, and tenants.</param>
-        /// <param name="documentListName">Name of content documentListName to delete</param>
+        /// <param name="documentId">Identifier of the document being deleted.</param>
+        /// <param name="documentListName">The name of the document list associated with the document list being deleted.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -185,8 +185,8 @@ public static MozuUrl DeleteDocumentUrl(string documentListName, string document
 		/// <summary>
         /// Get Resource Url for DeleteDocumentContent
         /// </summary>
-        /// <param name="documentId">Unique identifier for a document, used by content and document calls. Document IDs are associated with document types, document type lists, sites, and tenants.</param>
-        /// <param name="documentListName">Name of content documentListName to delete</param>
+        /// <param name="documentId">Unique identifier of the document.</param>
+        /// <param name="documentListName">The name of the document list associated with the document.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Content/Documentlists/FacetUrl.cs b/Mozu.Api/Urls/Content/Documentlists/FacetUrl.cs
old mode 100644
new mode 100755
index 0da9d47d..deb303ad
--- a/Mozu.Api/Urls/Content/Documentlists/FacetUrl.cs
+++ b/Mozu.Api/Urls/Content/Documentlists/FacetUrl.cs
@@ -19,7 +19,7 @@ public partial class FacetUrl
 		/// <summary>
         /// Get Resource Url for GetFacets
         /// </summary>
-        /// <param name="documentListName">Name of content documentListName to delete</param>
+        /// <param name="documentListName">The document list associated with the facets to retrieve.</param>
         /// <param name="propertyName">The property name associated with the facets to retrieve.</param>
         /// <returns>
         /// String - Resource Url
diff --git a/Mozu.Api/Urls/Content/Documentlists/ViewUrl.cs b/Mozu.Api/Urls/Content/Documentlists/ViewUrl.cs
old mode 100644
new mode 100755
index ace6ac66..39b88447
--- a/Mozu.Api/Urls/Content/Documentlists/ViewUrl.cs
+++ b/Mozu.Api/Urls/Content/Documentlists/ViewUrl.cs
@@ -19,14 +19,14 @@ public partial class ViewUrl
 		/// <summary>
         /// Get Resource Url for GetViewDocuments
         /// </summary>
-        /// <param name="documentListName">Name of content documentListName to delete</param>
-        /// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-        /// <param name="includeInactive">Include inactive content.</param>
-        /// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-        /// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
-        /// <param name="viewName">The name for a view. Views are used to render data in , such as document and entity lists. Each view includes a schema, format, name, ID, and associated data types to render.</param>
+        /// <param name="documentListName"></param>
+        /// <param name="filter"></param>
+        /// <param name="includeInactive"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="sortBy"></param>
+        /// <param name="startIndex"></param>
+        /// <param name="viewName"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Content/PropertyTypeUrl.cs b/Mozu.Api/Urls/Content/PropertyTypeUrl.cs
old mode 100644
new mode 100755
index b85aab12..c58cd758
--- a/Mozu.Api/Urls/Content/PropertyTypeUrl.cs
+++ b/Mozu.Api/Urls/Content/PropertyTypeUrl.cs
@@ -19,9 +19,9 @@ public partial class PropertyTypeUrl
 		/// <summary>
         /// Get Resource Url for GetPropertyTypes
         /// </summary>
-        /// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with a PageSize of 25, to get the 51st through the 75th items, use startIndex=3.</param>
+        /// <param name="pageSize"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="startIndex"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -38,8 +38,8 @@ public static MozuUrl GetPropertyTypesUrl(int? pageSize =  null, int? startIndex
 		/// <summary>
         /// Get Resource Url for GetPropertyType
         /// </summary>
-        /// <param name="propertyTypeName">The name of the property type.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="propertyTypeName">The name of the content property type.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -55,7 +55,7 @@ public static MozuUrl GetPropertyTypeUrl(string propertyTypeName, string respons
 				/// <summary>
         /// Get Resource Url for CreatePropertyType
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -70,8 +70,8 @@ public static MozuUrl CreatePropertyTypeUrl(string responseFields =  null)
 				/// <summary>
         /// Get Resource Url for UpdatePropertyType
         /// </summary>
-        /// <param name="propertyTypeName">The name of the property type.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="propertyTypeName"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -87,7 +87,7 @@ public static MozuUrl UpdatePropertyTypeUrl(string propertyTypeName, string resp
 				/// <summary>
         /// Get Resource Url for DeletePropertyType
         /// </summary>
-        /// <param name="propertyTypeName">The name of the property type.</param>
+        /// <param name="propertyTypeName"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Content/PublishSetSummaryUrl.cs b/Mozu.Api/Urls/Content/PublishSetSummaryUrl.cs
old mode 100644
new mode 100755
index c85daacd..b5372ba3
--- a/Mozu.Api/Urls/Content/PublishSetSummaryUrl.cs
+++ b/Mozu.Api/Urls/Content/PublishSetSummaryUrl.cs
@@ -19,9 +19,9 @@ public partial class PublishSetSummaryUrl
 		/// <summary>
         /// Get Resource Url for GetPublishSets
         /// </summary>
-        /// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-        /// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
+        /// <param name="pageSize"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="startIndex"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -38,12 +38,12 @@ public static MozuUrl GetPublishSetsUrl(int? pageSize =  null, int? startIndex =
 		/// <summary>
         /// Get Resource Url for GetPublishSetItems
         /// </summary>
-        /// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-        /// <param name="filter">A set of filter expressions representing the search parameters for a query. This parameter is optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for a list of supported filters.</param>
-        /// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-        /// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-        /// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
+        /// <param name="code"></param>
+        /// <param name="filter"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="sortBy"></param>
+        /// <param name="startIndex"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -63,9 +63,9 @@ public static MozuUrl GetPublishSetItemsUrl(string code, int? pageSize =  null,
 				/// <summary>
         /// Get Resource Url for DeletePublishSet
         /// </summary>
-        /// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
-        /// <param name="shouldDiscard">Specifies whether to discard the pending content changes assigned to the content publish set when the publish set is deleted.</param>
+        /// <param name="code"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="shouldDiscard"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -82,8 +82,8 @@ public static MozuUrl DeletePublishSetUrl(string code, bool? shouldDiscard =  nu
 				/// <summary>
         /// Get Resource Url for AddPublishSetItems
         /// </summary>
-        /// <param name="code">User-defined code that uniqely identifies the channel group.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="code"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Event/EventNotificationUrl.cs b/Mozu.Api/Urls/Event/EventNotificationUrl.cs
old mode 100644
new mode 100755
index daf6e431..c688071c
--- a/Mozu.Api/Urls/Event/EventNotificationUrl.cs
+++ b/Mozu.Api/Urls/Event/EventNotificationUrl.cs
@@ -19,9 +19,9 @@ public partial class EventNotificationUrl
 		/// <summary>
         /// Get Resource Url for GetEvents
         /// </summary>
-        /// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-        /// <param name="pageSize">The number of results to display on each page when creating paged results from a query. The maximum value is 200.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="filter"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="responseFields"></param>
         /// <param name="sortBy"></param>
         /// <param name="startIndex"></param>
         /// <returns>
@@ -43,7 +43,7 @@ public static MozuUrl GetEventsUrl(int? startIndex =  null, int? pageSize =  nul
         /// Get Resource Url for GetEvent
         /// </summary>
         /// <param name="eventId">The unique identifier of the event being retrieved. An event is a notification about a create, read, update, or delete on an order, product, discount or category.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Event/Push/SubscriptionUrl.cs b/Mozu.Api/Urls/Event/Push/SubscriptionUrl.cs
old mode 100644
new mode 100755
index 25228b34..86260b34
--- a/Mozu.Api/Urls/Event/Push/SubscriptionUrl.cs
+++ b/Mozu.Api/Urls/Event/Push/SubscriptionUrl.cs
@@ -19,11 +19,11 @@ public partial class SubscriptionUrl
 		/// <summary>
         /// Get Resource Url for GetSubscriptions
         /// </summary>
-        /// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-        /// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-        /// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
+        /// <param name="filter"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="sortBy"></param>
+        /// <param name="startIndex"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Event/Push/Subscriptions/EventDeliverySummaryUrl.cs b/Mozu.Api/Urls/Event/Push/Subscriptions/EventDeliverySummaryUrl.cs
old mode 100644
new mode 100755
index 63dcafec..c0c55b04
--- a/Mozu.Api/Urls/Event/Push/Subscriptions/EventDeliverySummaryUrl.cs
+++ b/Mozu.Api/Urls/Event/Push/Subscriptions/EventDeliverySummaryUrl.cs
@@ -19,17 +19,17 @@ public partial class EventDeliverySummaryUrl
 		/// <summary>
         /// Get Resource Url for GetDeliveryAttemptSummary
         /// </summary>
-        /// <param name="id">Unique identifier of the customer segment to retrieve.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="subscriptionId">Unique identifier for a subscription, such as subscribing tenants for an event or to receive a notification.</param>
+        /// <param name="processId"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="subscriptionId">This operation paramenter is the unique identifer for a subscription.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
-        public static MozuUrl GetDeliveryAttemptSummaryUrl(string subscriptionId, int? id =  null, string responseFields =  null)
+        public static MozuUrl GetDeliveryAttemptSummaryUrl(string subscriptionId, int? processId =  null, string responseFields =  null)
 		{
 			var url = "/api/event/push/subscriptions/{subscriptionId}/deliveryattempts/{id}?responseFields={responseFields}";
 			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
-			mozuUrl.FormatUrl( "id", id);
+			mozuUrl.FormatUrl( "processId", processId);
 			mozuUrl.FormatUrl( "responseFields", responseFields);
 			mozuUrl.FormatUrl( "subscriptionId", subscriptionId);
 			return mozuUrl;
@@ -38,12 +38,12 @@ public static MozuUrl GetDeliveryAttemptSummaryUrl(string subscriptionId, int? i
 		/// <summary>
         /// Get Resource Url for GetDeliveryAttemptSummaries
         /// </summary>
-        /// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-        /// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-        /// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
-        /// <param name="subscriptionId">Unique identifier for a subscription, such as subscribing tenants for an event or to receive a notification.</param>
+        /// <param name="filter"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="sortBy"></param>
+        /// <param name="startIndex"></param>
+        /// <param name="subscriptionId"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Platform/Adminuser/AdminUserUrl.cs b/Mozu.Api/Urls/Platform/Adminuser/AdminUserUrl.cs
old mode 100644
new mode 100755
index 485d5ca6..1ea28938
--- a/Mozu.Api/Urls/Platform/Adminuser/AdminUserUrl.cs
+++ b/Mozu.Api/Urls/Platform/Adminuser/AdminUserUrl.cs
@@ -19,7 +19,7 @@ public partial class AdminUserUrl
 		/// <summary>
         /// Get Resource Url for GetTenantScopesForUser
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <param name="userId">Unique identifier of the user whose tenant scopes you want to retrieve.</param>
         /// <returns>
         /// String - Resource Url
@@ -36,8 +36,8 @@ public static MozuUrl GetTenantScopesForUserUrl(string userId, string responseFi
 		/// <summary>
         /// Get Resource Url for GetUser
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="userId">Unique identifier of the user whose tenant scopes you want to retrieve.</param>
+        /// <param name="responseFields"></param>
+        /// <param name="userId">Unique identifier of the administrator account to retrieve.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Platform/Adminuser/TenantAdminUserAuthTicketUrl.cs b/Mozu.Api/Urls/Platform/Adminuser/TenantAdminUserAuthTicketUrl.cs
old mode 100644
new mode 100755
index 3ab88d26..7fdd44bb
--- a/Mozu.Api/Urls/Platform/Adminuser/TenantAdminUserAuthTicketUrl.cs
+++ b/Mozu.Api/Urls/Platform/Adminuser/TenantAdminUserAuthTicketUrl.cs
@@ -19,7 +19,7 @@ public partial class TenantAdminUserAuthTicketUrl
 				/// <summary>
         /// Get Resource Url for CreateUserAuthTicket
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <param name="tenantId">Unique identifier of the development or production tenant for which to generate the user authentication ticket.</param>
         /// <returns>
         /// String - Resource Url
@@ -36,7 +36,7 @@ public static MozuUrl CreateUserAuthTicketUrl(int? tenantId =  null, string resp
 				/// <summary>
         /// Get Resource Url for RefreshAuthTicket
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <param name="tenantId"></param>
         /// <returns>
         /// String - Resource Url
@@ -53,7 +53,7 @@ public static MozuUrl RefreshAuthTicketUrl(int? tenantId =  null, string respons
 				/// <summary>
         /// Get Resource Url for DeleteUserAuthTicket
         /// </summary>
-        /// <param name="refreshToken">Alphanumeric string used for access tokens. This token refreshes access for accounts by generating a new developer or application account authentication ticket after an access token expires.</param>
+        /// <param name="refreshToken">Refresh token string associated with the user authentication ticket.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Platform/Appdev/AppPackageUrl.cs b/Mozu.Api/Urls/Platform/Appdev/AppPackageUrl.cs
new file mode 100755
index 00000000..556272ca
--- /dev/null
+++ b/Mozu.Api/Urls/Platform/Appdev/AppPackageUrl.cs
@@ -0,0 +1,212 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+
+namespace Mozu.Api.Urls.Platform.Appdev
+{
+	public partial class AppPackageUrl 
+	{
+
+		/// <summary>
+        /// Get Resource Url for GetAllPackages
+        /// </summary>
+        /// <param name="filter"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="sortBy"></param>
+        /// <param name="startIndex"></param>
+        /// <returns>
+        /// String - Resource Url
+        /// </returns>
+        public static MozuUrl GetAllPackagesUrl(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
+		{
+			var url = "/api/platform/appdev/apppackages/?startIndex={startIndex}&pageSize={pageSize}&sortBy={sortBy}&filter={filter}&responseFields={responseFields}";
+			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
+			mozuUrl.FormatUrl( "filter", filter);
+			mozuUrl.FormatUrl( "pageSize", pageSize);
+			mozuUrl.FormatUrl( "responseFields", responseFields);
+			mozuUrl.FormatUrl( "sortBy", sortBy);
+			mozuUrl.FormatUrl( "startIndex", startIndex);
+			return mozuUrl;
+		}
+
+		/// <summary>
+        /// Get Resource Url for GetPackage
+        /// </summary>
+        /// <param name="applicationKey"></param>
+        /// <param name="includeChildren"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="skipDevAccountCheck"></param>
+        /// <returns>
+        /// String - Resource Url
+        /// </returns>
+        public static MozuUrl GetPackageUrl(string applicationKey, bool? includeChildren =  null, bool? skipDevAccountCheck =  null, string responseFields =  null)
+		{
+			var url = "/api/platform/appdev/apppackages/{applicationKey}/?includeChildren={includeChildren}&skipDevAccountCheck={skipDevAccountCheck}&responseFields={responseFields}";
+			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
+			mozuUrl.FormatUrl( "applicationKey", applicationKey);
+			mozuUrl.FormatUrl( "includeChildren", includeChildren);
+			mozuUrl.FormatUrl( "responseFields", responseFields);
+			mozuUrl.FormatUrl( "skipDevAccountCheck", skipDevAccountCheck);
+			return mozuUrl;
+		}
+
+		/// <summary>
+        /// Get Resource Url for GetPackages
+        /// </summary>
+        /// <param name="applicationKey"></param>
+        /// <param name="filter"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="sortBy"></param>
+        /// <param name="startIndex"></param>
+        /// <returns>
+        /// String - Resource Url
+        /// </returns>
+        public static MozuUrl GetPackagesUrl(string applicationKey, int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
+		{
+			var url = "/api/platform/appdev/apppackages/applications/{applicationKey}/packages/?startIndex={startIndex}&pageSize={pageSize}&sortBy={sortBy}&filter={filter}&responseFields={responseFields}";
+			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
+			mozuUrl.FormatUrl( "applicationKey", applicationKey);
+			mozuUrl.FormatUrl( "filter", filter);
+			mozuUrl.FormatUrl( "pageSize", pageSize);
+			mozuUrl.FormatUrl( "responseFields", responseFields);
+			mozuUrl.FormatUrl( "sortBy", sortBy);
+			mozuUrl.FormatUrl( "startIndex", startIndex);
+			return mozuUrl;
+		}
+
+		/// <summary>
+        /// Get Resource Url for GetApplicationSummaryChildren
+        /// </summary>
+        /// <param name="appId"></param>
+        /// <returns>
+        /// String - Resource Url
+        /// </returns>
+        public static MozuUrl GetApplicationSummaryChildrenUrl(string appId)
+		{
+			var url = "/api/platform/appdev/apppackages/apps/{appId}/";
+			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
+			mozuUrl.FormatUrl( "appId", appId);
+			return mozuUrl;
+		}
+
+		/// <summary>
+        /// Get Resource Url for GetApplicationSummaryParents
+        /// </summary>
+        /// <param name="filter"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="sortBy"></param>
+        /// <param name="startIndex"></param>
+        /// <returns>
+        /// String - Resource Url
+        /// </returns>
+        public static MozuUrl GetApplicationSummaryParentsUrl(int? startIndex =  null, int? pageSize =  null, string sortBy =  null, string filter =  null, string responseFields =  null)
+		{
+			var url = "/api/platform/appdev/apppackages/collection/?startIndex={startIndex}&pageSize={pageSize}&sortBy={sortBy}&filter={filter}&responseFields={responseFields}";
+			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
+			mozuUrl.FormatUrl( "filter", filter);
+			mozuUrl.FormatUrl( "pageSize", pageSize);
+			mozuUrl.FormatUrl( "responseFields", responseFields);
+			mozuUrl.FormatUrl( "sortBy", sortBy);
+			mozuUrl.FormatUrl( "startIndex", startIndex);
+			return mozuUrl;
+		}
+
+				/// <summary>
+        /// Get Resource Url for ClonePackage
+        /// </summary>
+        /// <param name="applicationKey"></param>
+        /// <param name="packageName"></param>
+        /// <param name="responseFields"></param>
+        /// <returns>
+        /// String - Resource Url
+        /// </returns>
+        public static MozuUrl ClonePackageUrl(string applicationKey, string packageName, string responseFields =  null)
+		{
+			var url = "/api/platform/appdev/apppackages/{applicationKey}/clone/{packageName}?responseFields={responseFields}";
+			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
+			mozuUrl.FormatUrl( "applicationKey", applicationKey);
+			mozuUrl.FormatUrl( "packageName", packageName);
+			mozuUrl.FormatUrl( "responseFields", responseFields);
+			return mozuUrl;
+		}
+
+		/// <summary>
+        /// Get Resource Url for CreateNewCorePackage
+        /// </summary>
+        /// <param name="responseFields"></param>
+        /// <returns>
+        /// String - Resource Url
+        /// </returns>
+        public static MozuUrl CreateNewCorePackageUrl(string responseFields =  null)
+		{
+			var url = "/api/platform/appdev/apppackages/create?responseFields={responseFields}";
+			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
+			mozuUrl.FormatUrl( "responseFields", responseFields);
+			return mozuUrl;
+		}
+
+		/// <summary>
+        /// Get Resource Url for CreatePackage
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <param name="responseFields"></param>
+        /// <returns>
+        /// String - Resource Url
+        /// </returns>
+        public static MozuUrl CreatePackageUrl(int? projectId =  null, string responseFields =  null)
+		{
+			var url = "/api/platform/appdev/apppackages/project/?projectId={projectId}&responseFields={responseFields}";
+			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
+			mozuUrl.FormatUrl( "projectId", projectId);
+			mozuUrl.FormatUrl( "responseFields", responseFields);
+			return mozuUrl;
+		}
+
+				/// <summary>
+        /// Get Resource Url for UpdatePackage
+        /// </summary>
+        /// <param name="applicationKey"></param>
+        /// <param name="responseFields"></param>
+        /// <returns>
+        /// String - Resource Url
+        /// </returns>
+        public static MozuUrl UpdatePackageUrl(string applicationKey, string responseFields =  null)
+		{
+			var url = "/api/platform/appdev/apppackages/{applicationKey}/?responseFields={responseFields}";
+			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
+			mozuUrl.FormatUrl( "applicationKey", applicationKey);
+			mozuUrl.FormatUrl( "responseFields", responseFields);
+			return mozuUrl;
+		}
+
+				/// <summary>
+        /// Get Resource Url for DeletePackage
+        /// </summary>
+        /// <param name="applicationKey"></param>
+        /// <returns>
+        /// String - Resource Url
+        /// </returns>
+        public static MozuUrl DeletePackageUrl(string applicationKey)
+		{
+			var url = "/api/platform/appdev/apppackages/{applicationKey}/";
+			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
+			mozuUrl.FormatUrl( "applicationKey", applicationKey);
+			return mozuUrl;
+		}
+
+		
+	}
+}
+
diff --git a/Mozu.Api/Urls/Platform/Appdev/PackageUrl.cs b/Mozu.Api/Urls/Platform/Appdev/PackageUrl.cs
old mode 100644
new mode 100755
index 2fb3f54c..5d95b8dc
--- a/Mozu.Api/Urls/Platform/Appdev/PackageUrl.cs
+++ b/Mozu.Api/Urls/Platform/Appdev/PackageUrl.cs
@@ -19,7 +19,7 @@ public partial class PackageUrl
 		/// <summary>
         /// Get Resource Url for GetFile
         /// </summary>
-        /// <param name="applicationKey">The application key uniquely identifies the developer namespace, application ID, version, and package in Dev Center. The format is {Dev Account namespace}.{Application ID}.{Application Version}.{Package name}. </param>
+        /// <param name="applicationKey"></param>
         /// <param name="fileName"></param>
         /// <returns>
         /// String - Resource Url
diff --git a/Mozu.Api/Urls/Platform/ApplicationUrl.cs b/Mozu.Api/Urls/Platform/ApplicationUrl.cs
old mode 100644
new mode 100755
index b92c471b..226eaf78
--- a/Mozu.Api/Urls/Platform/ApplicationUrl.cs
+++ b/Mozu.Api/Urls/Platform/ApplicationUrl.cs
@@ -19,8 +19,8 @@ public partial class ApplicationUrl
 		/// <summary>
         /// Get Resource Url for GetAppPackageNames
         /// </summary>
-        /// <param name="applicationKey">The application key uniquely identifies the developer namespace, application ID, version, and package in Dev Center. The format is {Dev Account namespace}.{Application ID}.{Application Version}.{Package name}.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="applicationKey"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -36,8 +36,8 @@ public static MozuUrl GetAppPackageNamesUrl(string applicationKey, string respon
 		/// <summary>
         /// Get Resource Url for GetAppVersions
         /// </summary>
-        /// <param name="nsAndAppId">The application key uniquely identifies the developer namespace, application ID, version, and package in Dev Center. The format is {Dev Account namespace}.{Application ID}.{Application Version}.{Package name}.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="nsAndAppId"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -53,9 +53,9 @@ public static MozuUrl GetAppVersionsUrl(string nsAndAppId, string responseFields
 		/// <summary>
         /// Get Resource Url for GetPackageFileMetadata
         /// </summary>
-        /// <param name="applicationKey">The application key uniquely identifies the developer namespace, application ID, version, and package in Dev Center. The format is {Dev Account namespace}.{Application ID}.{Application Version}.{Package name}.</param>
-        /// <param name="filepath">Represents the file name and location.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="applicationKey"></param>
+        /// <param name="filepath"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -72,8 +72,8 @@ public static MozuUrl GetPackageFileMetadataUrl(string applicationKey, string fi
 		/// <summary>
         /// Get Resource Url for GetPackageMetadata
         /// </summary>
-        /// <param name="applicationKey">The application key uniquely identifies the developer namespace, application ID, version, and package in Dev Center. The format is {Dev Account namespace}.{Application ID}.{Application Version}.{Package name}.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="applicationKey"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -89,10 +89,10 @@ public static MozuUrl GetPackageMetadataUrl(string applicationKey, string respon
 				/// <summary>
         /// Get Resource Url for UpsertPackageFile
         /// </summary>
-        /// <param name="applicationKey">The application key uniquely identifies the developer namespace, application ID, version, and package in Dev Center. The format is {Dev Account namespace}.{Application ID}.{Application Version}.{Package name}.</param>
-        /// <param name="filepath">The application key uniquely identifies the developer namespace, application ID, version, and package in Dev Center. The format is {Dev Account namespace}.{Application ID}.{Application Version}.{Package name}.</param>
-        /// <param name="lastModifiedTime">The date and time of the last file insert or update. This parameter is optional.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="applicationKey"></param>
+        /// <param name="filepath"></param>
+        /// <param name="lastModifiedTime"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -110,8 +110,8 @@ public static MozuUrl UpsertPackageFileUrl(string applicationKey, string filepat
 		/// <summary>
         /// Get Resource Url for RenamePackageFile
         /// </summary>
-        /// <param name="applicationKey">The application key uniquely identifies the developer namespace, application ID, version, and package in Dev Center. The format is {Dev Account namespace}.{Application ID}.{Application Version}.{Package name}.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="applicationKey"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -127,8 +127,8 @@ public static MozuUrl RenamePackageFileUrl(string applicationKey, string respons
 						/// <summary>
         /// Get Resource Url for DeletePackageFile
         /// </summary>
-        /// <param name="applicationKey">The application key uniquely identifies the developer namespace, application ID, version, and package in Dev Center. The format is {Dev Account namespace}.{Application ID}.{Application Version}.{Package name}.</param>
-        /// <param name="filepath">Represents the file name and location.</param>
+        /// <param name="applicationKey"></param>
+        /// <param name="filepath"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Platform/Applications/AuthTicketUrl.cs b/Mozu.Api/Urls/Platform/Applications/AuthTicketUrl.cs
old mode 100644
new mode 100755
index 02555074..8820fd65
--- a/Mozu.Api/Urls/Platform/Applications/AuthTicketUrl.cs
+++ b/Mozu.Api/Urls/Platform/Applications/AuthTicketUrl.cs
@@ -19,7 +19,7 @@ public partial class AuthTicketUrl
 				/// <summary>
         /// Get Resource Url for AuthenticateApp
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -34,7 +34,7 @@ public static MozuUrl AuthenticateAppUrl(string responseFields =  null)
 				/// <summary>
         /// Get Resource Url for RefreshAppAuthTicket
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -49,7 +49,7 @@ public static MozuUrl RefreshAppAuthTicketUrl(string responseFields =  null)
 				/// <summary>
         /// Get Resource Url for DeleteAppAuthTicket
         /// </summary>
-        /// <param name="refreshToken">Alphanumeric string used for access tokens. This token refreshes access for accounts by generating a new developer or application account authentication ticket after an access token expires.</param>
+        /// <param name="refreshToken">The refresh token string from the application's authentication ticket.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Platform/Developer/DeveloperAdminUserAuthTicketUrl.cs b/Mozu.Api/Urls/Platform/Developer/DeveloperAdminUserAuthTicketUrl.cs
old mode 100644
new mode 100755
index 99be7336..f48f1ad5
--- a/Mozu.Api/Urls/Platform/Developer/DeveloperAdminUserAuthTicketUrl.cs
+++ b/Mozu.Api/Urls/Platform/Developer/DeveloperAdminUserAuthTicketUrl.cs
@@ -20,7 +20,7 @@ public partial class DeveloperAdminUserAuthTicketUrl
         /// Get Resource Url for CreateDeveloperUserAuthTicket
         /// </summary>
         /// <param name="developerAccountId">Unique identifier of the developer account.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -37,7 +37,7 @@ public static MozuUrl CreateDeveloperUserAuthTicketUrl(int? developerAccountId =
         /// Get Resource Url for RefreshDeveloperAuthTicket
         /// </summary>
         /// <param name="developerAccountId">Unique identifier of the developer account.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -53,7 +53,7 @@ public static MozuUrl RefreshDeveloperAuthTicketUrl(int? developerAccountId =  n
 				/// <summary>
         /// Get Resource Url for DeleteUserAuthTicket
         /// </summary>
-        /// <param name="refreshToken">Alphanumeric string used for access tokens. This token refreshes access for accounts by generating a new developer or application account authentication ticket after an access token expires.</param>
+        /// <param name="refreshToken">Refresh token string associated with the developer account authentication ticket.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Platform/EntityListUrl.cs b/Mozu.Api/Urls/Platform/EntityListUrl.cs
old mode 100644
new mode 100755
index d008cc0a..dc980494
--- a/Mozu.Api/Urls/Platform/EntityListUrl.cs
+++ b/Mozu.Api/Urls/Platform/EntityListUrl.cs
@@ -19,11 +19,11 @@ public partial class EntityListUrl
 		/// <summary>
         /// Get Resource Url for GetEntityLists
         /// </summary>
-        /// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-        /// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-        /// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
+        /// <param name="filter"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="sortBy"></param>
+        /// <param name="startIndex"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -42,8 +42,8 @@ public static MozuUrl GetEntityListsUrl(int? pageSize =  null, int? startIndex =
 		/// <summary>
         /// Get Resource Url for GetEntityList
         /// </summary>
-        /// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="entityListFullName"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -59,7 +59,7 @@ public static MozuUrl GetEntityListUrl(string entityListFullName, string respons
 				/// <summary>
         /// Get Resource Url for CreateEntityList
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -74,8 +74,8 @@ public static MozuUrl CreateEntityListUrl(string responseFields =  null)
 				/// <summary>
         /// Get Resource Url for UpdateEntityList
         /// </summary>
-        /// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="entityListFullName"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -91,7 +91,7 @@ public static MozuUrl UpdateEntityListUrl(string entityListFullName, string resp
 				/// <summary>
         /// Get Resource Url for DeleteEntityList
         /// </summary>
-        /// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
+        /// <param name="entityListFullName"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Platform/Entitylists/EntityContainerUrl.cs b/Mozu.Api/Urls/Platform/Entitylists/EntityContainerUrl.cs
old mode 100644
new mode 100755
index e9826ced..65fb0e5c
--- a/Mozu.Api/Urls/Platform/Entitylists/EntityContainerUrl.cs
+++ b/Mozu.Api/Urls/Platform/Entitylists/EntityContainerUrl.cs
@@ -19,9 +19,9 @@ public partial class EntityContainerUrl
 		/// <summary>
         /// Get Resource Url for GetEntityContainer
         /// </summary>
-        /// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-        /// <param name="id">Unique identifier of the customer segment to retrieve.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="entityListFullName"></param>
+        /// <param name="id"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -38,12 +38,12 @@ public static MozuUrl GetEntityContainerUrl(string entityListFullName, string id
 		/// <summary>
         /// Get Resource Url for GetEntityContainers
         /// </summary>
-        /// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-        /// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-        /// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-        /// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
+        /// <param name="entityListFullName"></param>
+        /// <param name="filter"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="sortBy"></param>
+        /// <param name="startIndex"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Platform/Entitylists/EntityUrl.cs b/Mozu.Api/Urls/Platform/Entitylists/EntityUrl.cs
old mode 100644
new mode 100755
index 5eb9be19..5abcad07
--- a/Mozu.Api/Urls/Platform/Entitylists/EntityUrl.cs
+++ b/Mozu.Api/Urls/Platform/Entitylists/EntityUrl.cs
@@ -19,9 +19,9 @@ public partial class EntityUrl
 		/// <summary>
         /// Get Resource Url for GetEntity
         /// </summary>
-        /// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-        /// <param name="id">Unique identifier of the customer segment to retrieve.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="entityListFullName"></param>
+        /// <param name="id"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -38,12 +38,12 @@ public static MozuUrl GetEntityUrl(string entityListFullName, string id, string
 		/// <summary>
         /// Get Resource Url for GetEntities
         /// </summary>
-        /// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-        /// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-        /// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="sortBy">The element to sort the results by and the channel in which the results appear. Either ascending (a-z) or descending (z-a) channel. Optional. Refer to [Sorting and Filtering](../../../../Developer/api-guides/sorting-filtering.htm) for more information.</param>
-        /// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
+        /// <param name="entityListFullName"></param>
+        /// <param name="filter"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="sortBy"></param>
+        /// <param name="startIndex"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -63,8 +63,8 @@ public static MozuUrl GetEntitiesUrl(string entityListFullName, int? pageSize =
 				/// <summary>
         /// Get Resource Url for InsertEntity
         /// </summary>
-        /// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="entityListFullName"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -80,9 +80,9 @@ public static MozuUrl InsertEntityUrl(string entityListFullName, string response
 				/// <summary>
         /// Get Resource Url for UpdateEntity
         /// </summary>
-        /// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-        /// <param name="id">Unique identifier of the customer segment to retrieve.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="entityListFullName"></param>
+        /// <param name="id"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -99,8 +99,8 @@ public static MozuUrl UpdateEntityUrl(string entityListFullName, string id, stri
 				/// <summary>
         /// Get Resource Url for DeleteEntity
         /// </summary>
-        /// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-        /// <param name="id">Unique identifier of the customer segment to retrieve.</param>
+        /// <param name="entityListFullName"></param>
+        /// <param name="id"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Platform/Entitylists/ListViewUrl.cs b/Mozu.Api/Urls/Platform/Entitylists/ListViewUrl.cs
old mode 100644
new mode 100755
index 739c4577..54eab92a
--- a/Mozu.Api/Urls/Platform/Entitylists/ListViewUrl.cs
+++ b/Mozu.Api/Urls/Platform/Entitylists/ListViewUrl.cs
@@ -19,10 +19,10 @@ public partial class ListViewUrl
 		/// <summary>
         /// Get Resource Url for GetViewEntity
         /// </summary>
-        /// <param name="entityId">Unique identifier for an entity, which defines the schema, rules, and formats for JSON entities within the MZDB ( Mongo DB).</param>
-        /// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="viewName">The name for a view. Views are used to render data in , such as document and entity lists. Each view includes a schema, format, name, ID, and associated data types to render.</param>
+        /// <param name="entityId"></param>
+        /// <param name="entityListFullName"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="viewName"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -40,12 +40,12 @@ public static MozuUrl GetViewEntityUrl(string entityListFullName, string viewNam
 		/// <summary>
         /// Get Resource Url for GetViewEntities
         /// </summary>
-        /// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-        /// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-        /// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
-        /// <param name="viewName">The name for a view. Views are used to render data in , such as document and entity lists. Each view includes a schema, format, name, ID, and associated data types to render.</param>
+        /// <param name="entityListFullName"></param>
+        /// <param name="filter"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="startIndex"></param>
+        /// <param name="viewName"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -65,10 +65,10 @@ public static MozuUrl GetViewEntitiesUrl(string entityListFullName, string viewN
 		/// <summary>
         /// Get Resource Url for GetViewEntityContainer
         /// </summary>
-        /// <param name="entityId">Unique identifier for an entity, which defines the schema, rules, and formats for JSON entities within the MZDB ( Mongo DB).</param>
-        /// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="viewName">The name for a view. Views are used to render data in , such as document and entity lists. Each view includes a schema, format, name, ID, and associated data types to render.</param>
+        /// <param name="entityId"></param>
+        /// <param name="entityListFullName"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="viewName"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -86,12 +86,12 @@ public static MozuUrl GetViewEntityContainerUrl(string entityListFullName, strin
 		/// <summary>
         /// Get Resource Url for GetViewEntityContainers
         /// </summary>
-        /// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-        /// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-        /// <param name="pageSize">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with this parameter set to 25, to get the 51st through the 75th items, set startIndex to 50.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="startIndex">When creating paged results from a query, this value indicates the zero-based offset in the complete result set where the returned entities begin. For example, with pageSize set to 25, to get the 51st through the 75th items, set this parameter to 50.</param>
-        /// <param name="viewName">The name for a view. Views are used to render data in , such as document and entity lists. Each view includes a schema, format, name, ID, and associated data types to render.</param>
+        /// <param name="entityListFullName"></param>
+        /// <param name="filter"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="startIndex"></param>
+        /// <param name="viewName"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -111,9 +111,9 @@ public static MozuUrl GetViewEntityContainersUrl(string entityListFullName, stri
 		/// <summary>
         /// Get Resource Url for GetEntityListView
         /// </summary>
-        /// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="viewName">The name for a view. Views are used to render data in , such as document and entity lists. Each view includes a schema, format, name, ID, and associated data types to render.</param>
+        /// <param name="entityListFullName"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="viewName"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -130,8 +130,8 @@ public static MozuUrl GetEntityListViewUrl(string entityListFullName, string vie
 		/// <summary>
         /// Get Resource Url for GetEntityListViews
         /// </summary>
-        /// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="entityListFullName"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -147,8 +147,8 @@ public static MozuUrl GetEntityListViewsUrl(string entityListFullName, string re
 				/// <summary>
         /// Get Resource Url for CreateEntityListView
         /// </summary>
-        /// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="entityListFullName"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -164,9 +164,9 @@ public static MozuUrl CreateEntityListViewUrl(string entityListFullName, string
 				/// <summary>
         /// Get Resource Url for UpdateEntityListView
         /// </summary>
-        /// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="viewName">The name for a view. Views are used to render data in , such as document and entity lists. Each view includes a schema, format, name, ID, and associated data types to render.</param>
+        /// <param name="entityListFullName"></param>
+        /// <param name="responseFields"></param>
+        /// <param name="viewName"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -183,8 +183,8 @@ public static MozuUrl UpdateEntityListViewUrl(string entityListFullName, string
 				/// <summary>
         /// Get Resource Url for DeleteEntityListView
         /// </summary>
-        /// <param name="entityListFullName">The full name of the EntityList including namespace in name@nameSpace format</param>
-        /// <param name="viewName">The name for a view. Views are used to render data in , such as document and entity lists. Each view includes a schema, format, name, ID, and associated data types to render.</param>
+        /// <param name="entityListFullName"></param>
+        /// <param name="viewName"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Platform/Extensions/CredentialStoreEntryUrl.cs b/Mozu.Api/Urls/Platform/Extensions/CredentialStoreEntryUrl.cs
old mode 100644
new mode 100755
diff --git a/Mozu.Api/Urls/Platform/InstalledApplicationsUrl.cs b/Mozu.Api/Urls/Platform/InstalledApplicationsUrl.cs
new file mode 100755
index 00000000..48b9d705
--- /dev/null
+++ b/Mozu.Api/Urls/Platform/InstalledApplicationsUrl.cs
@@ -0,0 +1,56 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a Codezu.     
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+
+namespace Mozu.Api.Urls.Platform
+{
+	public partial class InstalledApplicationsUrl 
+	{
+
+		/// <summary>
+        /// Get Resource Url for GetApplication
+        /// </summary>
+        /// <param name="appId">The application ID that represents the application to retrieve.</param>
+        /// <param name="responseFields"></param>
+        /// <returns>
+        /// String - Resource Url
+        /// </returns>
+        public static MozuUrl GetApplicationUrl(string appId, string responseFields =  null)
+		{
+			var url = "/api/platform/applications/{appId}?responseFields={responseFields}";
+			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
+			mozuUrl.FormatUrl( "appId", appId);
+			mozuUrl.FormatUrl( "responseFields", responseFields);
+			return mozuUrl;
+		}
+
+						/// <summary>
+        /// Get Resource Url for UpdateApplication
+        /// </summary>
+        /// <param name="appId">The application ID that represents the application to update.</param>
+        /// <param name="responseFields"></param>
+        /// <returns>
+        /// String - Resource Url
+        /// </returns>
+        public static MozuUrl UpdateApplicationUrl(string appId, string responseFields =  null)
+		{
+			var url = "/api/platform/applications/{appId}?responseFields={responseFields}";
+			var mozuUrl = new MozuUrl(url, MozuUrl.UrlLocation.TENANT_POD, false) ;
+			mozuUrl.FormatUrl( "appId", appId);
+			mozuUrl.FormatUrl( "responseFields", responseFields);
+			return mozuUrl;
+		}
+
+				
+	}
+}
+
diff --git a/Mozu.Api/Urls/Platform/ReferenceDataUrl.cs b/Mozu.Api/Urls/Platform/ReferenceDataUrl.cs
old mode 100644
new mode 100755
index 520294dd..418206e8
--- a/Mozu.Api/Urls/Platform/ReferenceDataUrl.cs
+++ b/Mozu.Api/Urls/Platform/ReferenceDataUrl.cs
@@ -19,8 +19,8 @@ public partial class ReferenceDataUrl
 		/// <summary>
         /// Get Resource Url for GetAddressSchema
         /// </summary>
-        /// <param name="countryCode">The 2-letter geographic code representing the country for the physical or mailing address. Currently limited to the US.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="countryCode">The 2-letter country code used to retrieve a specified address schema.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -36,7 +36,7 @@ public static MozuUrl GetAddressSchemaUrl(string countryCode =  null, string res
 		/// <summary>
         /// Get Resource Url for GetAddressSchemas
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -52,7 +52,7 @@ public static MozuUrl GetAddressSchemasUrl(string responseFields =  null)
         /// Get Resource Url for GetBehavior
         /// </summary>
         /// <param name="behaviorId">Unique identifier of the behavior.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -68,8 +68,8 @@ public static MozuUrl GetBehaviorUrl(int behaviorId, string responseFields =  nu
 		/// <summary>
         /// Get Resource Url for GetBehaviorCategory
         /// </summary>
-        /// <param name="categoryId">Unique identifier of the category to modify.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="categoryId">Unique identifier of the behavior category.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -85,7 +85,7 @@ public static MozuUrl GetBehaviorCategoryUrl(int categoryId, string responseFiel
 		/// <summary>
         /// Get Resource Url for GetBehaviorCategories
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -100,7 +100,7 @@ public static MozuUrl GetBehaviorCategoriesUrl(string responseFields =  null)
 		/// <summary>
         /// Get Resource Url for GetBehaviors
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <param name="userType">The user type associated with the behaviors to retrieve.</param>
         /// <returns>
         /// String - Resource Url
@@ -117,7 +117,7 @@ public static MozuUrl GetBehaviorsUrl(string userType =  null, string responseFi
 		/// <summary>
         /// Get Resource Url for GetContentLocales
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -132,7 +132,7 @@ public static MozuUrl GetContentLocalesUrl(string responseFields =  null)
 		/// <summary>
         /// Get Resource Url for GetCountries
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -147,7 +147,7 @@ public static MozuUrl GetCountriesUrl(string responseFields =  null)
 		/// <summary>
         /// Get Resource Url for GetCountriesWithStates
         /// </summary>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -162,7 +162,7 @@ public static MozuUrl GetCountriesWithStatesUrl(string responseFields =  null)
 		/// <summary>
         /// Get Resource Url for GetCurrencies
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -177,7 +177,7 @@ public static MozuUrl GetCurrenciesUrl(string responseFields =  null)
 		/// <summary>
         /// Get Resource Url for GetTimeZones
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -192,7 +192,7 @@ public static MozuUrl GetTimeZonesUrl(string responseFields =  null)
 		/// <summary>
         /// Get Resource Url for GetTopLevelDomains
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -207,8 +207,8 @@ public static MozuUrl GetTopLevelDomainsUrl(string responseFields =  null)
 		/// <summary>
         /// Get Resource Url for GetUnitsOfMeasure
         /// </summary>
-        /// <param name="filter">A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="filter"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Platform/SecureAppDataUrl.cs b/Mozu.Api/Urls/Platform/SecureAppDataUrl.cs
old mode 100644
new mode 100755
index 0ece8035..a6759e80
--- a/Mozu.Api/Urls/Platform/SecureAppDataUrl.cs
+++ b/Mozu.Api/Urls/Platform/SecureAppDataUrl.cs
@@ -20,8 +20,8 @@ public partial class SecureAppDataUrl
         /// Get Resource Url for GetDBValue
         /// </summary>
         /// <param name="appKeyId"></param>
-        /// <param name="dbEntryQuery">The database entry string to create.</param>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="dbEntryQuery"></param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -39,7 +39,7 @@ public static MozuUrl GetDBValueUrl(string appKeyId, string dbEntryQuery, string
         /// Get Resource Url for CreateDBValue
         /// </summary>
         /// <param name="appKeyId"></param>
-        /// <param name="dbEntryQuery">The database entry string to create.</param>
+        /// <param name="dbEntryQuery"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -56,7 +56,7 @@ public static MozuUrl CreateDBValueUrl(string appKeyId, string dbEntryQuery)
         /// Get Resource Url for UpdateDBValue
         /// </summary>
         /// <param name="appKeyId"></param>
-        /// <param name="dbEntryQuery">The database entry string to create.</param>
+        /// <param name="dbEntryQuery"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -73,7 +73,7 @@ public static MozuUrl UpdateDBValueUrl(string appKeyId, string dbEntryQuery)
         /// Get Resource Url for DeleteDBValue
         /// </summary>
         /// <param name="appKeyId"></param>
-        /// <param name="dbEntryQuery">The database entry string to create.</param>
+        /// <param name="dbEntryQuery"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Platform/SiteDataUrl.cs b/Mozu.Api/Urls/Platform/SiteDataUrl.cs
old mode 100644
new mode 100755
index 1d45e80c..baf1681b
--- a/Mozu.Api/Urls/Platform/SiteDataUrl.cs
+++ b/Mozu.Api/Urls/Platform/SiteDataUrl.cs
@@ -19,8 +19,8 @@ public partial class SiteDataUrl
 		/// <summary>
         /// Get Resource Url for GetDBValue
         /// </summary>
-        /// <param name="dbEntryQuery">The database entry string to create.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="dbEntryQuery">The database entry query string used to retrieve the record information.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -51,7 +51,7 @@ public static MozuUrl CreateDBValueUrl(string dbEntryQuery)
 				/// <summary>
         /// Get Resource Url for UpdateDBValue
         /// </summary>
-        /// <param name="dbEntryQuery">The database entry string to create.</param>
+        /// <param name="dbEntryQuery">The database entry query string used to update the record information.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -66,7 +66,7 @@ public static MozuUrl UpdateDBValueUrl(string dbEntryQuery)
 				/// <summary>
         /// Get Resource Url for DeleteDBValue
         /// </summary>
-        /// <param name="dbEntryQuery">The database entry string to create.</param>
+        /// <param name="dbEntryQuery">The database entry string to delete.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Platform/TenantDataUrl.cs b/Mozu.Api/Urls/Platform/TenantDataUrl.cs
old mode 100644
new mode 100755
index 6dd0339e..e450a53f
--- a/Mozu.Api/Urls/Platform/TenantDataUrl.cs
+++ b/Mozu.Api/Urls/Platform/TenantDataUrl.cs
@@ -19,8 +19,8 @@ public partial class TenantDataUrl
 		/// <summary>
         /// Get Resource Url for GetDBValue
         /// </summary>
-        /// <param name="dbEntryQuery">The database entry string to create.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="dbEntryQuery">The database entry query string used to retrieve the record information.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -51,7 +51,7 @@ public static MozuUrl CreateDBValueUrl(string dbEntryQuery)
 				/// <summary>
         /// Get Resource Url for UpdateDBValue
         /// </summary>
-        /// <param name="dbEntryQuery">The database entry string to create.</param>
+        /// <param name="dbEntryQuery">The database entry query string used to update the record information.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -66,7 +66,7 @@ public static MozuUrl UpdateDBValueUrl(string dbEntryQuery)
 				/// <summary>
         /// Get Resource Url for DeleteDBValue
         /// </summary>
-        /// <param name="dbEntryQuery">The database entry string to create.</param>
+        /// <param name="dbEntryQuery">The database entry string to delete.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Platform/TenantExtensionsUrl.cs b/Mozu.Api/Urls/Platform/TenantExtensionsUrl.cs
old mode 100644
new mode 100755
index 75e6c2cd..8052444f
--- a/Mozu.Api/Urls/Platform/TenantExtensionsUrl.cs
+++ b/Mozu.Api/Urls/Platform/TenantExtensionsUrl.cs
@@ -19,7 +19,7 @@ public partial class TenantExtensionsUrl
 		/// <summary>
         /// Get Resource Url for GetExtensions
         /// </summary>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -34,7 +34,7 @@ public static MozuUrl GetExtensionsUrl(string responseFields =  null)
 						/// <summary>
         /// Get Resource Url for UpdateExtensions
         /// </summary>
-        /// <param name="responseFields">Filtering syntax appended to an API call to increase or decrease the amount of data returned inside a JSON object. This parameter should only be used to retrieve data. Attempting to update data using this parameter may cause data loss.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Platform/TenantUrl.cs b/Mozu.Api/Urls/Platform/TenantUrl.cs
old mode 100644
new mode 100755
index 6baedc93..234c2914
--- a/Mozu.Api/Urls/Platform/TenantUrl.cs
+++ b/Mozu.Api/Urls/Platform/TenantUrl.cs
@@ -19,8 +19,8 @@ public partial class TenantUrl
 		/// <summary>
         /// Get Resource Url for GetTenant
         /// </summary>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
-        /// <param name="tenantId">Unique identifier of the Mozu tenant.</param>
+        /// <param name="responseFields"></param>
+        /// <param name="tenantId"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Urls/Platform/UserDataUrl.cs b/Mozu.Api/Urls/Platform/UserDataUrl.cs
old mode 100644
new mode 100755
index 7043929c..63796033
--- a/Mozu.Api/Urls/Platform/UserDataUrl.cs
+++ b/Mozu.Api/Urls/Platform/UserDataUrl.cs
@@ -19,8 +19,8 @@ public partial class UserDataUrl
 		/// <summary>
         /// Get Resource Url for GetDBValue
         /// </summary>
-        /// <param name="dbEntryQuery">The database entry string to create.</param>
-        /// <param name="responseFields">Use this field to include those fields which are not included by default.</param>
+        /// <param name="dbEntryQuery">The database entry query string used to retrieve the record information.</param>
+        /// <param name="responseFields"></param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -51,7 +51,7 @@ public static MozuUrl CreateDBValueUrl(string dbEntryQuery)
 				/// <summary>
         /// Get Resource Url for UpdateDBValue
         /// </summary>
-        /// <param name="dbEntryQuery">The database entry string to create.</param>
+        /// <param name="dbEntryQuery">The database entry query string used to update the record information.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
@@ -66,7 +66,7 @@ public static MozuUrl UpdateDBValueUrl(string dbEntryQuery)
 				/// <summary>
         /// Get Resource Url for DeleteDBValue
         /// </summary>
-        /// <param name="dbEntryQuery">The database entry string to create.</param>
+        /// <param name="dbEntryQuery">The database entry string to delete.</param>
         /// <returns>
         /// String - Resource Url
         /// </returns>
diff --git a/Mozu.Api/Version.cs b/Mozu.Api/Version.cs
index b3708f43..df17e973 100644
--- a/Mozu.Api/Version.cs
+++ b/Mozu.Api/Version.cs
@@ -14,7 +14,7 @@ public class Version
 	{
 		public static string ApiVersion
 		{
-			get { return "1.1721.17151.0"; }
+			get { return "2.2818.18108.0"; }
 		}
 	}
 }
\ No newline at end of file