diff --git a/src/ResourceManagement/AzureBackup/BackupServicesManagment/BackupServicesManagment.csproj b/src/ResourceManagement/AzureBackup/BackupServicesManagment/BackupServicesManagment.csproj
index 4860524155ad..c38051d1df88 100644
--- a/src/ResourceManagement/AzureBackup/BackupServicesManagment/BackupServicesManagment.csproj
+++ b/src/ResourceManagement/AzureBackup/BackupServicesManagment/BackupServicesManagment.csproj
@@ -38,6 +38,7 @@
     <Compile Include="Generated\Models\CustomRequestHeaders.cs" />
     <Compile Include="Generated\Models\DataSourceInfo.cs" />
     <Compile Include="Generated\Models\DataSourceListResponse.cs" />
+    <Compile Include="Generated\Models\DataSourceQueryParameter.cs" />
     <Compile Include="Generated\Models\DataSourceResponse.cs" />
     <Compile Include="Generated\Models\DisableProtectionResponse.cs" />
     <Compile Include="Generated\Models\EnableProtectionResponse.cs" />
@@ -51,6 +52,7 @@
     <Compile Include="Generated\Models\ListContainerResponse.cs" />
     <Compile Include="Generated\Models\ManagementBaseObject.cs" />
     <Compile Include="Generated\Models\ManagementResponseObject.cs" />
+    <Compile Include="Generated\Models\POQueryParameter.cs" />
     <Compile Include="Generated\Models\ProtectableObjectInfo.cs" />
     <Compile Include="Generated\Models\ProtectableObjectListResponse.cs" />
     <Compile Include="Generated\Models\ProtectableObjectResponse.cs" />
diff --git a/src/ResourceManagement/AzureBackup/BackupServicesManagment/Generated/BackUpOperations.cs b/src/ResourceManagement/AzureBackup/BackupServicesManagment/Generated/BackUpOperations.cs
index 62d7171f2e5c..bd068a4d8d3b 100644
--- a/src/ResourceManagement/AzureBackup/BackupServicesManagment/Generated/BackUpOperations.cs
+++ b/src/ResourceManagement/AzureBackup/BackupServicesManagment/Generated/BackUpOperations.cs
@@ -131,7 +131,7 @@ public async Task<OperationResponse> TriggerBackUpAsync(CustomRequestHeaders cus
             }
             url = url + "/backup";
             List<string> queryParameters = new List<string>();
-            queryParameters.Add("api-version=2014-09-01.1.0");
+            queryParameters.Add("api-version=2014-09-01");
             if (queryParameters.Count > 0)
             {
                 url = url + "?" + string.Join("&", queryParameters);
diff --git a/src/ResourceManagement/AzureBackup/BackupServicesManagment/Generated/ContainerOperation.cs b/src/ResourceManagement/AzureBackup/BackupServicesManagment/Generated/ContainerOperation.cs
index ad6060a8a941..a5cf38a6928a 100644
--- a/src/ResourceManagement/AzureBackup/BackupServicesManagment/Generated/ContainerOperation.cs
+++ b/src/ResourceManagement/AzureBackup/BackupServicesManagment/Generated/ContainerOperation.cs
@@ -114,7 +114,7 @@ public async Task<ListContainerResponse> ListAsync(string queryFilterString, Cus
             List<string> queryParameters = new List<string>();
             if (queryFilterString != null)
             {
-                queryParameters.Add("api-version=2014-09-01.1.0" + Uri.EscapeDataString(queryFilterString));
+                queryParameters.Add("api-version=2014-09-01" + Uri.EscapeDataString(queryFilterString));
             }
             if (queryParameters.Count > 0)
             {
@@ -370,7 +370,7 @@ public async Task<OperationResponse> RefreshAsync(CustomRequestHeaders customReq
             url = url + Uri.EscapeDataString(this.Client.ResourceName);
             url = url + "/containers/refresh";
             List<string> queryParameters = new List<string>();
-            queryParameters.Add("api-version=2014-09-01.1.0");
+            queryParameters.Add("api-version=2014-09-01");
             if (queryParameters.Count > 0)
             {
                 url = url + "?" + string.Join("&", queryParameters);
@@ -547,7 +547,7 @@ public async Task<OperationResponse> RegisterAsync(RegisterContainerRequest para
             url = url + Uri.EscapeDataString(this.Client.ResourceName);
             url = url + "/containers/register";
             List<string> queryParameters = new List<string>();
-            queryParameters.Add("api-version=2014-09-01.1.0");
+            queryParameters.Add("api-version=2014-09-01");
             if (queryParameters.Count > 0)
             {
                 url = url + "?" + string.Join("&", queryParameters);
@@ -754,7 +754,7 @@ public async Task<OperationResponse> UnregisterAsync(UnregisterContainerRequest
             url = url + Uri.EscapeDataString(this.Client.ResourceName);
             url = url + "/containers";
             List<string> queryParameters = new List<string>();
-            queryParameters.Add("api-version=2014-09-01.1.0");
+            queryParameters.Add("api-version=2014-09-01");
             if (queryParameters.Count > 0)
             {
                 url = url + "?" + string.Join("&", queryParameters);
diff --git a/src/ResourceManagement/AzureBackup/BackupServicesManagment/Generated/DataSourceOperations.cs b/src/ResourceManagement/AzureBackup/BackupServicesManagment/Generated/DataSourceOperations.cs
index 84328480a9ab..c081c29aa4d2 100644
--- a/src/ResourceManagement/AzureBackup/BackupServicesManagment/Generated/DataSourceOperations.cs
+++ b/src/ResourceManagement/AzureBackup/BackupServicesManagment/Generated/DataSourceOperations.cs
@@ -131,7 +131,7 @@ public async Task<DisableProtectionResponse> DisableProtectionAsync(CustomReques
             }
             url = url + "/unprotect";
             List<string> queryParameters = new List<string>();
-            queryParameters.Add("api-version=2014-09-01.1.0");
+            queryParameters.Add("api-version=2014-09-01");
             if (queryParameters.Count > 0)
             {
                 url = url + "?" + string.Join("&", queryParameters);
@@ -284,7 +284,7 @@ public async Task<EnableProtectionResponse> EnableProtectionAsync(CustomRequestH
             url = url + Uri.EscapeDataString(this.Client.ResourceName);
             url = url + "/protectableobjects/protect";
             List<string> queryParameters = new List<string>();
-            queryParameters.Add("api-version=2014-09-01.1.0");
+            queryParameters.Add("api-version=2014-09-01");
             if (queryParameters.Count > 0)
             {
                 url = url + "?" + string.Join("&", queryParameters);
@@ -396,6 +396,9 @@ public async Task<EnableProtectionResponse> EnableProtectionAsync(CustomRequestH
         /// <summary>
         /// Get the list of all DataSpurce.
         /// </summary>
+        /// <param name='parameters'>
+        /// Optional. DataSource query parameter.
+        /// </param>
         /// <param name='customRequestHeaders'>
         /// Optional. Request header parameters.
         /// </param>
@@ -405,7 +408,7 @@ public async Task<EnableProtectionResponse> EnableProtectionAsync(CustomRequestH
         /// <returns>
         /// The response model for the list DataSource operation.
         /// </returns>
-        public async Task<DataSourceListResponse> ListAsync(CustomRequestHeaders customRequestHeaders, CancellationToken cancellationToken)
+        public async Task<DataSourceListResponse> ListAsync(DataSourceQueryParameter parameters, CustomRequestHeaders customRequestHeaders, CancellationToken cancellationToken)
         {
             // Validate
             
@@ -416,6 +419,7 @@ public async Task<DataSourceListResponse> ListAsync(CustomRequestHeaders customR
             {
                 invocationId = TracingAdapter.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
+                tracingParameters.Add("parameters", parameters);
                 tracingParameters.Add("customRequestHeaders", customRequestHeaders);
                 TracingAdapter.Enter(invocationId, this, "ListAsync", tracingParameters);
             }
@@ -437,7 +441,11 @@ public async Task<DataSourceListResponse> ListAsync(CustomRequestHeaders customR
             url = url + Uri.EscapeDataString(this.Client.ResourceName);
             url = url + "/datasources";
             List<string> queryParameters = new List<string>();
-            queryParameters.Add("api-version=2014-09-01.1.0");
+            queryParameters.Add("api-version=2014-09-01");
+            if (parameters != null && parameters.ContainerName != null)
+            {
+                queryParameters.Add("ContainerName=" + Uri.EscapeDataString(parameters.ContainerName));
+            }
             if (queryParameters.Count > 0)
             {
                 url = url + "?" + string.Join("&", queryParameters);
diff --git a/src/ResourceManagement/AzureBackup/BackupServicesManagment/Generated/DataSourceOperationsExtensions.cs b/src/ResourceManagement/AzureBackup/BackupServicesManagment/Generated/DataSourceOperationsExtensions.cs
index 65342612a0fe..d9ea40f78d1e 100644
--- a/src/ResourceManagement/AzureBackup/BackupServicesManagment/Generated/DataSourceOperationsExtensions.cs
+++ b/src/ResourceManagement/AzureBackup/BackupServicesManagment/Generated/DataSourceOperationsExtensions.cs
@@ -135,17 +135,20 @@ public static Task<EnableProtectionResponse> EnableProtectionAsync(this IDataSou
         /// Reference to the
         /// Microsoft.Azure.Management.BackupServices.IDataSourceOperations.
         /// </param>
+        /// <param name='parameters'>
+        /// Optional. DataSource query parameter.
+        /// </param>
         /// <param name='customRequestHeaders'>
         /// Optional. Request header parameters.
         /// </param>
         /// <returns>
         /// The response model for the list DataSource operation.
         /// </returns>
-        public static DataSourceListResponse List(this IDataSourceOperations operations, CustomRequestHeaders customRequestHeaders)
+        public static DataSourceListResponse List(this IDataSourceOperations operations, DataSourceQueryParameter parameters, CustomRequestHeaders customRequestHeaders)
         {
             return Task.Factory.StartNew((object s) => 
             {
-                return ((IDataSourceOperations)s).ListAsync(customRequestHeaders);
+                return ((IDataSourceOperations)s).ListAsync(parameters, customRequestHeaders);
             }
             , operations, CancellationToken.None, TaskCreationOptions.None, TaskScheduler.Default).Unwrap().GetAwaiter().GetResult();
         }
@@ -157,15 +160,18 @@ public static DataSourceListResponse List(this IDataSourceOperations operations,
         /// Reference to the
         /// Microsoft.Azure.Management.BackupServices.IDataSourceOperations.
         /// </param>
+        /// <param name='parameters'>
+        /// Optional. DataSource query parameter.
+        /// </param>
         /// <param name='customRequestHeaders'>
         /// Optional. Request header parameters.
         /// </param>
         /// <returns>
         /// The response model for the list DataSource operation.
         /// </returns>
-        public static Task<DataSourceListResponse> ListAsync(this IDataSourceOperations operations, CustomRequestHeaders customRequestHeaders)
+        public static Task<DataSourceListResponse> ListAsync(this IDataSourceOperations operations, DataSourceQueryParameter parameters, CustomRequestHeaders customRequestHeaders)
         {
-            return operations.ListAsync(customRequestHeaders, CancellationToken.None);
+            return operations.ListAsync(parameters, customRequestHeaders, CancellationToken.None);
         }
     }
 }
diff --git a/src/ResourceManagement/AzureBackup/BackupServicesManagment/Generated/IDataSourceOperations.cs b/src/ResourceManagement/AzureBackup/BackupServicesManagment/Generated/IDataSourceOperations.cs
index 9965469155bf..bf6369efa0cc 100644
--- a/src/ResourceManagement/AzureBackup/BackupServicesManagment/Generated/IDataSourceOperations.cs
+++ b/src/ResourceManagement/AzureBackup/BackupServicesManagment/Generated/IDataSourceOperations.cs
@@ -63,6 +63,9 @@ public partial interface IDataSourceOperations
         /// <summary>
         /// Get the list of all DataSpurce.
         /// </summary>
+        /// <param name='parameters'>
+        /// DataSource query parameter.
+        /// </param>
         /// <param name='customRequestHeaders'>
         /// Request header parameters.
         /// </param>
@@ -72,6 +75,6 @@ public partial interface IDataSourceOperations
         /// <returns>
         /// The response model for the list DataSource operation.
         /// </returns>
-        Task<DataSourceListResponse> ListAsync(CustomRequestHeaders customRequestHeaders, CancellationToken cancellationToken);
+        Task<DataSourceListResponse> ListAsync(DataSourceQueryParameter parameters, CustomRequestHeaders customRequestHeaders, CancellationToken cancellationToken);
     }
 }
diff --git a/src/ResourceManagement/AzureBackup/BackupServicesManagment/Generated/IProtectableObjectOperations.cs b/src/ResourceManagement/AzureBackup/BackupServicesManagment/Generated/IProtectableObjectOperations.cs
index c9b718ab3daf..1f2fedf4f3c4 100644
--- a/src/ResourceManagement/AzureBackup/BackupServicesManagment/Generated/IProtectableObjectOperations.cs
+++ b/src/ResourceManagement/AzureBackup/BackupServicesManagment/Generated/IProtectableObjectOperations.cs
@@ -36,6 +36,9 @@ public partial interface IProtectableObjectOperations
         /// <summary>
         /// Get the list of all Protectable Objects.
         /// </summary>
+        /// <param name='parameters'>
+        /// Job query parameter.
+        /// </param>
         /// <param name='customRequestHeaders'>
         /// Request header parameters.
         /// </param>
@@ -45,6 +48,6 @@ public partial interface IProtectableObjectOperations
         /// <returns>
         /// The response model for the list ProtectableObject operation.
         /// </returns>
-        Task<ProtectableObjectListResponse> ListAsync(CustomRequestHeaders customRequestHeaders, CancellationToken cancellationToken);
+        Task<ProtectableObjectListResponse> ListAsync(POQueryParameter parameters, CustomRequestHeaders customRequestHeaders, CancellationToken cancellationToken);
     }
 }
diff --git a/src/ResourceManagement/AzureBackup/BackupServicesManagment/Generated/JobOperations.cs b/src/ResourceManagement/AzureBackup/BackupServicesManagment/Generated/JobOperations.cs
index f26065abb9d5..627e7cd29dd5 100644
--- a/src/ResourceManagement/AzureBackup/BackupServicesManagment/Generated/JobOperations.cs
+++ b/src/ResourceManagement/AzureBackup/BackupServicesManagment/Generated/JobOperations.cs
@@ -98,7 +98,7 @@ public async Task<JobListResponse> ListAsync(JobQueryParameter parameters, Custo
             url = url + "/Subscriptions/";
             if (this.Client.Credentials.SubscriptionId != null)
             {
-                url = url + Uri.EscapeDataString(this.Client.Credentials.SubscriptionId);
+                url = url + Uri.EscapeDataString(this.Client.Credentials.SubscriptionId.ToString());
             }
             url = url + "/resourceGroups/";
             url = url + Uri.EscapeDataString(this.Client.ResourceGroupName);
@@ -162,6 +162,7 @@ public async Task<JobListResponse> ListAsync(JobQueryParameter parameters, Custo
                 
                 // Set Headers
                 httpRequest.Headers.Add("Accept-Language", "en-us");
+                httpRequest.Headers.Add("x-ms-client-request-id", customRequestHeaders.ClientRequestId);
                 
                 // Set Credentials
                 cancellationToken.ThrowIfCancellationRequested();
@@ -318,10 +319,6 @@ public async Task<JobListResponse> ListAsync(JobQueryParameter parameters, Custo
                         
                     }
                     result.StatusCode = statusCode;
-                    if (httpResponse.Headers.Contains("x-ms-client-request-id"))
-                    {
-                        customRequestHeaders.ClientRequestId = httpResponse.Headers.GetValues("x-ms-client-request-id").FirstOrDefault();
-                    }
                     
                     if (shouldTrace)
                     {
diff --git a/src/ResourceManagement/AzureBackup/BackupServicesManagment/Generated/Models/VaultCredUploadCertRequest.cs b/src/ResourceManagement/AzureBackup/BackupServicesManagment/Generated/Models/VaultCredUploadCertRequest.cs
index e1da431c7d74..3b31cc98c6d5 100644
--- a/src/ResourceManagement/AzureBackup/BackupServicesManagment/Generated/Models/VaultCredUploadCertRequest.cs
+++ b/src/ResourceManagement/AzureBackup/BackupServicesManagment/Generated/Models/VaultCredUploadCertRequest.cs
@@ -33,7 +33,7 @@ public partial class VaultCredUploadCertRequest
         private RawCertificateData _rawCertificateData;
         
         /// <summary>
-        /// Optional. Certificate properties.
+        /// Required. Certificate properties.
         /// </summary>
         public RawCertificateData RawCertificateData
         {
@@ -47,5 +47,19 @@ public RawCertificateData RawCertificateData
         public VaultCredUploadCertRequest()
         {
         }
+        
+        /// <summary>
+        /// Initializes a new instance of the VaultCredUploadCertRequest class
+        /// with required arguments.
+        /// </summary>
+        public VaultCredUploadCertRequest(RawCertificateData rawCertificateData)
+            : this()
+        {
+            if (rawCertificateData == null)
+            {
+                throw new ArgumentNullException("rawCertificateData");
+            }
+            this.RawCertificateData = rawCertificateData;
+        }
     }
 }
diff --git a/src/ResourceManagement/AzureBackup/BackupServicesManagment/Generated/ProtectableObjectOperations.cs b/src/ResourceManagement/AzureBackup/BackupServicesManagment/Generated/ProtectableObjectOperations.cs
index 86d51cfcbac6..c74c7b3f4048 100644
--- a/src/ResourceManagement/AzureBackup/BackupServicesManagment/Generated/ProtectableObjectOperations.cs
+++ b/src/ResourceManagement/AzureBackup/BackupServicesManagment/Generated/ProtectableObjectOperations.cs
@@ -64,6 +64,9 @@ public BackupServicesManagementClient Client
         /// <summary>
         /// Get the list of all Protectable Objects.
         /// </summary>
+        /// <param name='parameters'>
+        /// Optional. Job query parameter.
+        /// </param>
         /// <param name='customRequestHeaders'>
         /// Optional. Request header parameters.
         /// </param>
@@ -73,7 +76,7 @@ public BackupServicesManagementClient Client
         /// <returns>
         /// The response model for the list ProtectableObject operation.
         /// </returns>
-        public async Task<ProtectableObjectListResponse> ListAsync(CustomRequestHeaders customRequestHeaders, CancellationToken cancellationToken)
+        public async Task<ProtectableObjectListResponse> ListAsync(POQueryParameter parameters, CustomRequestHeaders customRequestHeaders, CancellationToken cancellationToken)
         {
             // Validate
             
@@ -84,6 +87,7 @@ public async Task<ProtectableObjectListResponse> ListAsync(CustomRequestHeaders
             {
                 invocationId = TracingAdapter.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
+                tracingParameters.Add("parameters", parameters);
                 tracingParameters.Add("customRequestHeaders", customRequestHeaders);
                 TracingAdapter.Enter(invocationId, this, "ListAsync", tracingParameters);
             }
@@ -105,7 +109,11 @@ public async Task<ProtectableObjectListResponse> ListAsync(CustomRequestHeaders
             url = url + Uri.EscapeDataString(this.Client.ResourceName);
             url = url + "/protectableobjects";
             List<string> queryParameters = new List<string>();
-            queryParameters.Add("api-version=2014-09-01.1.0");
+            queryParameters.Add("api-version=2014-09-01");
+            if (parameters != null && parameters.Status != null)
+            {
+                queryParameters.Add("Status=" + Uri.EscapeDataString(parameters.Status));
+            }
             if (queryParameters.Count > 0)
             {
                 url = url + "?" + string.Join("&", queryParameters);
diff --git a/src/ResourceManagement/AzureBackup/BackupServicesManagment/Generated/ProtectableObjectOperationsExtensions.cs b/src/ResourceManagement/AzureBackup/BackupServicesManagment/Generated/ProtectableObjectOperationsExtensions.cs
index 31c79aea2cdf..13cf2029df14 100644
--- a/src/ResourceManagement/AzureBackup/BackupServicesManagment/Generated/ProtectableObjectOperationsExtensions.cs
+++ b/src/ResourceManagement/AzureBackup/BackupServicesManagment/Generated/ProtectableObjectOperationsExtensions.cs
@@ -37,17 +37,20 @@ public static partial class ProtectableObjectOperationsExtensions
         /// Reference to the
         /// Microsoft.Azure.Management.BackupServices.IProtectableObjectOperations.
         /// </param>
+        /// <param name='parameters'>
+        /// Optional. Job query parameter.
+        /// </param>
         /// <param name='customRequestHeaders'>
         /// Optional. Request header parameters.
         /// </param>
         /// <returns>
         /// The response model for the list ProtectableObject operation.
         /// </returns>
-        public static ProtectableObjectListResponse List(this IProtectableObjectOperations operations, CustomRequestHeaders customRequestHeaders)
+        public static ProtectableObjectListResponse List(this IProtectableObjectOperations operations, POQueryParameter parameters, CustomRequestHeaders customRequestHeaders)
         {
             return Task.Factory.StartNew((object s) => 
             {
-                return ((IProtectableObjectOperations)s).ListAsync(customRequestHeaders);
+                return ((IProtectableObjectOperations)s).ListAsync(parameters, customRequestHeaders);
             }
             , operations, CancellationToken.None, TaskCreationOptions.None, TaskScheduler.Default).Unwrap().GetAwaiter().GetResult();
         }
@@ -59,15 +62,18 @@ public static ProtectableObjectListResponse List(this IProtectableObjectOperatio
         /// Reference to the
         /// Microsoft.Azure.Management.BackupServices.IProtectableObjectOperations.
         /// </param>
+        /// <param name='parameters'>
+        /// Optional. Job query parameter.
+        /// </param>
         /// <param name='customRequestHeaders'>
         /// Optional. Request header parameters.
         /// </param>
         /// <returns>
         /// The response model for the list ProtectableObject operation.
         /// </returns>
-        public static Task<ProtectableObjectListResponse> ListAsync(this IProtectableObjectOperations operations, CustomRequestHeaders customRequestHeaders)
+        public static Task<ProtectableObjectListResponse> ListAsync(this IProtectableObjectOperations operations, POQueryParameter parameters, CustomRequestHeaders customRequestHeaders)
         {
-            return operations.ListAsync(customRequestHeaders, CancellationToken.None);
+            return operations.ListAsync(parameters, customRequestHeaders, CancellationToken.None);
         }
     }
 }
diff --git a/src/ResourceManagement/AzureBackup/BackupServicesManagment/Generated/ProtectionPolicyOperations.cs b/src/ResourceManagement/AzureBackup/BackupServicesManagment/Generated/ProtectionPolicyOperations.cs
index eb672ca9ec5c..52406d5b3fad 100644
--- a/src/ResourceManagement/AzureBackup/BackupServicesManagment/Generated/ProtectionPolicyOperations.cs
+++ b/src/ResourceManagement/AzureBackup/BackupServicesManagment/Generated/ProtectionPolicyOperations.cs
@@ -98,7 +98,7 @@ public async Task<JobByIdResponse> GetAsync(string jobId, CustomRequestHeaders c
             url = url + "/Subscriptions/";
             if (this.Client.Credentials.SubscriptionId != null)
             {
-                url = url + Uri.EscapeDataString(this.Client.Credentials.SubscriptionId);
+                url = url + Uri.EscapeDataString(this.Client.Credentials.SubscriptionId.ToString());
             }
             url = url + "/resourceGroups/";
             url = url + Uri.EscapeDataString(this.Client.ResourceGroupName);
@@ -142,6 +142,7 @@ public async Task<JobByIdResponse> GetAsync(string jobId, CustomRequestHeaders c
                 
                 // Set Headers
                 httpRequest.Headers.Add("Accept-Language", "en-us");
+                httpRequest.Headers.Add("x-ms-client-request-id", customRequestHeaders.ClientRequestId);
                 
                 // Set Credentials
                 cancellationToken.ThrowIfCancellationRequested();
@@ -351,10 +352,6 @@ public async Task<JobByIdResponse> GetAsync(string jobId, CustomRequestHeaders c
                         
                     }
                     result.StatusCode = statusCode;
-                    if (httpResponse.Headers.Contains("x-ms-client-request-id"))
-                    {
-                        customRequestHeaders.ClientRequestId = httpResponse.Headers.GetValues("x-ms-client-request-id").FirstOrDefault();
-                    }
                     
                     if (shouldTrace)
                     {
@@ -411,7 +408,7 @@ public async Task<ProtectionPolicyListResponse> ListAsync(CustomRequestHeaders c
             url = url + "/Subscriptions/";
             if (this.Client.Credentials.SubscriptionId != null)
             {
-                url = url + Uri.EscapeDataString(this.Client.Credentials.SubscriptionId);
+                url = url + Uri.EscapeDataString(this.Client.Credentials.SubscriptionId.ToString());
             }
             url = url + "/resourceGroups/";
             url = url + Uri.EscapeDataString(this.Client.ResourceGroupName);
@@ -451,6 +448,7 @@ public async Task<ProtectionPolicyListResponse> ListAsync(CustomRequestHeaders c
                 
                 // Set Headers
                 httpRequest.Headers.Add("Accept-Language", "en-us");
+                httpRequest.Headers.Add("x-ms-client-request-id", customRequestHeaders.ClientRequestId);
                 
                 // Set Credentials
                 cancellationToken.ThrowIfCancellationRequested();
@@ -623,10 +621,6 @@ public async Task<ProtectionPolicyListResponse> ListAsync(CustomRequestHeaders c
                         
                     }
                     result.StatusCode = statusCode;
-                    if (httpResponse.Headers.Contains("x-ms-client-request-id"))
-                    {
-                        customRequestHeaders.ClientRequestId = httpResponse.Headers.GetValues("x-ms-client-request-id").FirstOrDefault();
-                    }
                     
                     if (shouldTrace)
                     {
diff --git a/src/ResourceManagement/AzureBackup/BackupServicesManagment/Generated/RecoveryPointOperations.cs b/src/ResourceManagement/AzureBackup/BackupServicesManagment/Generated/RecoveryPointOperations.cs
index 4cefa333eaab..654942ea7479 100644
--- a/src/ResourceManagement/AzureBackup/BackupServicesManagment/Generated/RecoveryPointOperations.cs
+++ b/src/ResourceManagement/AzureBackup/BackupServicesManagment/Generated/RecoveryPointOperations.cs
@@ -131,7 +131,7 @@ public async Task<RecoveryPointListResponse> ListAsync(CustomRequestHeaders cust
             }
             url = url + "/recoverypoints";
             List<string> queryParameters = new List<string>();
-            queryParameters.Add("api-version=2014-09-01.1.0");
+            queryParameters.Add("api-version=2014-09-01");
             if (queryParameters.Count > 0)
             {
                 url = url + "?" + string.Join("&", queryParameters);
diff --git a/src/ResourceManagement/AzureBackup/BackupServicesManagment/Generated/VaultCredentialOperations.cs b/src/ResourceManagement/AzureBackup/BackupServicesManagment/Generated/VaultCredentialOperations.cs
index 69a0e2300453..d5e7157ccc58 100644
--- a/src/ResourceManagement/AzureBackup/BackupServicesManagment/Generated/VaultCredentialOperations.cs
+++ b/src/ResourceManagement/AzureBackup/BackupServicesManagment/Generated/VaultCredentialOperations.cs
@@ -24,11 +24,14 @@
 using System.Linq;
 using System.Net;
 using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Hyak.Common;
 using Microsoft.Azure.Management.BackupServices;
 using Microsoft.Azure.Management.BackupServices.Models;
+using Newtonsoft.Json.Linq;
 
 namespace Microsoft.Azure.Management.BackupServices
 {
@@ -64,10 +67,10 @@ public BackupServicesManagementClient Client
         /// Uploads vault credential certificate.
         /// </summary>
         /// <param name='certificateName'>
-        /// Optional. Name of the certificate.
+        /// Required. Name of the certificate.
         /// </param>
         /// <param name='vaultCredUploadCertRequest'>
-        /// Optional. Certificate parameters.
+        /// Required. Certificate parameters.
         /// </param>
         /// <param name='customRequestHeaders'>
         /// Optional. Request header parameters.
@@ -81,6 +84,18 @@ public BackupServicesManagementClient Client
         public async Task<VaultCredUploadCertResponse> UploadCertificateAsync(string certificateName, VaultCredUploadCertRequest vaultCredUploadCertRequest, CustomRequestHeaders customRequestHeaders, CancellationToken cancellationToken)
         {
             // Validate
+            if (certificateName == null)
+            {
+                throw new ArgumentNullException("certificateName");
+            }
+            if (vaultCredUploadCertRequest == null)
+            {
+                throw new ArgumentNullException("vaultCredUploadCertRequest");
+            }
+            if (vaultCredUploadCertRequest.RawCertificateData == null)
+            {
+                throw new ArgumentNullException("vaultCredUploadCertRequest.RawCertificateData");
+            }
             
             // Tracing
             bool shouldTrace = TracingAdapter.IsEnabled;
@@ -111,12 +126,9 @@ public async Task<VaultCredUploadCertResponse> UploadCertificateAsync(string cer
             url = url + "/";
             url = url + Uri.EscapeDataString(this.Client.ResourceName);
             url = url + "/certificates/";
-            if (certificateName != null)
-            {
-                url = url + Uri.EscapeDataString(certificateName);
-            }
+            url = url + Uri.EscapeDataString(certificateName);
             List<string> queryParameters = new List<string>();
-            queryParameters.Add("api-version=2014-09-01.1.0");
+            queryParameters.Add("api-version=2015-03-15");
             if (queryParameters.Count > 0)
             {
                 url = url + "?" + string.Join("&", queryParameters);
@@ -144,11 +156,31 @@ public async Task<VaultCredUploadCertResponse> UploadCertificateAsync(string cer
                 
                 // Set Headers
                 httpRequest.Headers.Add("Accept-Language", "en-us");
+                httpRequest.Headers.Add("x-ms-version", "2013-03-01");
                 
                 // Set Credentials
                 cancellationToken.ThrowIfCancellationRequested();
                 await this.Client.Credentials.ProcessHttpRequestAsync(httpRequest, cancellationToken).ConfigureAwait(false);
                 
+                // Serialize Request
+                string requestContent = null;
+                JToken requestDoc = null;
+                
+                JObject vaultCredUploadCertRequestValue = new JObject();
+                requestDoc = vaultCredUploadCertRequestValue;
+                
+                JObject propertiesValue = new JObject();
+                vaultCredUploadCertRequestValue["properties"] = propertiesValue;
+                
+                if (vaultCredUploadCertRequest.RawCertificateData.Certificate != null)
+                {
+                    propertiesValue["certificate"] = vaultCredUploadCertRequest.RawCertificateData.Certificate;
+                }
+                
+                requestContent = requestDoc.ToString(Newtonsoft.Json.Formatting.Indented);
+                httpRequest.Content = new StringContent(requestContent, Encoding.UTF8);
+                httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json");
+                
                 // Send Request
                 HttpResponseMessage httpResponse = null;
                 try
@@ -167,7 +199,7 @@ public async Task<VaultCredUploadCertResponse> UploadCertificateAsync(string cer
                     if (statusCode != HttpStatusCode.OK)
                     {
                         cancellationToken.ThrowIfCancellationRequested();
-                        CloudException ex = CloudException.Create(httpRequest, null, httpResponse, await httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false));
+                        CloudException ex = CloudException.Create(httpRequest, requestContent, httpResponse, await httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false));
                         if (shouldTrace)
                         {
                             TracingAdapter.Error(invocationId, ex);
@@ -178,7 +210,105 @@ public async Task<VaultCredUploadCertResponse> UploadCertificateAsync(string cer
                     // Create Result
                     VaultCredUploadCertResponse result = null;
                     // Deserialize Response
-                    result = new VaultCredUploadCertResponse();
+                    if (statusCode == HttpStatusCode.OK)
+                    {
+                        cancellationToken.ThrowIfCancellationRequested();
+                        string responseContent = await httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                        result = new VaultCredUploadCertResponse();
+                        JToken responseDoc = null;
+                        if (string.IsNullOrEmpty(responseContent) == false)
+                        {
+                            responseDoc = JToken.Parse(responseContent);
+                        }
+                        
+                        if (responseDoc != null && responseDoc.Type != JTokenType.Null)
+                        {
+                            JToken propertiesValue2 = responseDoc["properties"];
+                            if (propertiesValue2 != null && propertiesValue2.Type != JTokenType.Null)
+                            {
+                                ResourceCertificateAndACSDetails propertiesInstance = new ResourceCertificateAndACSDetails();
+                                result.ResourceCertificateAndACSDetails = propertiesInstance;
+                                
+                                JToken certificateValue = propertiesValue2["certificate"];
+                                if (certificateValue != null && certificateValue.Type != JTokenType.Null)
+                                {
+                                    string certificateInstance = ((string)certificateValue);
+                                    propertiesInstance.Certificate = certificateInstance;
+                                }
+                                
+                                JToken resourceIdValue = propertiesValue2["resourceId"];
+                                if (resourceIdValue != null && resourceIdValue.Type != JTokenType.Null)
+                                {
+                                    long resourceIdInstance = ((long)resourceIdValue);
+                                    propertiesInstance.ResourceId = resourceIdInstance;
+                                }
+                                
+                                JToken globalAcsNamespaceValue = propertiesValue2["globalAcsNamespace"];
+                                if (globalAcsNamespaceValue != null && globalAcsNamespaceValue.Type != JTokenType.Null)
+                                {
+                                    string globalAcsNamespaceInstance = ((string)globalAcsNamespaceValue);
+                                    propertiesInstance.GlobalAcsNamespace = globalAcsNamespaceInstance;
+                                }
+                                
+                                JToken globalAcsHostNameValue = propertiesValue2["globalAcsHostName"];
+                                if (globalAcsHostNameValue != null && globalAcsHostNameValue.Type != JTokenType.Null)
+                                {
+                                    string globalAcsHostNameInstance = ((string)globalAcsHostNameValue);
+                                    propertiesInstance.GlobalAcsHostName = globalAcsHostNameInstance;
+                                }
+                                
+                                JToken globalAcsRPRealmValue = propertiesValue2["globalAcsRPRealm"];
+                                if (globalAcsRPRealmValue != null && globalAcsRPRealmValue.Type != JTokenType.Null)
+                                {
+                                    string globalAcsRPRealmInstance = ((string)globalAcsRPRealmValue);
+                                    propertiesInstance.GlobalAcsRPRealm = globalAcsRPRealmInstance;
+                                }
+                                
+                                JToken subjectValue = propertiesValue2["subject"];
+                                if (subjectValue != null && subjectValue.Type != JTokenType.Null)
+                                {
+                                    string subjectInstance = ((string)subjectValue);
+                                    propertiesInstance.Subject = subjectInstance;
+                                }
+                                
+                                JToken validFromValue = propertiesValue2["validFrom"];
+                                if (validFromValue != null && validFromValue.Type != JTokenType.Null)
+                                {
+                                    DateTime validFromInstance = ((DateTime)validFromValue);
+                                    propertiesInstance.ValidFrom = validFromInstance;
+                                }
+                                
+                                JToken validToValue = propertiesValue2["validTo"];
+                                if (validToValue != null && validToValue.Type != JTokenType.Null)
+                                {
+                                    DateTime validToInstance = ((DateTime)validToValue);
+                                    propertiesInstance.ValidTo = validToInstance;
+                                }
+                                
+                                JToken thumbprintValue = propertiesValue2["thumbprint"];
+                                if (thumbprintValue != null && thumbprintValue.Type != JTokenType.Null)
+                                {
+                                    string thumbprintInstance = ((string)thumbprintValue);
+                                    propertiesInstance.Thumbprint = thumbprintInstance;
+                                }
+                                
+                                JToken friendlyNameValue = propertiesValue2["friendlyName"];
+                                if (friendlyNameValue != null && friendlyNameValue.Type != JTokenType.Null)
+                                {
+                                    string friendlyNameInstance = ((string)friendlyNameValue);
+                                    propertiesInstance.FriendlyName = friendlyNameInstance;
+                                }
+                                
+                                JToken issuerValue = propertiesValue2["issuer"];
+                                if (issuerValue != null && issuerValue.Type != JTokenType.Null)
+                                {
+                                    string issuerInstance = ((string)issuerValue);
+                                    propertiesInstance.Issuer = issuerInstance;
+                                }
+                            }
+                        }
+                        
+                    }
                     result.StatusCode = statusCode;
                     if (httpResponse.Headers.Contains("x-ms-client-request-id"))
                     {
diff --git a/src/ResourceManagement/AzureBackup/BackupServicesManagment/Generated/VaultCredentialOperationsExtensions.cs b/src/ResourceManagement/AzureBackup/BackupServicesManagment/Generated/VaultCredentialOperationsExtensions.cs
index 7f2f1fa69db6..929cc0f5ea81 100644
--- a/src/ResourceManagement/AzureBackup/BackupServicesManagment/Generated/VaultCredentialOperationsExtensions.cs
+++ b/src/ResourceManagement/AzureBackup/BackupServicesManagment/Generated/VaultCredentialOperationsExtensions.cs
@@ -38,10 +38,10 @@ public static partial class VaultCredentialOperationsExtensions
         /// Microsoft.Azure.Management.BackupServices.IVaultCredentialOperations.
         /// </param>
         /// <param name='certificateName'>
-        /// Optional. Name of the certificate.
+        /// Required. Name of the certificate.
         /// </param>
         /// <param name='vaultCredUploadCertRequest'>
-        /// Optional. Certificate parameters.
+        /// Required. Certificate parameters.
         /// </param>
         /// <param name='customRequestHeaders'>
         /// Optional. Request header parameters.
@@ -66,10 +66,10 @@ public static VaultCredUploadCertResponse UploadCertificate(this IVaultCredentia
         /// Microsoft.Azure.Management.BackupServices.IVaultCredentialOperations.
         /// </param>
         /// <param name='certificateName'>
-        /// Optional. Name of the certificate.
+        /// Required. Name of the certificate.
         /// </param>
         /// <param name='vaultCredUploadCertRequest'>
-        /// Optional. Certificate parameters.
+        /// Required. Certificate parameters.
         /// </param>
         /// <param name='customRequestHeaders'>
         /// Optional. Request header parameters.