diff --git a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/IKeyVaultClient.cs b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/IKeyVaultClient.cs
index 2dace95117d21..82f9c2869c40a 100644
--- a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/IKeyVaultClient.cs
+++ b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/IKeyVaultClient.cs
@@ -1,29 +1,29 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-// 
-// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
 // Changes may cause incorrect behavior and will be lost if the code is
 // regenerated.
 
 namespace Microsoft.Azure.KeyVault
 {
-    using System;
+    using Azure;
+    using Rest;
+    using Rest.Azure;
+    using Models;
+    using Newtonsoft.Json;
+    using System.Collections;
     using System.Collections.Generic;
-    using System.Net.Http;
     using System.Threading;
     using System.Threading.Tasks;
-    using Newtonsoft.Json;
-    using Microsoft.Rest;
-    using Microsoft.Rest.Azure;
-    using Models;
     using Microsoft.Azure.KeyVault.WebKey;
 
     /// <summary>
-    /// Performs cryptographic key operations and vault operations against the
-    /// Key Vault service.
+    /// The key vault client performs cryptographic key operations and vault
+    /// operations against the Key Vault service.
     /// </summary>
-    public partial interface IKeyVaultClient : IDisposable
+    public partial interface IKeyVaultClient : System.IDisposable
     {
         /// <summary>
         /// The base URI of the service.
@@ -45,7 +45,7 @@ public partial interface IKeyVaultClient : IDisposable
         ServiceClientCredentials Credentials { get; }
 
         /// <summary>
-        /// Client Api Version.
+        /// Client API version.
         /// </summary>
         string ApiVersion { get; }
 
@@ -61,35 +61,40 @@ public partial interface IKeyVaultClient : IDisposable
         int? LongRunningOperationRetryTimeout { get; set; }
 
         /// <summary>
-        /// When set to true a unique x-ms-client-request-id value is
-        /// generated and included in each request. Default is true.
+        /// When set to true a unique x-ms-client-request-id value is generated
+        /// and included in each request. Default is true.
         /// </summary>
         bool? GenerateClientRequestId { get; set; }
 
 
-            /// <summary>
-        /// Creates a new, named, key in the specified vault.
+        /// <summary>
+        /// Creates a new key, stores it, then returns key parameters and
+        /// attributes to the client. The create key operation can be used to
+        /// create any key type in Azure Key Vault. If the named key already
+        /// exists, Azure Key Vault creates a new version of the key.
+        /// Authorization: Requires the keys/create permission.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='keyName'>
-        /// The name of the key
+        /// The name for the new key. The system will generate the version name
+        /// for the new key.
         /// </param>
         /// <param name='kty'>
-        /// The type of key to create. Valid key types, see JsonWebKeyType.
-        /// Supported JsonWebKey key types (kty) for Elliptic Curve, RSA,
-        /// HSM, Octet. Possible values include: 'EC', 'RSA', 'RSA-HSM', 'oct'
+        /// The type of key to create. For valid key types, see JsonWebKeyType.
+        /// Supported JsonWebKey key types (kty) for Elliptic Curve, RSA, HSM,
+        /// Octet. Possible values include: 'EC', 'RSA', 'RSA-HSM', 'oct'
         /// </param>
         /// <param name='keySize'>
-        /// The key size in bytes. e.g. 1024 or 2048.
+        /// The key size in bytes. For example, 1024 or 2048.
         /// </param>
         /// <param name='keyOps'>
         /// </param>
         /// <param name='keyAttributes'>
         /// </param>
         /// <param name='tags'>
-        /// Application-specific metadata in the form of key-value pairs
+        /// Application specific metadata in the form of key-value pairs.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -100,25 +105,29 @@ public partial interface IKeyVaultClient : IDisposable
         Task<AzureOperationResponse<KeyBundle>> CreateKeyWithHttpMessagesAsync(string vaultBaseUrl, string keyName, string kty, int? keySize = default(int?), IList<string> keyOps = default(IList<string>), KeyAttributes keyAttributes = default(KeyAttributes), IDictionary<string, string> tags = default(IDictionary<string, string>), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
-        /// Imports a key into the specified vault
+        /// Imports an externally created key, stores it, and returns key
+        /// parameters and attributes to the client. The import key operation
+        /// may be used to import any key type into an Azure Key Vault. If the
+        /// named key already exists, Azure Key Vault creates a new version of
+        /// the key. Authorization: requires the keys/import permission.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='keyName'>
-        /// The name of the key
+        /// Name for the imported key.
         /// </param>
         /// <param name='key'>
         /// The Json web key
         /// </param>
         /// <param name='hsm'>
-        /// Whether to import as a hardware key (HSM) or software key
+        /// Whether to import as a hardware key (HSM) or software key.
         /// </param>
         /// <param name='keyAttributes'>
-        /// The key management attributes
+        /// The key management attributes.
         /// </param>
         /// <param name='tags'>
-        /// Application-specific metadata in the form of key-value pairs
+        /// Application specific metadata in the form of key-value pairs.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -129,13 +138,18 @@ public partial interface IKeyVaultClient : IDisposable
         Task<AzureOperationResponse<KeyBundle>> ImportKeyWithHttpMessagesAsync(string vaultBaseUrl, string keyName, JsonWebKey key, bool? hsm = default(bool?), KeyAttributes keyAttributes = default(KeyAttributes), IDictionary<string, string> tags = default(IDictionary<string, string>), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
-        /// Deletes the specified key
+        /// Deletes a key of any type from storage in Azure Key Vault. The
+        /// delete key operation cannot be used to remove individual versions
+        /// of a key. This operation removes the cryptographic material
+        /// associated with the key, which means the key is not usable for
+        /// Sign/Verify, Wrap/Unwrap or Encrypt/Decrypt operations.
+        /// Authorization: Requires the keys/delete permission.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='keyName'>
-        /// The name of the key
+        /// The name of the key to delete.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -146,16 +160,21 @@ public partial interface IKeyVaultClient : IDisposable
         Task<AzureOperationResponse<KeyBundle>> DeleteKeyWithHttpMessagesAsync(string vaultBaseUrl, string keyName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
-        /// Updates the Key Attributes associated with the specified key
+        /// The update key operation changes specified attributes of a stored
+        /// key and can be applied to any key type and key version stored in
+        /// Azure Key Vault. The cryptographic material of a key itself cannot
+        /// be changed. In order to perform this operation, the key must
+        /// already exist in the Key Vault. Authorization: requires the
+        /// keys/update permission.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='keyName'>
-        /// The name of the key
+        /// The name of key to update.
         /// </param>
         /// <param name='keyVersion'>
-        /// The version of the key
+        /// The version of the key to update.
         /// </param>
         /// <param name='keyOps'>
         /// Json web key operations. For more information on possible key
@@ -164,7 +183,7 @@ public partial interface IKeyVaultClient : IDisposable
         /// <param name='keyAttributes'>
         /// </param>
         /// <param name='tags'>
-        /// Application-specific metadata in the form of key-value pairs
+        /// Application specific metadata in the form of key-value pairs.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -175,16 +194,19 @@ public partial interface IKeyVaultClient : IDisposable
         Task<AzureOperationResponse<KeyBundle>> UpdateKeyWithHttpMessagesAsync(string vaultBaseUrl, string keyName, string keyVersion, IList<string> keyOps = default(IList<string>), KeyAttributes keyAttributes = default(KeyAttributes), IDictionary<string, string> tags = default(IDictionary<string, string>), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
-        /// Retrieves the public portion of a key plus its attributes
+        /// Gets the public part of a stored key. The get key operation is
+        /// applicable to all key types. If the requested key is symmetric,
+        /// then no key material is released in the response. Authorization:
+        /// Requires the keys/get permission.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='keyName'>
-        /// The name of the key
+        /// The name of the key to get.
         /// </param>
         /// <param name='keyVersion'>
-        /// The version of the key
+        /// Adding the version parameter retrieves a specific version of a key.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -195,17 +217,19 @@ public partial interface IKeyVaultClient : IDisposable
         Task<AzureOperationResponse<KeyBundle>> GetKeyWithHttpMessagesAsync(string vaultBaseUrl, string keyName, string keyVersion, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
-        /// List the versions of the specified key
+        /// Retrieves a list of individual key versions with the same key name.
+        /// The full key identifier, attributes, and tags are provided in the
+        /// response. Authorization: Requires the keys/list permission.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='keyName'>
-        /// The name of the key
+        /// The name of the key.
         /// </param>
         /// <param name='maxresults'>
-        /// Maximum number of results to return in a page. If not specified
-        /// the service will return up to 25 results.
+        /// Maximum number of results to return in a page. If not specified the
+        /// service will return up to 25 results.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -216,14 +240,14 @@ public partial interface IKeyVaultClient : IDisposable
         Task<AzureOperationResponse<IPage<KeyItem>>> GetKeyVersionsWithHttpMessagesAsync(string vaultBaseUrl, string keyName, int? maxresults = default(int?), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
-        /// List keys in the specified vault
+        /// List keys in the specified vault.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='maxresults'>
-        /// Maximum number of results to return in a page. If not specified
-        /// the service will return up to 25 results.
+        /// Maximum number of results to return in a page. If not specified the
+        /// service will return up to 25 results.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -238,10 +262,10 @@ public partial interface IKeyVaultClient : IDisposable
         /// client.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='keyName'>
-        /// The name of the key
+        /// The name of the key.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -252,13 +276,13 @@ public partial interface IKeyVaultClient : IDisposable
         Task<AzureOperationResponse<BackupKeyResult>> BackupKeyWithHttpMessagesAsync(string vaultBaseUrl, string keyName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
-        /// Restores the backup key in to a vault
+        /// Restores a backed up key to a vault.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='keyBundleBackup'>
-        /// the backup blob associated with a key bundle
+        /// The backup blob associated with a key bundle.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -270,16 +294,16 @@ public partial interface IKeyVaultClient : IDisposable
 
         /// <summary>
         /// Encrypts an arbitrary sequence of bytes using an encryption key
-        /// that is stored in Azure Key Vault.
+        /// that is stored in a key vault.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='keyName'>
-        /// The name of the key
+        /// The name of the key.
         /// </param>
         /// <param name='keyVersion'>
-        /// The version of the key
+        /// The version of the key.
         /// </param>
         /// <param name='algorithm'>
         /// algorithm identifier. Possible values include: 'RSA-OAEP', 'RSA1_5'
@@ -295,16 +319,16 @@ public partial interface IKeyVaultClient : IDisposable
         Task<AzureOperationResponse<KeyOperationResult>> EncryptWithHttpMessagesAsync(string vaultBaseUrl, string keyName, string keyVersion, string algorithm, byte[] value, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
-        /// Decrypts a single block of encrypted data
+        /// Decrypts a single block of encrypted data.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='keyName'>
-        /// The name of the key
+        /// The name of the key.
         /// </param>
         /// <param name='keyVersion'>
-        /// The version of the key
+        /// The version of the key.
         /// </param>
         /// <param name='algorithm'>
         /// algorithm identifier. Possible values include: 'RSA-OAEP', 'RSA1_5'
@@ -320,23 +344,21 @@ public partial interface IKeyVaultClient : IDisposable
         Task<AzureOperationResponse<KeyOperationResult>> DecryptWithHttpMessagesAsync(string vaultBaseUrl, string keyName, string keyVersion, string algorithm, byte[] value, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
-        /// Creates a signature from a digest using the specified key in the
-        /// vault
+        /// Creates a signature from a digest using the specified key.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='keyName'>
-        /// The name of the key
+        /// The name of the key.
         /// </param>
         /// <param name='keyVersion'>
-        /// The version of the key
+        /// The version of the key.
         /// </param>
         /// <param name='algorithm'>
-        /// The signing/verification algorithm identifier. For more
-        /// information on possible algorithm types, see
-        /// JsonWebKeySignatureAlgorithm. Possible values include: 'RS256',
-        /// 'RS384', 'RS512', 'RSNULL'
+        /// The signing/verification algorithm identifier. For more information
+        /// on possible algorithm types, see JsonWebKeySignatureAlgorithm.
+        /// Possible values include: 'RS256', 'RS384', 'RS512', 'RSNULL'
         /// </param>
         /// <param name='value'>
         /// </param>
@@ -349,16 +371,16 @@ public partial interface IKeyVaultClient : IDisposable
         Task<AzureOperationResponse<KeyOperationResult>> SignWithHttpMessagesAsync(string vaultBaseUrl, string keyName, string keyVersion, string algorithm, byte[] value, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
-        /// Verifies a signature using the specified key
+        /// Verifies a signature using a specified key.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='keyName'>
-        /// The name of the key
+        /// The name of the key.
         /// </param>
         /// <param name='keyVersion'>
-        /// The version of the key
+        /// The version of the key.
         /// </param>
         /// <param name='algorithm'>
         /// The signing/verification algorithm. For more information on
@@ -366,10 +388,10 @@ public partial interface IKeyVaultClient : IDisposable
         /// Possible values include: 'RS256', 'RS384', 'RS512', 'RSNULL'
         /// </param>
         /// <param name='digest'>
-        /// The digest used for signing
+        /// The digest used for signing.
         /// </param>
         /// <param name='signature'>
-        /// The signature to be verified
+        /// The signature to be verified.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -380,16 +402,16 @@ public partial interface IKeyVaultClient : IDisposable
         Task<AzureOperationResponse<KeyVerifyResult>> VerifyWithHttpMessagesAsync(string vaultBaseUrl, string keyName, string keyVersion, string algorithm, byte[] digest, byte[] signature, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
-        /// Wraps a symmetric key using the specified key
+        /// Wraps a symmetric key using a specified key.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='keyName'>
-        /// The name of the key
+        /// The name of the key.
         /// </param>
         /// <param name='keyVersion'>
-        /// The version of the key
+        /// The version of the key.
         /// </param>
         /// <param name='algorithm'>
         /// algorithm identifier. Possible values include: 'RSA-OAEP', 'RSA1_5'
@@ -405,17 +427,17 @@ public partial interface IKeyVaultClient : IDisposable
         Task<AzureOperationResponse<KeyOperationResult>> WrapKeyWithHttpMessagesAsync(string vaultBaseUrl, string keyName, string keyVersion, string algorithm, byte[] value, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
-        /// Unwraps a symmetric key using the specified key in the vault that
-        /// has initially been used for wrapping the key.
+        /// Unwraps a symmetric key using the specified key that was initially
+        /// used for wrapping that key.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='keyName'>
-        /// The name of the key
+        /// The name of the key.
         /// </param>
         /// <param name='keyVersion'>
-        /// The version of the key
+        /// The version of the key.
         /// </param>
         /// <param name='algorithm'>
         /// algorithm identifier. Possible values include: 'RSA-OAEP', 'RSA1_5'
@@ -431,25 +453,25 @@ public partial interface IKeyVaultClient : IDisposable
         Task<AzureOperationResponse<KeyOperationResult>> UnwrapKeyWithHttpMessagesAsync(string vaultBaseUrl, string keyName, string keyVersion, string algorithm, byte[] value, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
-        /// Sets a secret in the specified vault.
+        /// Sets a secret in a specified key vault.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='secretName'>
-        /// The name of the secret in the given vault
+        /// The name of the secret.
         /// </param>
         /// <param name='value'>
-        /// The value of the secret
+        /// The value of the secret.
         /// </param>
         /// <param name='tags'>
-        /// Application-specific metadata in the form of key-value pairs
+        /// Application specific metadata in the form of key-value pairs.
         /// </param>
         /// <param name='contentType'>
-        /// Type of the secret value such as a password
+        /// Type of the secret value such as a password.
         /// </param>
         /// <param name='secretAttributes'>
-        /// The secret management attributes
+        /// The secret management attributes.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -460,13 +482,13 @@ public partial interface IKeyVaultClient : IDisposable
         Task<AzureOperationResponse<SecretBundle>> SetSecretWithHttpMessagesAsync(string vaultBaseUrl, string secretName, string value, IDictionary<string, string> tags = default(IDictionary<string, string>), string contentType = default(string), SecretAttributes secretAttributes = default(SecretAttributes), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
-        /// Deletes a secret from the specified vault.
+        /// Deletes a secret from a specified key vault.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='secretName'>
-        /// The name of the secret in the given vault
+        /// The name of the secret.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -477,25 +499,26 @@ public partial interface IKeyVaultClient : IDisposable
         Task<AzureOperationResponse<SecretBundle>> DeleteSecretWithHttpMessagesAsync(string vaultBaseUrl, string secretName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
-        /// Updates the attributes associated with the specified secret
+        /// Updates the attributes associated with a specified secret in a
+        /// given key vault.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='secretName'>
-        /// The name of the secret in the given vault
+        /// The name of the secret.
         /// </param>
         /// <param name='secretVersion'>
-        /// The version of the secret
+        /// The version of the secret.
         /// </param>
         /// <param name='contentType'>
-        /// Type of the secret value such as a password
+        /// Type of the secret value such as a password.
         /// </param>
         /// <param name='secretAttributes'>
-        /// The secret management attributes
+        /// The secret management attributes.
         /// </param>
         /// <param name='tags'>
-        /// Application-specific metadata in the form of key-value pairs
+        /// Application specific metadata in the form of key-value pairs.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -506,16 +529,16 @@ public partial interface IKeyVaultClient : IDisposable
         Task<AzureOperationResponse<SecretBundle>> UpdateSecretWithHttpMessagesAsync(string vaultBaseUrl, string secretName, string secretVersion, string contentType = default(string), SecretAttributes secretAttributes = default(SecretAttributes), IDictionary<string, string> tags = default(IDictionary<string, string>), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
-        /// Gets a secret.
+        /// Get a specified secret from a given key vault.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='secretName'>
-        /// The name of the secret in the given vault
+        /// The name of the secret.
         /// </param>
         /// <param name='secretVersion'>
-        /// The version of the secret
+        /// The version of the secret.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -526,14 +549,14 @@ public partial interface IKeyVaultClient : IDisposable
         Task<AzureOperationResponse<SecretBundle>> GetSecretWithHttpMessagesAsync(string vaultBaseUrl, string secretName, string secretVersion, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
-        /// List secrets in the specified vault
+        /// List secrets in a specified key vault
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='maxresults'>
-        /// Maximum number of results to return in a page. If not specified
-        /// the service will return up to 25 results.
+        /// Maximum number of results to return in a page. If not specified the
+        /// service will return up to 25 results.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -544,17 +567,17 @@ public partial interface IKeyVaultClient : IDisposable
         Task<AzureOperationResponse<IPage<SecretItem>>> GetSecretsWithHttpMessagesAsync(string vaultBaseUrl, int? maxresults = default(int?), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
-        /// List the versions of the specified secret
+        /// List the versions of the specified secret.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='secretName'>
-        /// The name of the secret in the given vault
+        /// The name of the secret.
         /// </param>
         /// <param name='maxresults'>
-        /// Maximum number of results to return in a page. If not specified
-        /// the service will return up to 25 results.
+        /// Maximum number of results to return in a page. If not specified the
+        /// service will return up to 25 results.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -565,14 +588,14 @@ public partial interface IKeyVaultClient : IDisposable
         Task<AzureOperationResponse<IPage<SecretItem>>> GetSecretVersionsWithHttpMessagesAsync(string vaultBaseUrl, string secretName, int? maxresults = default(int?), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
-        /// List certificates in the specified vault
+        /// List certificates in a specified key vault
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='maxresults'>
-        /// Maximum number of results to return in a page. If not specified
-        /// the service will return up to 25 results.
+        /// Maximum number of results to return in a page. If not specified the
+        /// service will return up to 25 results.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -583,13 +606,13 @@ public partial interface IKeyVaultClient : IDisposable
         Task<AzureOperationResponse<IPage<CertificateItem>>> GetCertificatesWithHttpMessagesAsync(string vaultBaseUrl, int? maxresults = default(int?), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
-        /// Deletes a certificate from the specified vault.
+        /// Deletes a certificate from a specified key vault.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='certificateName'>
-        /// The name of the certificate in the given vault
+        /// The name of the certificate.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -600,13 +623,13 @@ public partial interface IKeyVaultClient : IDisposable
         Task<AzureOperationResponse<CertificateBundle>> DeleteCertificateWithHttpMessagesAsync(string vaultBaseUrl, string certificateName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
-        /// Sets the certificate contacts for the specified vault.
+        /// Sets the certificate contacts for the specified key vault.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='contacts'>
-        /// The contacts for the vault certificates.
+        /// The contacts for the key vault certificate.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -617,10 +640,10 @@ public partial interface IKeyVaultClient : IDisposable
         Task<AzureOperationResponse<Contacts>> SetCertificateContactsWithHttpMessagesAsync(string vaultBaseUrl, Contacts contacts, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
-        /// Gets the certificate contacts for the specified vault.
+        /// Lists the certificate contacts for a specified key vault.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -631,10 +654,10 @@ public partial interface IKeyVaultClient : IDisposable
         Task<AzureOperationResponse<Contacts>> GetCertificateContactsWithHttpMessagesAsync(string vaultBaseUrl, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
-        /// Deletes the certificate contacts for the specified vault.
+        /// Deletes the certificate contacts for a specified key vault.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -645,14 +668,14 @@ public partial interface IKeyVaultClient : IDisposable
         Task<AzureOperationResponse<Contacts>> DeleteCertificateContactsWithHttpMessagesAsync(string vaultBaseUrl, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
-        /// List certificate issuers for the specified vault.
+        /// List certificate issuers for a specified key vault.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='maxresults'>
-        /// Maximum number of results to return in a page. If not specified
-        /// the service will return up to 25 results.
+        /// Maximum number of results to return in a page. If not specified the
+        /// service will return up to 25 results.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -666,7 +689,7 @@ public partial interface IKeyVaultClient : IDisposable
         /// Sets the specified certificate issuer.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='issuerName'>
         /// The name of the issuer.
@@ -695,7 +718,7 @@ public partial interface IKeyVaultClient : IDisposable
         /// Updates the specified certificate issuer.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='issuerName'>
         /// The name of the issuer.
@@ -721,10 +744,10 @@ public partial interface IKeyVaultClient : IDisposable
         Task<AzureOperationResponse<IssuerBundle>> UpdateCertificateIssuerWithHttpMessagesAsync(string vaultBaseUrl, string issuerName, string provider = default(string), IssuerCredentials credentials = default(IssuerCredentials), OrganizationDetails organizationDetails = default(OrganizationDetails), IssuerAttributes attributes = default(IssuerAttributes), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
-        /// Gets the specified certificate issuer.
+        /// Lists the specified certificate issuer.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='issuerName'>
         /// The name of the issuer.
@@ -741,7 +764,7 @@ public partial interface IKeyVaultClient : IDisposable
         /// Deletes the specified certificate issuer.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='issuerName'>
         /// The name of the issuer.
@@ -755,23 +778,23 @@ public partial interface IKeyVaultClient : IDisposable
         Task<AzureOperationResponse<IssuerBundle>> DeleteCertificateIssuerWithHttpMessagesAsync(string vaultBaseUrl, string issuerName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
-        /// Creates a new certificate version. If this is the first version,
-        /// the certificate resource is created.
+        /// Creates a new certificate. If this is the first version, the
+        /// certificate resource is created.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='certificateName'>
-        /// The name of the certificate
+        /// The name of the certificate.
         /// </param>
         /// <param name='certificatePolicy'>
-        /// The management policy for the certificate
+        /// The management policy for the certificate.
         /// </param>
         /// <param name='certificateAttributes'>
-        /// The attributes of the certificate (optional)
+        /// The attributes of the certificate (optional).
         /// </param>
         /// <param name='tags'>
-        /// Application-specific metadata in the form of key-value pairs
+        /// Application specific metadata in the form of key-value pairs.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -782,13 +805,13 @@ public partial interface IKeyVaultClient : IDisposable
         Task<AzureOperationResponse<CertificateOperation>> CreateCertificateWithHttpMessagesAsync(string vaultBaseUrl, string certificateName, CertificatePolicy certificatePolicy = default(CertificatePolicy), CertificateAttributes certificateAttributes = default(CertificateAttributes), IDictionary<string, string> tags = default(IDictionary<string, string>), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
-        /// Imports a certificate into the specified vault
+        /// Imports a certificate into a specified key vault.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='certificateName'>
-        /// The name of the certificate
+        /// The name of the certificate.
         /// </param>
         /// <param name='base64EncodedCertificate'>
         /// Base64 encoded representation of the certificate object to import.
@@ -796,16 +819,16 @@ public partial interface IKeyVaultClient : IDisposable
         /// </param>
         /// <param name='password'>
         /// If the private key in base64EncodedCertificate is encrypted, the
-        /// password used for encryption
+        /// password used for encryption.
         /// </param>
         /// <param name='certificatePolicy'>
-        /// The management policy for the certificate
+        /// The management policy for the certificate.
         /// </param>
         /// <param name='certificateAttributes'>
-        /// The attributes of the certificate (optional)
+        /// The attributes of the certificate (optional).
         /// </param>
         /// <param name='tags'>
-        /// Application-specific metadata in the form of key-value pairs
+        /// Application specific metadata in the form of key-value pairs.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -819,14 +842,14 @@ public partial interface IKeyVaultClient : IDisposable
         /// List the versions of a certificate.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='certificateName'>
-        /// The name of the certificate
+        /// The name of the certificate.
         /// </param>
         /// <param name='maxresults'>
-        /// Maximum number of results to return in a page. If not specified
-        /// the service will return up to 25 results.
+        /// Maximum number of results to return in a page. If not specified the
+        /// service will return up to 25 results.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -837,13 +860,13 @@ public partial interface IKeyVaultClient : IDisposable
         Task<AzureOperationResponse<IPage<CertificateItem>>> GetCertificateVersionsWithHttpMessagesAsync(string vaultBaseUrl, string certificateName, int? maxresults = default(int?), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
-        /// Gets the policy for a certificate.
+        /// Lists the policy for a certificate.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='certificateName'>
-        /// The name of the certificate in the given vault.
+        /// The name of the certificate in a given key vault.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -854,11 +877,11 @@ public partial interface IKeyVaultClient : IDisposable
         Task<AzureOperationResponse<CertificatePolicy>> GetCertificatePolicyWithHttpMessagesAsync(string vaultBaseUrl, string certificateName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
-        /// Updates the policy for a certificate. Set appropriate members in
-        /// the certificatePolicy that must be updated. Leave others as null.
+        /// Updates the policy for a certificate. Set specified members in the
+        /// certificate policy. Leave others as null.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='certificateName'>
         /// The name of the certificate in the given vault.
@@ -875,25 +898,26 @@ public partial interface IKeyVaultClient : IDisposable
         Task<AzureOperationResponse<CertificatePolicy>> UpdateCertificatePolicyWithHttpMessagesAsync(string vaultBaseUrl, string certificateName, CertificatePolicy certificatePolicy, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
-        /// Updates the attributes associated with the specified certificate
+        /// Updates the specified attributes associated with the given
+        /// certificate.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='certificateName'>
-        /// The name of the certificate in the given vault
+        /// The name of the certificate in the given key vault.
         /// </param>
         /// <param name='certificateVersion'>
-        /// The version of the certificate
+        /// The version of the certificate.
         /// </param>
         /// <param name='certificatePolicy'>
-        /// The management policy for the certificate
+        /// The management policy for the certificate.
         /// </param>
         /// <param name='certificateAttributes'>
-        /// The attributes of the certificate (optional)
+        /// The attributes of the certificate (optional).
         /// </param>
         /// <param name='tags'>
-        /// Application-specific metadata in the form of key-value pairs
+        /// Application specific metadata in the form of key-value pairs.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -904,16 +928,16 @@ public partial interface IKeyVaultClient : IDisposable
         Task<AzureOperationResponse<CertificateBundle>> UpdateCertificateWithHttpMessagesAsync(string vaultBaseUrl, string certificateName, string certificateVersion, CertificatePolicy certificatePolicy = default(CertificatePolicy), CertificateAttributes certificateAttributes = default(CertificateAttributes), IDictionary<string, string> tags = default(IDictionary<string, string>), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
-        /// Gets a Certificate.
+        /// Gets information about a specified certificate.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='certificateName'>
-        /// The name of the certificate in the given vault
+        /// The name of the certificate in the given vault.
         /// </param>
         /// <param name='certificateVersion'>
-        /// The version of the certificate
+        /// The version of the certificate.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -927,10 +951,10 @@ public partial interface IKeyVaultClient : IDisposable
         /// Updates a certificate operation.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='certificateName'>
-        /// The name of the certificate
+        /// The name of the certificate.
         /// </param>
         /// <param name='cancellationRequested'>
         /// Indicates if cancellation was requested on the certificate
@@ -945,13 +969,13 @@ public partial interface IKeyVaultClient : IDisposable
         Task<AzureOperationResponse<CertificateOperation>> UpdateCertificateOperationWithHttpMessagesAsync(string vaultBaseUrl, string certificateName, bool cancellationRequested, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
-        /// Gets the certificate operation response.
+        /// Gets the operation associated with a specified certificate.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='certificateName'>
-        /// The name of the certificate
+        /// The name of the certificate.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -962,13 +986,13 @@ public partial interface IKeyVaultClient : IDisposable
         Task<AzureOperationResponse<CertificateOperation>> GetCertificateOperationWithHttpMessagesAsync(string vaultBaseUrl, string certificateName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
-        /// Deletes the certificate operation.
+        /// Deletes the operation for a specified certificate.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='certificateName'>
-        /// The name of the certificate
+        /// The name of the certificate.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -983,19 +1007,19 @@ public partial interface IKeyVaultClient : IDisposable
         /// existing on the server.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='certificateName'>
-        /// The name of the certificate
+        /// The name of the certificate.
         /// </param>
         /// <param name='x509Certificates'>
-        /// The certificate or the certificate chain to merge
+        /// The certificate or the certificate chain to merge.
         /// </param>
         /// <param name='certificateAttributes'>
-        /// The attributes of the certificate (optional)
+        /// The attributes of the certificate (optional).
         /// </param>
         /// <param name='tags'>
-        /// Application-specific metadata in the form of key-value pairs
+        /// Application specific metadata in the form of key-value pairs.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -1006,7 +1030,9 @@ public partial interface IKeyVaultClient : IDisposable
         Task<AzureOperationResponse<CertificateBundle>> MergeCertificateWithHttpMessagesAsync(string vaultBaseUrl, string certificateName, IList<byte[]> x509Certificates, CertificateAttributes certificateAttributes = default(CertificateAttributes), IDictionary<string, string> tags = default(IDictionary<string, string>), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
-        /// List the versions of the specified key
+        /// Retrieves a list of individual key versions with the same key name.
+        /// The full key identifier, attributes, and tags are provided in the
+        /// response. Authorization: Requires the keys/list permission.
         /// </summary>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -1020,7 +1046,7 @@ public partial interface IKeyVaultClient : IDisposable
         Task<AzureOperationResponse<IPage<KeyItem>>> GetKeyVersionsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
-        /// List keys in the specified vault
+        /// List keys in the specified vault.
         /// </summary>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -1034,7 +1060,7 @@ public partial interface IKeyVaultClient : IDisposable
         Task<AzureOperationResponse<IPage<KeyItem>>> GetKeysNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
-        /// List secrets in the specified vault
+        /// List secrets in a specified key vault
         /// </summary>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -1048,7 +1074,7 @@ public partial interface IKeyVaultClient : IDisposable
         Task<AzureOperationResponse<IPage<SecretItem>>> GetSecretsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
-        /// List the versions of the specified secret
+        /// List the versions of the specified secret.
         /// </summary>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -1062,7 +1088,7 @@ public partial interface IKeyVaultClient : IDisposable
         Task<AzureOperationResponse<IPage<SecretItem>>> GetSecretVersionsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
-        /// List certificates in the specified vault
+        /// List certificates in a specified key vault
         /// </summary>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -1076,7 +1102,7 @@ public partial interface IKeyVaultClient : IDisposable
         Task<AzureOperationResponse<IPage<CertificateItem>>> GetCertificatesNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
-        /// List certificate issuers for the specified vault.
+        /// List certificate issuers for a specified key vault.
         /// </summary>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -1105,3 +1131,4 @@ public partial interface IKeyVaultClient : IDisposable
 
     }
 }
+
diff --git a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/KeyVaultClient.cs b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/KeyVaultClient.cs
index 1ff7fdb3bdd91..82df7631f80c9 100644
--- a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/KeyVaultClient.cs
+++ b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/KeyVaultClient.cs
@@ -1,34 +1,31 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-// 
-// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
 // Changes may cause incorrect behavior and will be lost if the code is
 // regenerated.
 
 namespace Microsoft.Azure.KeyVault
 {
-    using System;
-    using System.Linq;
+    using Azure;
+    using Rest;
+    using Rest.Azure;
+    using Rest.Serialization;
+    using Models;
+    using Newtonsoft.Json;
+    using System.Collections;
     using System.Collections.Generic;
-    using System.Diagnostics;
+    using System.Linq;
     using System.Net;
     using System.Net.Http;
-    using System.Net.Http.Headers;
-    using System.Text;
-    using System.Text.RegularExpressions;
     using System.Threading;
     using System.Threading.Tasks;
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Newtonsoft.Json;
-    using Microsoft.Rest.Azure;
-    using Models;
     using Microsoft.Azure.KeyVault.WebKey;
 
     /// <summary>
-    /// Performs cryptographic key operations and vault operations against the
-    /// Key Vault service.
+    /// The key vault client performs cryptographic key operations and vault
+    /// operations against the Key Vault service.
     /// </summary>
     public partial class KeyVaultClient : ServiceClient<KeyVaultClient>, IKeyVaultClient, IAzureClient
     {
@@ -45,7 +42,7 @@ public partial class KeyVaultClient : ServiceClient<KeyVaultClient>, IKeyVaultCl
         /// <summary>
         /// Gets or sets json deserialization settings.
         /// </summary>
-        public JsonSerializerSettings DeserializationSettings { get; private set; }        
+        public JsonSerializerSettings DeserializationSettings { get; private set; }
 
         /// <summary>
         /// Credentials needed for the client to connect to Azure.
@@ -53,7 +50,7 @@ public partial class KeyVaultClient : ServiceClient<KeyVaultClient>, IKeyVaultCl
         public ServiceClientCredentials Credentials { get; private set; }
 
         /// <summary>
-        /// Client Api Version.
+        /// Client API version.
         /// </summary>
         public string ApiVersion { get; private set; }
 
@@ -80,9 +77,9 @@ public partial class KeyVaultClient : ServiceClient<KeyVaultClient>, IKeyVaultCl
         /// <param name='handlers'>
         /// Optional. The delegating handlers to add to the http client pipeline.
         /// </param>
-        protected KeyVaultClient(params DelegatingHandler[] handlers) : base(handlers)
+        protected KeyVaultClient(params System.Net.Http.DelegatingHandler[] handlers) : base(handlers)
         {
-            this.Initialize();
+            Initialize();
         }
 
         /// <summary>
@@ -94,9 +91,9 @@ protected KeyVaultClient(params DelegatingHandler[] handlers) : base(handlers)
         /// <param name='handlers'>
         /// Optional. The delegating handlers to add to the http client pipeline.
         /// </param>
-        protected KeyVaultClient(HttpClientHandler rootHandler, params DelegatingHandler[] handlers) : base(rootHandler, handlers)
+        protected KeyVaultClient(System.Net.Http.HttpClientHandler rootHandler, params System.Net.Http.DelegatingHandler[] handlers) : base(rootHandler, handlers)
         {
-            this.Initialize();
+            Initialize();
         }
 
         /// <summary>
@@ -108,19 +105,19 @@ protected KeyVaultClient(HttpClientHandler rootHandler, params DelegatingHandler
         /// <param name='handlers'>
         /// Optional. The delegating handlers to add to the http client pipeline.
         /// </param>
-        /// <exception cref="ArgumentNullException">
+        /// <exception cref="System.ArgumentNullException">
         /// Thrown when a required parameter is null
         /// </exception>
-        public KeyVaultClient(ServiceClientCredentials credentials, params DelegatingHandler[] handlers) : this(handlers)
+        public KeyVaultClient(ServiceClientCredentials credentials, params System.Net.Http.DelegatingHandler[] handlers) : this(handlers)
         {
             if (credentials == null)
             {
-                throw new ArgumentNullException("credentials");
+                throw new System.ArgumentNullException("credentials");
             }
-            this.Credentials = credentials;
-            if (this.Credentials != null)
+            Credentials = credentials;
+            if (Credentials != null)
             {
-                this.Credentials.InitializeServiceClient(this);
+                Credentials.InitializeServiceClient(this);
             }
         }
 
@@ -136,19 +133,19 @@ public KeyVaultClient(ServiceClientCredentials credentials, params DelegatingHan
         /// <param name='handlers'>
         /// Optional. The delegating handlers to add to the http client pipeline.
         /// </param>
-        /// <exception cref="ArgumentNullException">
+        /// <exception cref="System.ArgumentNullException">
         /// Thrown when a required parameter is null
         /// </exception>
-        public KeyVaultClient(ServiceClientCredentials credentials, HttpClientHandler rootHandler, params DelegatingHandler[] handlers) : this(rootHandler, handlers)
+        public KeyVaultClient(ServiceClientCredentials credentials, System.Net.Http.HttpClientHandler rootHandler, params System.Net.Http.DelegatingHandler[] handlers) : this(rootHandler, handlers)
         {
             if (credentials == null)
             {
-                throw new ArgumentNullException("credentials");
+                throw new System.ArgumentNullException("credentials");
             }
-            this.Credentials = credentials;
-            if (this.Credentials != null)
+            Credentials = credentials;
+            if (Credentials != null)
             {
-                this.Credentials.InitializeServiceClient(this);
+                Credentials.InitializeServiceClient(this);
             }
         }
 
@@ -161,11 +158,11 @@ public KeyVaultClient(ServiceClientCredentials credentials, HttpClientHandler ro
         /// </summary>
         private void Initialize()
         {
-            this.BaseUri = "{vaultBaseUrl}";
-            this.ApiVersion = "2016-10-01";
-            this.AcceptLanguage = "en-US";
-            this.LongRunningOperationRetryTimeout = 30;
-            this.GenerateClientRequestId = true;
+            BaseUri = "{vaultBaseUrl}";
+            ApiVersion = "2016-10-01";
+            AcceptLanguage = "en-US";
+            LongRunningOperationRetryTimeout = 30;
+            GenerateClientRequestId = true;
             SerializationSettings = new JsonSerializerSettings
             {
                 Formatting = Formatting.Indented,
@@ -192,31 +189,35 @@ private void Initialize()
                     }
             };
             CustomInitialize();
-            DeserializationSettings.Converters.Add(new CloudErrorJsonConverter()); 
-        }    
+            DeserializationSettings.Converters.Add(new CloudErrorJsonConverter());
+        }
         /// <summary>
-        /// Creates a new, named, key in the specified vault.
+        /// Creates a new key, stores it, then returns key parameters and attributes to
+        /// the client. The create key operation can be used to create any key type in
+        /// Azure Key Vault. If the named key already exists, Azure Key Vault creates a
+        /// new version of the key. Authorization: Requires the keys/create permission.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='keyName'>
-        /// The name of the key
+        /// The name for the new key. The system will generate the version name for the
+        /// new key.
         /// </param>
         /// <param name='kty'>
-        /// The type of key to create. Valid key types, see JsonWebKeyType. Supported
-        /// JsonWebKey key types (kty) for Elliptic Curve, RSA, HSM, Octet. Possible
-        /// values include: 'EC', 'RSA', 'RSA-HSM', 'oct'
+        /// The type of key to create. For valid key types, see JsonWebKeyType.
+        /// Supported JsonWebKey key types (kty) for Elliptic Curve, RSA, HSM, Octet.
+        /// Possible values include: 'EC', 'RSA', 'RSA-HSM', 'oct'
         /// </param>
         /// <param name='keySize'>
-        /// The key size in bytes. e.g. 1024 or 2048.
+        /// The key size in bytes. For example, 1024 or 2048.
         /// </param>
         /// <param name='keyOps'>
         /// </param>
         /// <param name='keyAttributes'>
         /// </param>
         /// <param name='tags'>
-        /// Application-specific metadata in the form of key-value pairs
+        /// Application specific metadata in the form of key-value pairs.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -233,6 +234,9 @@ private void Initialize()
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
@@ -253,7 +257,7 @@ private void Initialize()
                     throw new ValidationException(ValidationRules.Pattern, "keyName", "^[0-9a-zA-Z-]+$");
                 }
             }
-            if (this.ApiVersion == null)
+            if (ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.ApiVersion");
             }
@@ -269,7 +273,7 @@ private void Initialize()
                 }
             }
             KeyCreateParameters parameters = new KeyCreateParameters();
-            if (kty != null || keyOps != null || keyAttributes != null || tags != null)
+            if (kty != null || keySize != null || keyOps != null || keyAttributes != null || tags != null)
             {
                 parameters.Kty = kty;
                 parameters.KeySize = keySize;
@@ -291,37 +295,39 @@ private void Initialize()
                 ServiceClientTracing.Enter(_invocationId, this, "CreateKey", tracingParameters);
             }
             // Construct URL
-            var _baseUrl = this.BaseUri;
+            var _baseUrl = BaseUri;
             var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "keys/{key-name}/create";
             _url = _url.Replace("{vaultBaseUrl}", vaultBaseUrl);
-            _url = _url.Replace("{key-name}", Uri.EscapeDataString(keyName));
+            _url = _url.Replace("{key-name}", System.Uri.EscapeDataString(keyName));
             List<string> _queryParameters = new List<string>();
-            if (this.ApiVersion != null)
+            if (ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", Uri.EscapeDataString(this.ApiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
-                _url += "?" + string.Join("&", _queryParameters);
+                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
             }
             // Create HTTP transport objects
-            HttpRequestMessage _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("POST");
-            _httpRequest.RequestUri = new Uri(_url);
+            var _httpRequest = new System.Net.Http.HttpRequestMessage();
+            System.Net.Http.HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new System.Net.Http.HttpMethod("POST");
+            _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
-            if (this.GenerateClientRequestId != null && this.GenerateClientRequestId.Value)
+            if (GenerateClientRequestId != null && GenerateClientRequestId.Value)
             {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", Guid.NewGuid().ToString());
+                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
             }
-            if (this.AcceptLanguage != null)
+            if (AcceptLanguage != null)
             {
                 if (_httpRequest.Headers.Contains("accept-language"))
                 {
                     _httpRequest.Headers.Remove("accept-language");
                 }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", this.AcceptLanguage);
+                _httpRequest.Headers.TryAddWithoutValidation("accept-language", AcceptLanguage);
             }
+
+
             if (customHeaders != null)
             {
                 foreach(var _header in customHeaders)
@@ -338,15 +344,15 @@ private void Initialize()
             string _requestContent = null;
             if(parameters != null)
             {
-                _requestContent = SafeJsonConvert.SerializeObject(parameters, this.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
+                _requestContent = SafeJsonConvert.SerializeObject(parameters, SerializationSettings);
+                _httpRequest.Content = new System.Net.Http.StringContent(_requestContent, System.Text.Encoding.UTF8);
+                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             }
             // Set Credentials
-            if (this.Credentials != null)
+            if (Credentials != null)
             {
                 cancellationToken.ThrowIfCancellationRequested();
-                await this.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+                await Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             }
             // Send Request
             if (_shouldTrace)
@@ -354,7 +360,7 @@ private void Initialize()
                 ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
             }
             cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await this.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            _httpResponse = await HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             if (_shouldTrace)
             {
                 ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
@@ -368,7 +374,7 @@ private void Initialize()
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    KeyVaultError _errorBody = SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, this.DeserializationSettings);
+                    KeyVaultError _errorBody =  SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, DeserializationSettings);
                     if (_errorBody != null)
                     {
                         ex.Body = _errorBody;
@@ -405,7 +411,7 @@ private void Initialize()
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = SafeJsonConvert.DeserializeObject<KeyBundle>(_responseContent, this.DeserializationSettings);
+                    _result.Body = SafeJsonConvert.DeserializeObject<KeyBundle>(_responseContent, DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -425,25 +431,29 @@ private void Initialize()
         }
 
         /// <summary>
-        /// Imports a key into the specified vault
+        /// Imports an externally created key, stores it, and returns key parameters
+        /// and attributes to the client. The import key operation may be used to
+        /// import any key type into an Azure Key Vault. If the named key already
+        /// exists, Azure Key Vault creates a new version of the key. Authorization:
+        /// requires the keys/import permission.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='keyName'>
-        /// The name of the key
+        /// Name for the imported key.
         /// </param>
         /// <param name='key'>
         /// The Json web key
         /// </param>
         /// <param name='hsm'>
-        /// Whether to import as a hardware key (HSM) or software key
+        /// Whether to import as a hardware key (HSM) or software key.
         /// </param>
         /// <param name='keyAttributes'>
-        /// The key management attributes
+        /// The key management attributes.
         /// </param>
         /// <param name='tags'>
-        /// Application-specific metadata in the form of key-value pairs
+        /// Application specific metadata in the form of key-value pairs.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -460,6 +470,9 @@ private void Initialize()
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
@@ -480,7 +493,7 @@ private void Initialize()
                     throw new ValidationException(ValidationRules.Pattern, "keyName", "^[0-9a-zA-Z-]+$");
                 }
             }
-            if (this.ApiVersion == null)
+            if (ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.ApiVersion");
             }
@@ -489,7 +502,7 @@ private void Initialize()
                 throw new ValidationException(ValidationRules.CannotBeNull, "key");
             }
             KeyImportParameters parameters = new KeyImportParameters();
-            if (key != null || keyAttributes != null || tags != null)
+            if (hsm != null || key != null || keyAttributes != null || tags != null)
             {
                 parameters.Hsm = hsm;
                 parameters.Key = key;
@@ -510,37 +523,39 @@ private void Initialize()
                 ServiceClientTracing.Enter(_invocationId, this, "ImportKey", tracingParameters);
             }
             // Construct URL
-            var _baseUrl = this.BaseUri;
+            var _baseUrl = BaseUri;
             var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "keys/{key-name}";
             _url = _url.Replace("{vaultBaseUrl}", vaultBaseUrl);
-            _url = _url.Replace("{key-name}", Uri.EscapeDataString(keyName));
+            _url = _url.Replace("{key-name}", System.Uri.EscapeDataString(keyName));
             List<string> _queryParameters = new List<string>();
-            if (this.ApiVersion != null)
+            if (ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", Uri.EscapeDataString(this.ApiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
-                _url += "?" + string.Join("&", _queryParameters);
+                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
             }
             // Create HTTP transport objects
-            HttpRequestMessage _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("PUT");
-            _httpRequest.RequestUri = new Uri(_url);
+            var _httpRequest = new System.Net.Http.HttpRequestMessage();
+            System.Net.Http.HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new System.Net.Http.HttpMethod("PUT");
+            _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
-            if (this.GenerateClientRequestId != null && this.GenerateClientRequestId.Value)
+            if (GenerateClientRequestId != null && GenerateClientRequestId.Value)
             {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", Guid.NewGuid().ToString());
+                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
             }
-            if (this.AcceptLanguage != null)
+            if (AcceptLanguage != null)
             {
                 if (_httpRequest.Headers.Contains("accept-language"))
                 {
                     _httpRequest.Headers.Remove("accept-language");
                 }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", this.AcceptLanguage);
+                _httpRequest.Headers.TryAddWithoutValidation("accept-language", AcceptLanguage);
             }
+
+
             if (customHeaders != null)
             {
                 foreach(var _header in customHeaders)
@@ -557,15 +572,15 @@ private void Initialize()
             string _requestContent = null;
             if(parameters != null)
             {
-                _requestContent = SafeJsonConvert.SerializeObject(parameters, this.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
+                _requestContent = SafeJsonConvert.SerializeObject(parameters, SerializationSettings);
+                _httpRequest.Content = new System.Net.Http.StringContent(_requestContent, System.Text.Encoding.UTF8);
+                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             }
             // Set Credentials
-            if (this.Credentials != null)
+            if (Credentials != null)
             {
                 cancellationToken.ThrowIfCancellationRequested();
-                await this.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+                await Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             }
             // Send Request
             if (_shouldTrace)
@@ -573,7 +588,7 @@ private void Initialize()
                 ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
             }
             cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await this.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            _httpResponse = await HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             if (_shouldTrace)
             {
                 ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
@@ -587,7 +602,7 @@ private void Initialize()
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    KeyVaultError _errorBody = SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, this.DeserializationSettings);
+                    KeyVaultError _errorBody =  SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, DeserializationSettings);
                     if (_errorBody != null)
                     {
                         ex.Body = _errorBody;
@@ -624,7 +639,7 @@ private void Initialize()
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = SafeJsonConvert.DeserializeObject<KeyBundle>(_responseContent, this.DeserializationSettings);
+                    _result.Body = SafeJsonConvert.DeserializeObject<KeyBundle>(_responseContent, DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -644,13 +659,17 @@ private void Initialize()
         }
 
         /// <summary>
-        /// Deletes the specified key
+        /// Deletes a key of any type from storage in Azure Key Vault. The delete key
+        /// operation cannot be used to remove individual versions of a key. This
+        /// operation removes the cryptographic material associated with the key, which
+        /// means the key is not usable for Sign/Verify, Wrap/Unwrap or Encrypt/Decrypt
+        /// operations. Authorization: Requires the keys/delete permission.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='keyName'>
-        /// The name of the key
+        /// The name of the key to delete.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -667,6 +686,9 @@ private void Initialize()
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
@@ -680,7 +702,7 @@ private void Initialize()
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "keyName");
             }
-            if (this.ApiVersion == null)
+            if (ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.ApiVersion");
             }
@@ -697,37 +719,39 @@ private void Initialize()
                 ServiceClientTracing.Enter(_invocationId, this, "DeleteKey", tracingParameters);
             }
             // Construct URL
-            var _baseUrl = this.BaseUri;
+            var _baseUrl = BaseUri;
             var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "keys/{key-name}";
             _url = _url.Replace("{vaultBaseUrl}", vaultBaseUrl);
-            _url = _url.Replace("{key-name}", Uri.EscapeDataString(keyName));
+            _url = _url.Replace("{key-name}", System.Uri.EscapeDataString(keyName));
             List<string> _queryParameters = new List<string>();
-            if (this.ApiVersion != null)
+            if (ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", Uri.EscapeDataString(this.ApiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
-                _url += "?" + string.Join("&", _queryParameters);
+                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
             }
             // Create HTTP transport objects
-            HttpRequestMessage _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("DELETE");
-            _httpRequest.RequestUri = new Uri(_url);
+            var _httpRequest = new System.Net.Http.HttpRequestMessage();
+            System.Net.Http.HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new System.Net.Http.HttpMethod("DELETE");
+            _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
-            if (this.GenerateClientRequestId != null && this.GenerateClientRequestId.Value)
+            if (GenerateClientRequestId != null && GenerateClientRequestId.Value)
             {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", Guid.NewGuid().ToString());
+                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
             }
-            if (this.AcceptLanguage != null)
+            if (AcceptLanguage != null)
             {
                 if (_httpRequest.Headers.Contains("accept-language"))
                 {
                     _httpRequest.Headers.Remove("accept-language");
                 }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", this.AcceptLanguage);
+                _httpRequest.Headers.TryAddWithoutValidation("accept-language", AcceptLanguage);
             }
+
+
             if (customHeaders != null)
             {
                 foreach(var _header in customHeaders)
@@ -743,10 +767,10 @@ private void Initialize()
             // Serialize Request
             string _requestContent = null;
             // Set Credentials
-            if (this.Credentials != null)
+            if (Credentials != null)
             {
                 cancellationToken.ThrowIfCancellationRequested();
-                await this.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+                await Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             }
             // Send Request
             if (_shouldTrace)
@@ -754,7 +778,7 @@ private void Initialize()
                 ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
             }
             cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await this.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            _httpResponse = await HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             if (_shouldTrace)
             {
                 ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
@@ -768,7 +792,7 @@ private void Initialize()
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    KeyVaultError _errorBody = SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, this.DeserializationSettings);
+                    KeyVaultError _errorBody =  SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, DeserializationSettings);
                     if (_errorBody != null)
                     {
                         ex.Body = _errorBody;
@@ -805,7 +829,7 @@ private void Initialize()
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = SafeJsonConvert.DeserializeObject<KeyBundle>(_responseContent, this.DeserializationSettings);
+                    _result.Body = SafeJsonConvert.DeserializeObject<KeyBundle>(_responseContent, DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -825,16 +849,20 @@ private void Initialize()
         }
 
         /// <summary>
-        /// Updates the Key Attributes associated with the specified key
+        /// The update key operation changes specified attributes of a stored key and
+        /// can be applied to any key type and key version stored in Azure Key Vault.
+        /// The cryptographic material of a key itself cannot be changed. In order to
+        /// perform this operation, the key must already exist in the Key Vault.
+        /// Authorization: requires the keys/update permission.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='keyName'>
-        /// The name of the key
+        /// The name of key to update.
         /// </param>
         /// <param name='keyVersion'>
-        /// The version of the key
+        /// The version of the key to update.
         /// </param>
         /// <param name='keyOps'>
         /// Json web key operations. For more information on possible key operations,
@@ -843,7 +871,7 @@ private void Initialize()
         /// <param name='keyAttributes'>
         /// </param>
         /// <param name='tags'>
-        /// Application-specific metadata in the form of key-value pairs
+        /// Application specific metadata in the form of key-value pairs.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -860,6 +888,9 @@ private void Initialize()
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
@@ -877,7 +908,7 @@ private void Initialize()
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "keyVersion");
             }
-            if (this.ApiVersion == null)
+            if (ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.ApiVersion");
             }
@@ -903,38 +934,40 @@ private void Initialize()
                 ServiceClientTracing.Enter(_invocationId, this, "UpdateKey", tracingParameters);
             }
             // Construct URL
-            var _baseUrl = this.BaseUri;
+            var _baseUrl = BaseUri;
             var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "keys/{key-name}/{key-version}";
             _url = _url.Replace("{vaultBaseUrl}", vaultBaseUrl);
-            _url = _url.Replace("{key-name}", Uri.EscapeDataString(keyName));
-            _url = _url.Replace("{key-version}", Uri.EscapeDataString(keyVersion));
+            _url = _url.Replace("{key-name}", System.Uri.EscapeDataString(keyName));
+            _url = _url.Replace("{key-version}", System.Uri.EscapeDataString(keyVersion));
             List<string> _queryParameters = new List<string>();
-            if (this.ApiVersion != null)
+            if (ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", Uri.EscapeDataString(this.ApiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
-                _url += "?" + string.Join("&", _queryParameters);
+                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
             }
             // Create HTTP transport objects
-            HttpRequestMessage _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("PATCH");
-            _httpRequest.RequestUri = new Uri(_url);
+            var _httpRequest = new System.Net.Http.HttpRequestMessage();
+            System.Net.Http.HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new System.Net.Http.HttpMethod("PATCH");
+            _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
-            if (this.GenerateClientRequestId != null && this.GenerateClientRequestId.Value)
+            if (GenerateClientRequestId != null && GenerateClientRequestId.Value)
             {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", Guid.NewGuid().ToString());
+                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
             }
-            if (this.AcceptLanguage != null)
+            if (AcceptLanguage != null)
             {
                 if (_httpRequest.Headers.Contains("accept-language"))
                 {
                     _httpRequest.Headers.Remove("accept-language");
                 }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", this.AcceptLanguage);
+                _httpRequest.Headers.TryAddWithoutValidation("accept-language", AcceptLanguage);
             }
+
+
             if (customHeaders != null)
             {
                 foreach(var _header in customHeaders)
@@ -951,15 +984,15 @@ private void Initialize()
             string _requestContent = null;
             if(parameters != null)
             {
-                _requestContent = SafeJsonConvert.SerializeObject(parameters, this.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
+                _requestContent = SafeJsonConvert.SerializeObject(parameters, SerializationSettings);
+                _httpRequest.Content = new System.Net.Http.StringContent(_requestContent, System.Text.Encoding.UTF8);
+                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             }
             // Set Credentials
-            if (this.Credentials != null)
+            if (Credentials != null)
             {
                 cancellationToken.ThrowIfCancellationRequested();
-                await this.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+                await Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             }
             // Send Request
             if (_shouldTrace)
@@ -967,7 +1000,7 @@ private void Initialize()
                 ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
             }
             cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await this.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            _httpResponse = await HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             if (_shouldTrace)
             {
                 ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
@@ -981,7 +1014,7 @@ private void Initialize()
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    KeyVaultError _errorBody = SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, this.DeserializationSettings);
+                    KeyVaultError _errorBody =  SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, DeserializationSettings);
                     if (_errorBody != null)
                     {
                         ex.Body = _errorBody;
@@ -1018,7 +1051,7 @@ private void Initialize()
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = SafeJsonConvert.DeserializeObject<KeyBundle>(_responseContent, this.DeserializationSettings);
+                    _result.Body = SafeJsonConvert.DeserializeObject<KeyBundle>(_responseContent, DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -1038,16 +1071,19 @@ private void Initialize()
         }
 
         /// <summary>
-        /// Retrieves the public portion of a key plus its attributes
+        /// Gets the public part of a stored key. The get key operation is applicable
+        /// to all key types. If the requested key is symmetric, then no key material
+        /// is released in the response. Authorization: Requires the keys/get
+        /// permission.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='keyName'>
-        /// The name of the key
+        /// The name of the key to get.
         /// </param>
         /// <param name='keyVersion'>
-        /// The version of the key
+        /// Adding the version parameter retrieves a specific version of a key.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -1064,6 +1100,9 @@ private void Initialize()
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
@@ -1081,7 +1120,7 @@ private void Initialize()
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "keyVersion");
             }
-            if (this.ApiVersion == null)
+            if (ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.ApiVersion");
             }
@@ -1099,38 +1138,40 @@ private void Initialize()
                 ServiceClientTracing.Enter(_invocationId, this, "GetKey", tracingParameters);
             }
             // Construct URL
-            var _baseUrl = this.BaseUri;
+            var _baseUrl = BaseUri;
             var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "keys/{key-name}/{key-version}";
             _url = _url.Replace("{vaultBaseUrl}", vaultBaseUrl);
-            _url = _url.Replace("{key-name}", Uri.EscapeDataString(keyName));
-            _url = _url.Replace("{key-version}", Uri.EscapeDataString(keyVersion));
+            _url = _url.Replace("{key-name}", System.Uri.EscapeDataString(keyName));
+            _url = _url.Replace("{key-version}", System.Uri.EscapeDataString(keyVersion));
             List<string> _queryParameters = new List<string>();
-            if (this.ApiVersion != null)
+            if (ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", Uri.EscapeDataString(this.ApiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
-                _url += "?" + string.Join("&", _queryParameters);
+                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
             }
             // Create HTTP transport objects
-            HttpRequestMessage _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
-            _httpRequest.RequestUri = new Uri(_url);
+            var _httpRequest = new System.Net.Http.HttpRequestMessage();
+            System.Net.Http.HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new System.Net.Http.HttpMethod("GET");
+            _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
-            if (this.GenerateClientRequestId != null && this.GenerateClientRequestId.Value)
+            if (GenerateClientRequestId != null && GenerateClientRequestId.Value)
             {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", Guid.NewGuid().ToString());
+                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
             }
-            if (this.AcceptLanguage != null)
+            if (AcceptLanguage != null)
             {
                 if (_httpRequest.Headers.Contains("accept-language"))
                 {
                     _httpRequest.Headers.Remove("accept-language");
                 }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", this.AcceptLanguage);
+                _httpRequest.Headers.TryAddWithoutValidation("accept-language", AcceptLanguage);
             }
+
+
             if (customHeaders != null)
             {
                 foreach(var _header in customHeaders)
@@ -1146,10 +1187,10 @@ private void Initialize()
             // Serialize Request
             string _requestContent = null;
             // Set Credentials
-            if (this.Credentials != null)
+            if (Credentials != null)
             {
                 cancellationToken.ThrowIfCancellationRequested();
-                await this.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+                await Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             }
             // Send Request
             if (_shouldTrace)
@@ -1157,7 +1198,7 @@ private void Initialize()
                 ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
             }
             cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await this.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            _httpResponse = await HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             if (_shouldTrace)
             {
                 ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
@@ -1171,7 +1212,7 @@ private void Initialize()
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    KeyVaultError _errorBody = SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, this.DeserializationSettings);
+                    KeyVaultError _errorBody =  SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, DeserializationSettings);
                     if (_errorBody != null)
                     {
                         ex.Body = _errorBody;
@@ -1208,7 +1249,7 @@ private void Initialize()
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = SafeJsonConvert.DeserializeObject<KeyBundle>(_responseContent, this.DeserializationSettings);
+                    _result.Body = SafeJsonConvert.DeserializeObject<KeyBundle>(_responseContent, DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -1228,17 +1269,19 @@ private void Initialize()
         }
 
         /// <summary>
-        /// List the versions of the specified key
+        /// Retrieves a list of individual key versions with the same key name. The
+        /// full key identifier, attributes, and tags are provided in the response.
+        /// Authorization: Requires the keys/list permission.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='keyName'>
-        /// The name of the key
+        /// The name of the key.
         /// </param>
         /// <param name='maxresults'>
-        /// Maximum number of results to return in a page. If not specified the
-        /// service will return up to 25 results.
+        /// Maximum number of results to return in a page. If not specified the service
+        /// will return up to 25 results.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -1255,6 +1298,9 @@ private void Initialize()
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
@@ -1276,7 +1322,7 @@ private void Initialize()
             {
                 throw new ValidationException(ValidationRules.InclusiveMinimum, "maxresults", 1);
             }
-            if (this.ApiVersion == null)
+            if (ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.ApiVersion");
             }
@@ -1294,41 +1340,43 @@ private void Initialize()
                 ServiceClientTracing.Enter(_invocationId, this, "GetKeyVersions", tracingParameters);
             }
             // Construct URL
-            var _baseUrl = this.BaseUri;
+            var _baseUrl = BaseUri;
             var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "keys/{key-name}/versions";
             _url = _url.Replace("{vaultBaseUrl}", vaultBaseUrl);
-            _url = _url.Replace("{key-name}", Uri.EscapeDataString(keyName));
+            _url = _url.Replace("{key-name}", System.Uri.EscapeDataString(keyName));
             List<string> _queryParameters = new List<string>();
             if (maxresults != null)
             {
-                _queryParameters.Add(string.Format("maxresults={0}", Uri.EscapeDataString(SafeJsonConvert.SerializeObject(maxresults, this.SerializationSettings).Trim('"'))));
+                _queryParameters.Add(string.Format("maxresults={0}", System.Uri.EscapeDataString(SafeJsonConvert.SerializeObject(maxresults, SerializationSettings).Trim('"'))));
             }
-            if (this.ApiVersion != null)
+            if (ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", Uri.EscapeDataString(this.ApiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
-                _url += "?" + string.Join("&", _queryParameters);
+                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
             }
             // Create HTTP transport objects
-            HttpRequestMessage _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
-            _httpRequest.RequestUri = new Uri(_url);
+            var _httpRequest = new System.Net.Http.HttpRequestMessage();
+            System.Net.Http.HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new System.Net.Http.HttpMethod("GET");
+            _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
-            if (this.GenerateClientRequestId != null && this.GenerateClientRequestId.Value)
+            if (GenerateClientRequestId != null && GenerateClientRequestId.Value)
             {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", Guid.NewGuid().ToString());
+                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
             }
-            if (this.AcceptLanguage != null)
+            if (AcceptLanguage != null)
             {
                 if (_httpRequest.Headers.Contains("accept-language"))
                 {
                     _httpRequest.Headers.Remove("accept-language");
                 }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", this.AcceptLanguage);
+                _httpRequest.Headers.TryAddWithoutValidation("accept-language", AcceptLanguage);
             }
+
+
             if (customHeaders != null)
             {
                 foreach(var _header in customHeaders)
@@ -1344,10 +1392,10 @@ private void Initialize()
             // Serialize Request
             string _requestContent = null;
             // Set Credentials
-            if (this.Credentials != null)
+            if (Credentials != null)
             {
                 cancellationToken.ThrowIfCancellationRequested();
-                await this.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+                await Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             }
             // Send Request
             if (_shouldTrace)
@@ -1355,7 +1403,7 @@ private void Initialize()
                 ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
             }
             cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await this.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            _httpResponse = await HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             if (_shouldTrace)
             {
                 ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
@@ -1369,7 +1417,7 @@ private void Initialize()
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    KeyVaultError _errorBody = SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, this.DeserializationSettings);
+                    KeyVaultError _errorBody =  SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, DeserializationSettings);
                     if (_errorBody != null)
                     {
                         ex.Body = _errorBody;
@@ -1406,7 +1454,7 @@ private void Initialize()
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = SafeJsonConvert.DeserializeObject<Page<KeyItem>>(_responseContent, this.DeserializationSettings);
+                    _result.Body = SafeJsonConvert.DeserializeObject<Page<KeyItem>>(_responseContent, DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -1426,14 +1474,14 @@ private void Initialize()
         }
 
         /// <summary>
-        /// List keys in the specified vault
+        /// List keys in the specified vault.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='maxresults'>
-        /// Maximum number of results to return in a page. If not specified the
-        /// service will return up to 25 results.
+        /// Maximum number of results to return in a page. If not specified the service
+        /// will return up to 25 results.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -1450,6 +1498,9 @@ private void Initialize()
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
@@ -1467,7 +1518,7 @@ private void Initialize()
             {
                 throw new ValidationException(ValidationRules.InclusiveMinimum, "maxresults", 1);
             }
-            if (this.ApiVersion == null)
+            if (ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.ApiVersion");
             }
@@ -1484,40 +1535,42 @@ private void Initialize()
                 ServiceClientTracing.Enter(_invocationId, this, "GetKeys", tracingParameters);
             }
             // Construct URL
-            var _baseUrl = this.BaseUri;
+            var _baseUrl = BaseUri;
             var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "keys";
             _url = _url.Replace("{vaultBaseUrl}", vaultBaseUrl);
             List<string> _queryParameters = new List<string>();
             if (maxresults != null)
             {
-                _queryParameters.Add(string.Format("maxresults={0}", Uri.EscapeDataString(SafeJsonConvert.SerializeObject(maxresults, this.SerializationSettings).Trim('"'))));
+                _queryParameters.Add(string.Format("maxresults={0}", System.Uri.EscapeDataString(SafeJsonConvert.SerializeObject(maxresults, SerializationSettings).Trim('"'))));
             }
-            if (this.ApiVersion != null)
+            if (ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", Uri.EscapeDataString(this.ApiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
-                _url += "?" + string.Join("&", _queryParameters);
+                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
             }
             // Create HTTP transport objects
-            HttpRequestMessage _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
-            _httpRequest.RequestUri = new Uri(_url);
+            var _httpRequest = new System.Net.Http.HttpRequestMessage();
+            System.Net.Http.HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new System.Net.Http.HttpMethod("GET");
+            _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
-            if (this.GenerateClientRequestId != null && this.GenerateClientRequestId.Value)
+            if (GenerateClientRequestId != null && GenerateClientRequestId.Value)
             {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", Guid.NewGuid().ToString());
+                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
             }
-            if (this.AcceptLanguage != null)
+            if (AcceptLanguage != null)
             {
                 if (_httpRequest.Headers.Contains("accept-language"))
                 {
                     _httpRequest.Headers.Remove("accept-language");
                 }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", this.AcceptLanguage);
+                _httpRequest.Headers.TryAddWithoutValidation("accept-language", AcceptLanguage);
             }
+
+
             if (customHeaders != null)
             {
                 foreach(var _header in customHeaders)
@@ -1533,10 +1586,10 @@ private void Initialize()
             // Serialize Request
             string _requestContent = null;
             // Set Credentials
-            if (this.Credentials != null)
+            if (Credentials != null)
             {
                 cancellationToken.ThrowIfCancellationRequested();
-                await this.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+                await Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             }
             // Send Request
             if (_shouldTrace)
@@ -1544,7 +1597,7 @@ private void Initialize()
                 ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
             }
             cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await this.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            _httpResponse = await HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             if (_shouldTrace)
             {
                 ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
@@ -1558,7 +1611,7 @@ private void Initialize()
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    KeyVaultError _errorBody = SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, this.DeserializationSettings);
+                    KeyVaultError _errorBody =  SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, DeserializationSettings);
                     if (_errorBody != null)
                     {
                         ex.Body = _errorBody;
@@ -1595,7 +1648,7 @@ private void Initialize()
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = SafeJsonConvert.DeserializeObject<Page<KeyItem>>(_responseContent, this.DeserializationSettings);
+                    _result.Body = SafeJsonConvert.DeserializeObject<Page<KeyItem>>(_responseContent, DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -1618,10 +1671,10 @@ private void Initialize()
         /// Requests that a backup of the specified key be downloaded to the client.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='keyName'>
-        /// The name of the key
+        /// The name of the key.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -1638,6 +1691,9 @@ private void Initialize()
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
@@ -1651,7 +1707,7 @@ private void Initialize()
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "keyName");
             }
-            if (this.ApiVersion == null)
+            if (ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.ApiVersion");
             }
@@ -1668,37 +1724,39 @@ private void Initialize()
                 ServiceClientTracing.Enter(_invocationId, this, "BackupKey", tracingParameters);
             }
             // Construct URL
-            var _baseUrl = this.BaseUri;
+            var _baseUrl = BaseUri;
             var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "keys/{key-name}/backup";
             _url = _url.Replace("{vaultBaseUrl}", vaultBaseUrl);
-            _url = _url.Replace("{key-name}", Uri.EscapeDataString(keyName));
+            _url = _url.Replace("{key-name}", System.Uri.EscapeDataString(keyName));
             List<string> _queryParameters = new List<string>();
-            if (this.ApiVersion != null)
+            if (ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", Uri.EscapeDataString(this.ApiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
-                _url += "?" + string.Join("&", _queryParameters);
+                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
             }
             // Create HTTP transport objects
-            HttpRequestMessage _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("POST");
-            _httpRequest.RequestUri = new Uri(_url);
+            var _httpRequest = new System.Net.Http.HttpRequestMessage();
+            System.Net.Http.HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new System.Net.Http.HttpMethod("POST");
+            _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
-            if (this.GenerateClientRequestId != null && this.GenerateClientRequestId.Value)
+            if (GenerateClientRequestId != null && GenerateClientRequestId.Value)
             {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", Guid.NewGuid().ToString());
+                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
             }
-            if (this.AcceptLanguage != null)
+            if (AcceptLanguage != null)
             {
                 if (_httpRequest.Headers.Contains("accept-language"))
                 {
                     _httpRequest.Headers.Remove("accept-language");
                 }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", this.AcceptLanguage);
+                _httpRequest.Headers.TryAddWithoutValidation("accept-language", AcceptLanguage);
             }
+
+
             if (customHeaders != null)
             {
                 foreach(var _header in customHeaders)
@@ -1714,10 +1772,10 @@ private void Initialize()
             // Serialize Request
             string _requestContent = null;
             // Set Credentials
-            if (this.Credentials != null)
+            if (Credentials != null)
             {
                 cancellationToken.ThrowIfCancellationRequested();
-                await this.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+                await Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             }
             // Send Request
             if (_shouldTrace)
@@ -1725,7 +1783,7 @@ private void Initialize()
                 ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
             }
             cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await this.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            _httpResponse = await HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             if (_shouldTrace)
             {
                 ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
@@ -1739,7 +1797,7 @@ private void Initialize()
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    KeyVaultError _errorBody = SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, this.DeserializationSettings);
+                    KeyVaultError _errorBody =  SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, DeserializationSettings);
                     if (_errorBody != null)
                     {
                         ex.Body = _errorBody;
@@ -1776,7 +1834,7 @@ private void Initialize()
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = SafeJsonConvert.DeserializeObject<BackupKeyResult>(_responseContent, this.DeserializationSettings);
+                    _result.Body = SafeJsonConvert.DeserializeObject<BackupKeyResult>(_responseContent, DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -1796,13 +1854,13 @@ private void Initialize()
         }
 
         /// <summary>
-        /// Restores the backup key in to a vault
+        /// Restores a backed up key to a vault.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='keyBundleBackup'>
-        /// the backup blob associated with a key bundle
+        /// The backup blob associated with a key bundle.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -1819,6 +1877,9 @@ private void Initialize()
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
@@ -1828,7 +1889,7 @@ private void Initialize()
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "vaultBaseUrl");
             }
-            if (this.ApiVersion == null)
+            if (ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.ApiVersion");
             }
@@ -1854,36 +1915,38 @@ private void Initialize()
                 ServiceClientTracing.Enter(_invocationId, this, "RestoreKey", tracingParameters);
             }
             // Construct URL
-            var _baseUrl = this.BaseUri;
+            var _baseUrl = BaseUri;
             var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "keys/restore";
             _url = _url.Replace("{vaultBaseUrl}", vaultBaseUrl);
             List<string> _queryParameters = new List<string>();
-            if (this.ApiVersion != null)
+            if (ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", Uri.EscapeDataString(this.ApiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
-                _url += "?" + string.Join("&", _queryParameters);
+                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
             }
             // Create HTTP transport objects
-            HttpRequestMessage _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("POST");
-            _httpRequest.RequestUri = new Uri(_url);
+            var _httpRequest = new System.Net.Http.HttpRequestMessage();
+            System.Net.Http.HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new System.Net.Http.HttpMethod("POST");
+            _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
-            if (this.GenerateClientRequestId != null && this.GenerateClientRequestId.Value)
+            if (GenerateClientRequestId != null && GenerateClientRequestId.Value)
             {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", Guid.NewGuid().ToString());
+                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
             }
-            if (this.AcceptLanguage != null)
+            if (AcceptLanguage != null)
             {
                 if (_httpRequest.Headers.Contains("accept-language"))
                 {
                     _httpRequest.Headers.Remove("accept-language");
                 }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", this.AcceptLanguage);
+                _httpRequest.Headers.TryAddWithoutValidation("accept-language", AcceptLanguage);
             }
+
+
             if (customHeaders != null)
             {
                 foreach(var _header in customHeaders)
@@ -1900,15 +1963,15 @@ private void Initialize()
             string _requestContent = null;
             if(parameters != null)
             {
-                _requestContent = SafeJsonConvert.SerializeObject(parameters, this.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
+                _requestContent = SafeJsonConvert.SerializeObject(parameters, SerializationSettings);
+                _httpRequest.Content = new System.Net.Http.StringContent(_requestContent, System.Text.Encoding.UTF8);
+                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             }
             // Set Credentials
-            if (this.Credentials != null)
+            if (Credentials != null)
             {
                 cancellationToken.ThrowIfCancellationRequested();
-                await this.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+                await Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             }
             // Send Request
             if (_shouldTrace)
@@ -1916,7 +1979,7 @@ private void Initialize()
                 ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
             }
             cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await this.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            _httpResponse = await HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             if (_shouldTrace)
             {
                 ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
@@ -1930,7 +1993,7 @@ private void Initialize()
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    KeyVaultError _errorBody = SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, this.DeserializationSettings);
+                    KeyVaultError _errorBody =  SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, DeserializationSettings);
                     if (_errorBody != null)
                     {
                         ex.Body = _errorBody;
@@ -1967,7 +2030,7 @@ private void Initialize()
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = SafeJsonConvert.DeserializeObject<KeyBundle>(_responseContent, this.DeserializationSettings);
+                    _result.Body = SafeJsonConvert.DeserializeObject<KeyBundle>(_responseContent, DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -1988,16 +2051,16 @@ private void Initialize()
 
         /// <summary>
         /// Encrypts an arbitrary sequence of bytes using an encryption key that is
-        /// stored in Azure Key Vault.
+        /// stored in a key vault.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='keyName'>
-        /// The name of the key
+        /// The name of the key.
         /// </param>
         /// <param name='keyVersion'>
-        /// The version of the key
+        /// The version of the key.
         /// </param>
         /// <param name='algorithm'>
         /// algorithm identifier. Possible values include: 'RSA-OAEP', 'RSA1_5'
@@ -2019,6 +2082,9 @@ private void Initialize()
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
@@ -2036,7 +2102,7 @@ private void Initialize()
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "keyVersion");
             }
-            if (this.ApiVersion == null)
+            if (ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.ApiVersion");
             }
@@ -2076,38 +2142,40 @@ private void Initialize()
                 ServiceClientTracing.Enter(_invocationId, this, "Encrypt", tracingParameters);
             }
             // Construct URL
-            var _baseUrl = this.BaseUri;
+            var _baseUrl = BaseUri;
             var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "keys/{key-name}/{key-version}/encrypt";
             _url = _url.Replace("{vaultBaseUrl}", vaultBaseUrl);
-            _url = _url.Replace("{key-name}", Uri.EscapeDataString(keyName));
-            _url = _url.Replace("{key-version}", Uri.EscapeDataString(keyVersion));
+            _url = _url.Replace("{key-name}", System.Uri.EscapeDataString(keyName));
+            _url = _url.Replace("{key-version}", System.Uri.EscapeDataString(keyVersion));
             List<string> _queryParameters = new List<string>();
-            if (this.ApiVersion != null)
+            if (ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", Uri.EscapeDataString(this.ApiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
-                _url += "?" + string.Join("&", _queryParameters);
+                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
             }
             // Create HTTP transport objects
-            HttpRequestMessage _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("POST");
-            _httpRequest.RequestUri = new Uri(_url);
+            var _httpRequest = new System.Net.Http.HttpRequestMessage();
+            System.Net.Http.HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new System.Net.Http.HttpMethod("POST");
+            _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
-            if (this.GenerateClientRequestId != null && this.GenerateClientRequestId.Value)
+            if (GenerateClientRequestId != null && GenerateClientRequestId.Value)
             {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", Guid.NewGuid().ToString());
+                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
             }
-            if (this.AcceptLanguage != null)
+            if (AcceptLanguage != null)
             {
                 if (_httpRequest.Headers.Contains("accept-language"))
                 {
                     _httpRequest.Headers.Remove("accept-language");
                 }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", this.AcceptLanguage);
+                _httpRequest.Headers.TryAddWithoutValidation("accept-language", AcceptLanguage);
             }
+
+
             if (customHeaders != null)
             {
                 foreach(var _header in customHeaders)
@@ -2124,15 +2192,15 @@ private void Initialize()
             string _requestContent = null;
             if(parameters != null)
             {
-                _requestContent = SafeJsonConvert.SerializeObject(parameters, this.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
+                _requestContent = SafeJsonConvert.SerializeObject(parameters, SerializationSettings);
+                _httpRequest.Content = new System.Net.Http.StringContent(_requestContent, System.Text.Encoding.UTF8);
+                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             }
             // Set Credentials
-            if (this.Credentials != null)
+            if (Credentials != null)
             {
                 cancellationToken.ThrowIfCancellationRequested();
-                await this.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+                await Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             }
             // Send Request
             if (_shouldTrace)
@@ -2140,7 +2208,7 @@ private void Initialize()
                 ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
             }
             cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await this.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            _httpResponse = await HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             if (_shouldTrace)
             {
                 ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
@@ -2154,7 +2222,7 @@ private void Initialize()
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    KeyVaultError _errorBody = SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, this.DeserializationSettings);
+                    KeyVaultError _errorBody =  SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, DeserializationSettings);
                     if (_errorBody != null)
                     {
                         ex.Body = _errorBody;
@@ -2191,7 +2259,7 @@ private void Initialize()
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = SafeJsonConvert.DeserializeObject<KeyOperationResult>(_responseContent, this.DeserializationSettings);
+                    _result.Body = SafeJsonConvert.DeserializeObject<KeyOperationResult>(_responseContent, DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -2211,16 +2279,16 @@ private void Initialize()
         }
 
         /// <summary>
-        /// Decrypts a single block of encrypted data
+        /// Decrypts a single block of encrypted data.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='keyName'>
-        /// The name of the key
+        /// The name of the key.
         /// </param>
         /// <param name='keyVersion'>
-        /// The version of the key
+        /// The version of the key.
         /// </param>
         /// <param name='algorithm'>
         /// algorithm identifier. Possible values include: 'RSA-OAEP', 'RSA1_5'
@@ -2242,6 +2310,9 @@ private void Initialize()
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
@@ -2259,7 +2330,7 @@ private void Initialize()
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "keyVersion");
             }
-            if (this.ApiVersion == null)
+            if (ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.ApiVersion");
             }
@@ -2299,38 +2370,40 @@ private void Initialize()
                 ServiceClientTracing.Enter(_invocationId, this, "Decrypt", tracingParameters);
             }
             // Construct URL
-            var _baseUrl = this.BaseUri;
+            var _baseUrl = BaseUri;
             var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "keys/{key-name}/{key-version}/decrypt";
             _url = _url.Replace("{vaultBaseUrl}", vaultBaseUrl);
-            _url = _url.Replace("{key-name}", Uri.EscapeDataString(keyName));
-            _url = _url.Replace("{key-version}", Uri.EscapeDataString(keyVersion));
+            _url = _url.Replace("{key-name}", System.Uri.EscapeDataString(keyName));
+            _url = _url.Replace("{key-version}", System.Uri.EscapeDataString(keyVersion));
             List<string> _queryParameters = new List<string>();
-            if (this.ApiVersion != null)
+            if (ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", Uri.EscapeDataString(this.ApiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
-                _url += "?" + string.Join("&", _queryParameters);
+                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
             }
             // Create HTTP transport objects
-            HttpRequestMessage _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("POST");
-            _httpRequest.RequestUri = new Uri(_url);
+            var _httpRequest = new System.Net.Http.HttpRequestMessage();
+            System.Net.Http.HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new System.Net.Http.HttpMethod("POST");
+            _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
-            if (this.GenerateClientRequestId != null && this.GenerateClientRequestId.Value)
+            if (GenerateClientRequestId != null && GenerateClientRequestId.Value)
             {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", Guid.NewGuid().ToString());
+                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
             }
-            if (this.AcceptLanguage != null)
+            if (AcceptLanguage != null)
             {
                 if (_httpRequest.Headers.Contains("accept-language"))
                 {
                     _httpRequest.Headers.Remove("accept-language");
                 }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", this.AcceptLanguage);
+                _httpRequest.Headers.TryAddWithoutValidation("accept-language", AcceptLanguage);
             }
+
+
             if (customHeaders != null)
             {
                 foreach(var _header in customHeaders)
@@ -2347,15 +2420,15 @@ private void Initialize()
             string _requestContent = null;
             if(parameters != null)
             {
-                _requestContent = SafeJsonConvert.SerializeObject(parameters, this.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
+                _requestContent = SafeJsonConvert.SerializeObject(parameters, SerializationSettings);
+                _httpRequest.Content = new System.Net.Http.StringContent(_requestContent, System.Text.Encoding.UTF8);
+                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             }
             // Set Credentials
-            if (this.Credentials != null)
+            if (Credentials != null)
             {
                 cancellationToken.ThrowIfCancellationRequested();
-                await this.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+                await Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             }
             // Send Request
             if (_shouldTrace)
@@ -2363,7 +2436,7 @@ private void Initialize()
                 ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
             }
             cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await this.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            _httpResponse = await HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             if (_shouldTrace)
             {
                 ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
@@ -2377,7 +2450,7 @@ private void Initialize()
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    KeyVaultError _errorBody = SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, this.DeserializationSettings);
+                    KeyVaultError _errorBody =  SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, DeserializationSettings);
                     if (_errorBody != null)
                     {
                         ex.Body = _errorBody;
@@ -2414,7 +2487,7 @@ private void Initialize()
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = SafeJsonConvert.DeserializeObject<KeyOperationResult>(_responseContent, this.DeserializationSettings);
+                    _result.Body = SafeJsonConvert.DeserializeObject<KeyOperationResult>(_responseContent, DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -2434,21 +2507,21 @@ private void Initialize()
         }
 
         /// <summary>
-        /// Creates a signature from a digest using the specified key in the vault
+        /// Creates a signature from a digest using the specified key.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='keyName'>
-        /// The name of the key
+        /// The name of the key.
         /// </param>
         /// <param name='keyVersion'>
-        /// The version of the key
+        /// The version of the key.
         /// </param>
         /// <param name='algorithm'>
         /// The signing/verification algorithm identifier. For more information on
-        /// possible algorithm types, see JsonWebKeySignatureAlgorithm. Possible
-        /// values include: 'RS256', 'RS384', 'RS512', 'RSNULL'
+        /// possible algorithm types, see JsonWebKeySignatureAlgorithm. Possible values
+        /// include: 'RS256', 'RS384', 'RS512', 'RSNULL'
         /// </param>
         /// <param name='value'>
         /// </param>
@@ -2467,6 +2540,9 @@ private void Initialize()
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
@@ -2484,7 +2560,7 @@ private void Initialize()
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "keyVersion");
             }
-            if (this.ApiVersion == null)
+            if (ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.ApiVersion");
             }
@@ -2524,38 +2600,40 @@ private void Initialize()
                 ServiceClientTracing.Enter(_invocationId, this, "Sign", tracingParameters);
             }
             // Construct URL
-            var _baseUrl = this.BaseUri;
+            var _baseUrl = BaseUri;
             var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "keys/{key-name}/{key-version}/sign";
             _url = _url.Replace("{vaultBaseUrl}", vaultBaseUrl);
-            _url = _url.Replace("{key-name}", Uri.EscapeDataString(keyName));
-            _url = _url.Replace("{key-version}", Uri.EscapeDataString(keyVersion));
+            _url = _url.Replace("{key-name}", System.Uri.EscapeDataString(keyName));
+            _url = _url.Replace("{key-version}", System.Uri.EscapeDataString(keyVersion));
             List<string> _queryParameters = new List<string>();
-            if (this.ApiVersion != null)
+            if (ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", Uri.EscapeDataString(this.ApiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
-                _url += "?" + string.Join("&", _queryParameters);
+                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
             }
             // Create HTTP transport objects
-            HttpRequestMessage _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("POST");
-            _httpRequest.RequestUri = new Uri(_url);
+            var _httpRequest = new System.Net.Http.HttpRequestMessage();
+            System.Net.Http.HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new System.Net.Http.HttpMethod("POST");
+            _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
-            if (this.GenerateClientRequestId != null && this.GenerateClientRequestId.Value)
+            if (GenerateClientRequestId != null && GenerateClientRequestId.Value)
             {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", Guid.NewGuid().ToString());
+                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
             }
-            if (this.AcceptLanguage != null)
+            if (AcceptLanguage != null)
             {
                 if (_httpRequest.Headers.Contains("accept-language"))
                 {
                     _httpRequest.Headers.Remove("accept-language");
                 }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", this.AcceptLanguage);
+                _httpRequest.Headers.TryAddWithoutValidation("accept-language", AcceptLanguage);
             }
+
+
             if (customHeaders != null)
             {
                 foreach(var _header in customHeaders)
@@ -2572,15 +2650,15 @@ private void Initialize()
             string _requestContent = null;
             if(parameters != null)
             {
-                _requestContent = SafeJsonConvert.SerializeObject(parameters, this.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
+                _requestContent = SafeJsonConvert.SerializeObject(parameters, SerializationSettings);
+                _httpRequest.Content = new System.Net.Http.StringContent(_requestContent, System.Text.Encoding.UTF8);
+                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             }
             // Set Credentials
-            if (this.Credentials != null)
+            if (Credentials != null)
             {
                 cancellationToken.ThrowIfCancellationRequested();
-                await this.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+                await Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             }
             // Send Request
             if (_shouldTrace)
@@ -2588,7 +2666,7 @@ private void Initialize()
                 ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
             }
             cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await this.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            _httpResponse = await HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             if (_shouldTrace)
             {
                 ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
@@ -2602,7 +2680,7 @@ private void Initialize()
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    KeyVaultError _errorBody = SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, this.DeserializationSettings);
+                    KeyVaultError _errorBody =  SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, DeserializationSettings);
                     if (_errorBody != null)
                     {
                         ex.Body = _errorBody;
@@ -2639,7 +2717,7 @@ private void Initialize()
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = SafeJsonConvert.DeserializeObject<KeyOperationResult>(_responseContent, this.DeserializationSettings);
+                    _result.Body = SafeJsonConvert.DeserializeObject<KeyOperationResult>(_responseContent, DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -2659,27 +2737,27 @@ private void Initialize()
         }
 
         /// <summary>
-        /// Verifies a signature using the specified key
+        /// Verifies a signature using a specified key.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='keyName'>
-        /// The name of the key
+        /// The name of the key.
         /// </param>
         /// <param name='keyVersion'>
-        /// The version of the key
+        /// The version of the key.
         /// </param>
         /// <param name='algorithm'>
         /// The signing/verification algorithm. For more information on possible
-        /// algorithm types, see JsonWebKeySignatureAlgorithm. Possible values
-        /// include: 'RS256', 'RS384', 'RS512', 'RSNULL'
+        /// algorithm types, see JsonWebKeySignatureAlgorithm. Possible values include:
+        /// 'RS256', 'RS384', 'RS512', 'RSNULL'
         /// </param>
         /// <param name='digest'>
-        /// The digest used for signing
+        /// The digest used for signing.
         /// </param>
         /// <param name='signature'>
-        /// The signature to be verified
+        /// The signature to be verified.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -2696,6 +2774,9 @@ private void Initialize()
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
@@ -2713,7 +2794,7 @@ private void Initialize()
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "keyVersion");
             }
-            if (this.ApiVersion == null)
+            if (ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.ApiVersion");
             }
@@ -2758,38 +2839,40 @@ private void Initialize()
                 ServiceClientTracing.Enter(_invocationId, this, "Verify", tracingParameters);
             }
             // Construct URL
-            var _baseUrl = this.BaseUri;
+            var _baseUrl = BaseUri;
             var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "keys/{key-name}/{key-version}/verify";
             _url = _url.Replace("{vaultBaseUrl}", vaultBaseUrl);
-            _url = _url.Replace("{key-name}", Uri.EscapeDataString(keyName));
-            _url = _url.Replace("{key-version}", Uri.EscapeDataString(keyVersion));
+            _url = _url.Replace("{key-name}", System.Uri.EscapeDataString(keyName));
+            _url = _url.Replace("{key-version}", System.Uri.EscapeDataString(keyVersion));
             List<string> _queryParameters = new List<string>();
-            if (this.ApiVersion != null)
+            if (ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", Uri.EscapeDataString(this.ApiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
-                _url += "?" + string.Join("&", _queryParameters);
+                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
             }
             // Create HTTP transport objects
-            HttpRequestMessage _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("POST");
-            _httpRequest.RequestUri = new Uri(_url);
+            var _httpRequest = new System.Net.Http.HttpRequestMessage();
+            System.Net.Http.HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new System.Net.Http.HttpMethod("POST");
+            _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
-            if (this.GenerateClientRequestId != null && this.GenerateClientRequestId.Value)
+            if (GenerateClientRequestId != null && GenerateClientRequestId.Value)
             {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", Guid.NewGuid().ToString());
+                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
             }
-            if (this.AcceptLanguage != null)
+            if (AcceptLanguage != null)
             {
                 if (_httpRequest.Headers.Contains("accept-language"))
                 {
                     _httpRequest.Headers.Remove("accept-language");
                 }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", this.AcceptLanguage);
+                _httpRequest.Headers.TryAddWithoutValidation("accept-language", AcceptLanguage);
             }
+
+
             if (customHeaders != null)
             {
                 foreach(var _header in customHeaders)
@@ -2806,15 +2889,15 @@ private void Initialize()
             string _requestContent = null;
             if(parameters != null)
             {
-                _requestContent = SafeJsonConvert.SerializeObject(parameters, this.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
+                _requestContent = SafeJsonConvert.SerializeObject(parameters, SerializationSettings);
+                _httpRequest.Content = new System.Net.Http.StringContent(_requestContent, System.Text.Encoding.UTF8);
+                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             }
             // Set Credentials
-            if (this.Credentials != null)
+            if (Credentials != null)
             {
                 cancellationToken.ThrowIfCancellationRequested();
-                await this.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+                await Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             }
             // Send Request
             if (_shouldTrace)
@@ -2822,7 +2905,7 @@ private void Initialize()
                 ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
             }
             cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await this.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            _httpResponse = await HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             if (_shouldTrace)
             {
                 ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
@@ -2836,7 +2919,7 @@ private void Initialize()
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    KeyVaultError _errorBody = SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, this.DeserializationSettings);
+                    KeyVaultError _errorBody =  SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, DeserializationSettings);
                     if (_errorBody != null)
                     {
                         ex.Body = _errorBody;
@@ -2873,7 +2956,7 @@ private void Initialize()
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = SafeJsonConvert.DeserializeObject<KeyVerifyResult>(_responseContent, this.DeserializationSettings);
+                    _result.Body = SafeJsonConvert.DeserializeObject<KeyVerifyResult>(_responseContent, DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -2893,16 +2976,16 @@ private void Initialize()
         }
 
         /// <summary>
-        /// Wraps a symmetric key using the specified key
+        /// Wraps a symmetric key using a specified key.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='keyName'>
-        /// The name of the key
+        /// The name of the key.
         /// </param>
         /// <param name='keyVersion'>
-        /// The version of the key
+        /// The version of the key.
         /// </param>
         /// <param name='algorithm'>
         /// algorithm identifier. Possible values include: 'RSA-OAEP', 'RSA1_5'
@@ -2924,6 +3007,9 @@ private void Initialize()
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
@@ -2941,7 +3027,7 @@ private void Initialize()
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "keyVersion");
             }
-            if (this.ApiVersion == null)
+            if (ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.ApiVersion");
             }
@@ -2981,38 +3067,40 @@ private void Initialize()
                 ServiceClientTracing.Enter(_invocationId, this, "WrapKey", tracingParameters);
             }
             // Construct URL
-            var _baseUrl = this.BaseUri;
+            var _baseUrl = BaseUri;
             var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "keys/{key-name}/{key-version}/wrapkey";
             _url = _url.Replace("{vaultBaseUrl}", vaultBaseUrl);
-            _url = _url.Replace("{key-name}", Uri.EscapeDataString(keyName));
-            _url = _url.Replace("{key-version}", Uri.EscapeDataString(keyVersion));
+            _url = _url.Replace("{key-name}", System.Uri.EscapeDataString(keyName));
+            _url = _url.Replace("{key-version}", System.Uri.EscapeDataString(keyVersion));
             List<string> _queryParameters = new List<string>();
-            if (this.ApiVersion != null)
+            if (ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", Uri.EscapeDataString(this.ApiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
-                _url += "?" + string.Join("&", _queryParameters);
+                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
             }
             // Create HTTP transport objects
-            HttpRequestMessage _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("POST");
-            _httpRequest.RequestUri = new Uri(_url);
+            var _httpRequest = new System.Net.Http.HttpRequestMessage();
+            System.Net.Http.HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new System.Net.Http.HttpMethod("POST");
+            _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
-            if (this.GenerateClientRequestId != null && this.GenerateClientRequestId.Value)
+            if (GenerateClientRequestId != null && GenerateClientRequestId.Value)
             {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", Guid.NewGuid().ToString());
+                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
             }
-            if (this.AcceptLanguage != null)
+            if (AcceptLanguage != null)
             {
                 if (_httpRequest.Headers.Contains("accept-language"))
                 {
                     _httpRequest.Headers.Remove("accept-language");
                 }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", this.AcceptLanguage);
+                _httpRequest.Headers.TryAddWithoutValidation("accept-language", AcceptLanguage);
             }
+
+
             if (customHeaders != null)
             {
                 foreach(var _header in customHeaders)
@@ -3029,15 +3117,15 @@ private void Initialize()
             string _requestContent = null;
             if(parameters != null)
             {
-                _requestContent = SafeJsonConvert.SerializeObject(parameters, this.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
+                _requestContent = SafeJsonConvert.SerializeObject(parameters, SerializationSettings);
+                _httpRequest.Content = new System.Net.Http.StringContent(_requestContent, System.Text.Encoding.UTF8);
+                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             }
             // Set Credentials
-            if (this.Credentials != null)
+            if (Credentials != null)
             {
                 cancellationToken.ThrowIfCancellationRequested();
-                await this.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+                await Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             }
             // Send Request
             if (_shouldTrace)
@@ -3045,7 +3133,7 @@ private void Initialize()
                 ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
             }
             cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await this.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            _httpResponse = await HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             if (_shouldTrace)
             {
                 ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
@@ -3059,7 +3147,7 @@ private void Initialize()
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    KeyVaultError _errorBody = SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, this.DeserializationSettings);
+                    KeyVaultError _errorBody =  SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, DeserializationSettings);
                     if (_errorBody != null)
                     {
                         ex.Body = _errorBody;
@@ -3096,7 +3184,7 @@ private void Initialize()
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = SafeJsonConvert.DeserializeObject<KeyOperationResult>(_responseContent, this.DeserializationSettings);
+                    _result.Body = SafeJsonConvert.DeserializeObject<KeyOperationResult>(_responseContent, DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -3116,17 +3204,17 @@ private void Initialize()
         }
 
         /// <summary>
-        /// Unwraps a symmetric key using the specified key in the vault that has
-        /// initially been used for wrapping the key.
+        /// Unwraps a symmetric key using the specified key that was initially used for
+        /// wrapping that key.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='keyName'>
-        /// The name of the key
+        /// The name of the key.
         /// </param>
         /// <param name='keyVersion'>
-        /// The version of the key
+        /// The version of the key.
         /// </param>
         /// <param name='algorithm'>
         /// algorithm identifier. Possible values include: 'RSA-OAEP', 'RSA1_5'
@@ -3148,6 +3236,9 @@ private void Initialize()
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
@@ -3165,7 +3256,7 @@ private void Initialize()
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "keyVersion");
             }
-            if (this.ApiVersion == null)
+            if (ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.ApiVersion");
             }
@@ -3205,38 +3296,40 @@ private void Initialize()
                 ServiceClientTracing.Enter(_invocationId, this, "UnwrapKey", tracingParameters);
             }
             // Construct URL
-            var _baseUrl = this.BaseUri;
+            var _baseUrl = BaseUri;
             var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "keys/{key-name}/{key-version}/unwrapkey";
             _url = _url.Replace("{vaultBaseUrl}", vaultBaseUrl);
-            _url = _url.Replace("{key-name}", Uri.EscapeDataString(keyName));
-            _url = _url.Replace("{key-version}", Uri.EscapeDataString(keyVersion));
+            _url = _url.Replace("{key-name}", System.Uri.EscapeDataString(keyName));
+            _url = _url.Replace("{key-version}", System.Uri.EscapeDataString(keyVersion));
             List<string> _queryParameters = new List<string>();
-            if (this.ApiVersion != null)
+            if (ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", Uri.EscapeDataString(this.ApiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
-                _url += "?" + string.Join("&", _queryParameters);
+                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
             }
             // Create HTTP transport objects
-            HttpRequestMessage _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("POST");
-            _httpRequest.RequestUri = new Uri(_url);
+            var _httpRequest = new System.Net.Http.HttpRequestMessage();
+            System.Net.Http.HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new System.Net.Http.HttpMethod("POST");
+            _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
-            if (this.GenerateClientRequestId != null && this.GenerateClientRequestId.Value)
+            if (GenerateClientRequestId != null && GenerateClientRequestId.Value)
             {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", Guid.NewGuid().ToString());
+                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
             }
-            if (this.AcceptLanguage != null)
+            if (AcceptLanguage != null)
             {
                 if (_httpRequest.Headers.Contains("accept-language"))
                 {
                     _httpRequest.Headers.Remove("accept-language");
                 }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", this.AcceptLanguage);
+                _httpRequest.Headers.TryAddWithoutValidation("accept-language", AcceptLanguage);
             }
+
+
             if (customHeaders != null)
             {
                 foreach(var _header in customHeaders)
@@ -3253,15 +3346,15 @@ private void Initialize()
             string _requestContent = null;
             if(parameters != null)
             {
-                _requestContent = SafeJsonConvert.SerializeObject(parameters, this.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
+                _requestContent = SafeJsonConvert.SerializeObject(parameters, SerializationSettings);
+                _httpRequest.Content = new System.Net.Http.StringContent(_requestContent, System.Text.Encoding.UTF8);
+                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             }
             // Set Credentials
-            if (this.Credentials != null)
+            if (Credentials != null)
             {
                 cancellationToken.ThrowIfCancellationRequested();
-                await this.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+                await Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             }
             // Send Request
             if (_shouldTrace)
@@ -3269,7 +3362,7 @@ private void Initialize()
                 ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
             }
             cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await this.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            _httpResponse = await HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             if (_shouldTrace)
             {
                 ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
@@ -3283,7 +3376,7 @@ private void Initialize()
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    KeyVaultError _errorBody = SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, this.DeserializationSettings);
+                    KeyVaultError _errorBody =  SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, DeserializationSettings);
                     if (_errorBody != null)
                     {
                         ex.Body = _errorBody;
@@ -3320,7 +3413,7 @@ private void Initialize()
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = SafeJsonConvert.DeserializeObject<KeyOperationResult>(_responseContent, this.DeserializationSettings);
+                    _result.Body = SafeJsonConvert.DeserializeObject<KeyOperationResult>(_responseContent, DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -3340,25 +3433,25 @@ private void Initialize()
         }
 
         /// <summary>
-        /// Sets a secret in the specified vault.
+        /// Sets a secret in a specified key vault.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='secretName'>
-        /// The name of the secret in the given vault
+        /// The name of the secret.
         /// </param>
         /// <param name='value'>
-        /// The value of the secret
+        /// The value of the secret.
         /// </param>
         /// <param name='tags'>
-        /// Application-specific metadata in the form of key-value pairs
+        /// Application specific metadata in the form of key-value pairs.
         /// </param>
         /// <param name='contentType'>
-        /// Type of the secret value such as a password
+        /// Type of the secret value such as a password.
         /// </param>
         /// <param name='secretAttributes'>
-        /// The secret management attributes
+        /// The secret management attributes.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -3375,6 +3468,9 @@ private void Initialize()
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
@@ -3395,7 +3491,7 @@ private void Initialize()
                     throw new ValidationException(ValidationRules.Pattern, "secretName", "^[0-9a-zA-Z-]+$");
                 }
             }
-            if (this.ApiVersion == null)
+            if (ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.ApiVersion");
             }
@@ -3425,37 +3521,39 @@ private void Initialize()
                 ServiceClientTracing.Enter(_invocationId, this, "SetSecret", tracingParameters);
             }
             // Construct URL
-            var _baseUrl = this.BaseUri;
+            var _baseUrl = BaseUri;
             var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "secrets/{secret-name}";
             _url = _url.Replace("{vaultBaseUrl}", vaultBaseUrl);
-            _url = _url.Replace("{secret-name}", Uri.EscapeDataString(secretName));
+            _url = _url.Replace("{secret-name}", System.Uri.EscapeDataString(secretName));
             List<string> _queryParameters = new List<string>();
-            if (this.ApiVersion != null)
+            if (ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", Uri.EscapeDataString(this.ApiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
-                _url += "?" + string.Join("&", _queryParameters);
+                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
             }
             // Create HTTP transport objects
-            HttpRequestMessage _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("PUT");
-            _httpRequest.RequestUri = new Uri(_url);
+            var _httpRequest = new System.Net.Http.HttpRequestMessage();
+            System.Net.Http.HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new System.Net.Http.HttpMethod("PUT");
+            _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
-            if (this.GenerateClientRequestId != null && this.GenerateClientRequestId.Value)
+            if (GenerateClientRequestId != null && GenerateClientRequestId.Value)
             {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", Guid.NewGuid().ToString());
+                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
             }
-            if (this.AcceptLanguage != null)
+            if (AcceptLanguage != null)
             {
                 if (_httpRequest.Headers.Contains("accept-language"))
                 {
                     _httpRequest.Headers.Remove("accept-language");
                 }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", this.AcceptLanguage);
+                _httpRequest.Headers.TryAddWithoutValidation("accept-language", AcceptLanguage);
             }
+
+
             if (customHeaders != null)
             {
                 foreach(var _header in customHeaders)
@@ -3472,15 +3570,15 @@ private void Initialize()
             string _requestContent = null;
             if(parameters != null)
             {
-                _requestContent = SafeJsonConvert.SerializeObject(parameters, this.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
+                _requestContent = SafeJsonConvert.SerializeObject(parameters, SerializationSettings);
+                _httpRequest.Content = new System.Net.Http.StringContent(_requestContent, System.Text.Encoding.UTF8);
+                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             }
             // Set Credentials
-            if (this.Credentials != null)
+            if (Credentials != null)
             {
                 cancellationToken.ThrowIfCancellationRequested();
-                await this.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+                await Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             }
             // Send Request
             if (_shouldTrace)
@@ -3488,7 +3586,7 @@ private void Initialize()
                 ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
             }
             cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await this.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            _httpResponse = await HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             if (_shouldTrace)
             {
                 ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
@@ -3502,7 +3600,7 @@ private void Initialize()
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    KeyVaultError _errorBody = SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, this.DeserializationSettings);
+                    KeyVaultError _errorBody =  SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, DeserializationSettings);
                     if (_errorBody != null)
                     {
                         ex.Body = _errorBody;
@@ -3539,7 +3637,7 @@ private void Initialize()
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = SafeJsonConvert.DeserializeObject<SecretBundle>(_responseContent, this.DeserializationSettings);
+                    _result.Body = SafeJsonConvert.DeserializeObject<SecretBundle>(_responseContent, DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -3559,13 +3657,13 @@ private void Initialize()
         }
 
         /// <summary>
-        /// Deletes a secret from the specified vault.
+        /// Deletes a secret from a specified key vault.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='secretName'>
-        /// The name of the secret in the given vault
+        /// The name of the secret.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -3582,6 +3680,9 @@ private void Initialize()
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
@@ -3595,7 +3696,7 @@ private void Initialize()
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "secretName");
             }
-            if (this.ApiVersion == null)
+            if (ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.ApiVersion");
             }
@@ -3612,37 +3713,39 @@ private void Initialize()
                 ServiceClientTracing.Enter(_invocationId, this, "DeleteSecret", tracingParameters);
             }
             // Construct URL
-            var _baseUrl = this.BaseUri;
+            var _baseUrl = BaseUri;
             var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "secrets/{secret-name}";
             _url = _url.Replace("{vaultBaseUrl}", vaultBaseUrl);
-            _url = _url.Replace("{secret-name}", Uri.EscapeDataString(secretName));
+            _url = _url.Replace("{secret-name}", System.Uri.EscapeDataString(secretName));
             List<string> _queryParameters = new List<string>();
-            if (this.ApiVersion != null)
+            if (ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", Uri.EscapeDataString(this.ApiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
-                _url += "?" + string.Join("&", _queryParameters);
+                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
             }
             // Create HTTP transport objects
-            HttpRequestMessage _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("DELETE");
-            _httpRequest.RequestUri = new Uri(_url);
+            var _httpRequest = new System.Net.Http.HttpRequestMessage();
+            System.Net.Http.HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new System.Net.Http.HttpMethod("DELETE");
+            _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
-            if (this.GenerateClientRequestId != null && this.GenerateClientRequestId.Value)
+            if (GenerateClientRequestId != null && GenerateClientRequestId.Value)
             {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", Guid.NewGuid().ToString());
+                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
             }
-            if (this.AcceptLanguage != null)
+            if (AcceptLanguage != null)
             {
                 if (_httpRequest.Headers.Contains("accept-language"))
                 {
                     _httpRequest.Headers.Remove("accept-language");
                 }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", this.AcceptLanguage);
+                _httpRequest.Headers.TryAddWithoutValidation("accept-language", AcceptLanguage);
             }
+
+
             if (customHeaders != null)
             {
                 foreach(var _header in customHeaders)
@@ -3658,10 +3761,10 @@ private void Initialize()
             // Serialize Request
             string _requestContent = null;
             // Set Credentials
-            if (this.Credentials != null)
+            if (Credentials != null)
             {
                 cancellationToken.ThrowIfCancellationRequested();
-                await this.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+                await Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             }
             // Send Request
             if (_shouldTrace)
@@ -3669,7 +3772,7 @@ private void Initialize()
                 ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
             }
             cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await this.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            _httpResponse = await HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             if (_shouldTrace)
             {
                 ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
@@ -3683,7 +3786,7 @@ private void Initialize()
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    KeyVaultError _errorBody = SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, this.DeserializationSettings);
+                    KeyVaultError _errorBody =  SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, DeserializationSettings);
                     if (_errorBody != null)
                     {
                         ex.Body = _errorBody;
@@ -3720,7 +3823,7 @@ private void Initialize()
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = SafeJsonConvert.DeserializeObject<SecretBundle>(_responseContent, this.DeserializationSettings);
+                    _result.Body = SafeJsonConvert.DeserializeObject<SecretBundle>(_responseContent, DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -3740,25 +3843,26 @@ private void Initialize()
         }
 
         /// <summary>
-        /// Updates the attributes associated with the specified secret
+        /// Updates the attributes associated with a specified secret in a given key
+        /// vault.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='secretName'>
-        /// The name of the secret in the given vault
+        /// The name of the secret.
         /// </param>
         /// <param name='secretVersion'>
-        /// The version of the secret
+        /// The version of the secret.
         /// </param>
         /// <param name='contentType'>
-        /// Type of the secret value such as a password
+        /// Type of the secret value such as a password.
         /// </param>
         /// <param name='secretAttributes'>
-        /// The secret management attributes
+        /// The secret management attributes.
         /// </param>
         /// <param name='tags'>
-        /// Application-specific metadata in the form of key-value pairs
+        /// Application specific metadata in the form of key-value pairs.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -3775,6 +3879,9 @@ private void Initialize()
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
@@ -3792,7 +3899,7 @@ private void Initialize()
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "secretVersion");
             }
-            if (this.ApiVersion == null)
+            if (ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.ApiVersion");
             }
@@ -3818,38 +3925,40 @@ private void Initialize()
                 ServiceClientTracing.Enter(_invocationId, this, "UpdateSecret", tracingParameters);
             }
             // Construct URL
-            var _baseUrl = this.BaseUri;
+            var _baseUrl = BaseUri;
             var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "secrets/{secret-name}/{secret-version}";
             _url = _url.Replace("{vaultBaseUrl}", vaultBaseUrl);
-            _url = _url.Replace("{secret-name}", Uri.EscapeDataString(secretName));
-            _url = _url.Replace("{secret-version}", Uri.EscapeDataString(secretVersion));
+            _url = _url.Replace("{secret-name}", System.Uri.EscapeDataString(secretName));
+            _url = _url.Replace("{secret-version}", System.Uri.EscapeDataString(secretVersion));
             List<string> _queryParameters = new List<string>();
-            if (this.ApiVersion != null)
+            if (ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", Uri.EscapeDataString(this.ApiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
-                _url += "?" + string.Join("&", _queryParameters);
+                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
             }
             // Create HTTP transport objects
-            HttpRequestMessage _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("PATCH");
-            _httpRequest.RequestUri = new Uri(_url);
+            var _httpRequest = new System.Net.Http.HttpRequestMessage();
+            System.Net.Http.HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new System.Net.Http.HttpMethod("PATCH");
+            _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
-            if (this.GenerateClientRequestId != null && this.GenerateClientRequestId.Value)
+            if (GenerateClientRequestId != null && GenerateClientRequestId.Value)
             {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", Guid.NewGuid().ToString());
+                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
             }
-            if (this.AcceptLanguage != null)
+            if (AcceptLanguage != null)
             {
                 if (_httpRequest.Headers.Contains("accept-language"))
                 {
                     _httpRequest.Headers.Remove("accept-language");
                 }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", this.AcceptLanguage);
+                _httpRequest.Headers.TryAddWithoutValidation("accept-language", AcceptLanguage);
             }
+
+
             if (customHeaders != null)
             {
                 foreach(var _header in customHeaders)
@@ -3866,15 +3975,15 @@ private void Initialize()
             string _requestContent = null;
             if(parameters != null)
             {
-                _requestContent = SafeJsonConvert.SerializeObject(parameters, this.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
+                _requestContent = SafeJsonConvert.SerializeObject(parameters, SerializationSettings);
+                _httpRequest.Content = new System.Net.Http.StringContent(_requestContent, System.Text.Encoding.UTF8);
+                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             }
             // Set Credentials
-            if (this.Credentials != null)
+            if (Credentials != null)
             {
                 cancellationToken.ThrowIfCancellationRequested();
-                await this.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+                await Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             }
             // Send Request
             if (_shouldTrace)
@@ -3882,7 +3991,7 @@ private void Initialize()
                 ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
             }
             cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await this.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            _httpResponse = await HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             if (_shouldTrace)
             {
                 ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
@@ -3896,7 +4005,7 @@ private void Initialize()
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    KeyVaultError _errorBody = SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, this.DeserializationSettings);
+                    KeyVaultError _errorBody =  SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, DeserializationSettings);
                     if (_errorBody != null)
                     {
                         ex.Body = _errorBody;
@@ -3933,7 +4042,7 @@ private void Initialize()
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = SafeJsonConvert.DeserializeObject<SecretBundle>(_responseContent, this.DeserializationSettings);
+                    _result.Body = SafeJsonConvert.DeserializeObject<SecretBundle>(_responseContent, DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -3953,16 +4062,16 @@ private void Initialize()
         }
 
         /// <summary>
-        /// Gets a secret.
+        /// Get a specified secret from a given key vault.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='secretName'>
-        /// The name of the secret in the given vault
+        /// The name of the secret.
         /// </param>
         /// <param name='secretVersion'>
-        /// The version of the secret
+        /// The version of the secret.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -3979,6 +4088,9 @@ private void Initialize()
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
@@ -3996,7 +4108,7 @@ private void Initialize()
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "secretVersion");
             }
-            if (this.ApiVersion == null)
+            if (ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.ApiVersion");
             }
@@ -4014,38 +4126,40 @@ private void Initialize()
                 ServiceClientTracing.Enter(_invocationId, this, "GetSecret", tracingParameters);
             }
             // Construct URL
-            var _baseUrl = this.BaseUri;
+            var _baseUrl = BaseUri;
             var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "secrets/{secret-name}/{secret-version}";
             _url = _url.Replace("{vaultBaseUrl}", vaultBaseUrl);
-            _url = _url.Replace("{secret-name}", Uri.EscapeDataString(secretName));
-            _url = _url.Replace("{secret-version}", Uri.EscapeDataString(secretVersion));
+            _url = _url.Replace("{secret-name}", System.Uri.EscapeDataString(secretName));
+            _url = _url.Replace("{secret-version}", System.Uri.EscapeDataString(secretVersion));
             List<string> _queryParameters = new List<string>();
-            if (this.ApiVersion != null)
+            if (ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", Uri.EscapeDataString(this.ApiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
-                _url += "?" + string.Join("&", _queryParameters);
+                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
             }
             // Create HTTP transport objects
-            HttpRequestMessage _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
-            _httpRequest.RequestUri = new Uri(_url);
+            var _httpRequest = new System.Net.Http.HttpRequestMessage();
+            System.Net.Http.HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new System.Net.Http.HttpMethod("GET");
+            _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
-            if (this.GenerateClientRequestId != null && this.GenerateClientRequestId.Value)
+            if (GenerateClientRequestId != null && GenerateClientRequestId.Value)
             {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", Guid.NewGuid().ToString());
+                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
             }
-            if (this.AcceptLanguage != null)
+            if (AcceptLanguage != null)
             {
                 if (_httpRequest.Headers.Contains("accept-language"))
                 {
                     _httpRequest.Headers.Remove("accept-language");
                 }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", this.AcceptLanguage);
+                _httpRequest.Headers.TryAddWithoutValidation("accept-language", AcceptLanguage);
             }
+
+
             if (customHeaders != null)
             {
                 foreach(var _header in customHeaders)
@@ -4061,10 +4175,10 @@ private void Initialize()
             // Serialize Request
             string _requestContent = null;
             // Set Credentials
-            if (this.Credentials != null)
+            if (Credentials != null)
             {
                 cancellationToken.ThrowIfCancellationRequested();
-                await this.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+                await Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             }
             // Send Request
             if (_shouldTrace)
@@ -4072,7 +4186,7 @@ private void Initialize()
                 ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
             }
             cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await this.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            _httpResponse = await HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             if (_shouldTrace)
             {
                 ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
@@ -4086,7 +4200,7 @@ private void Initialize()
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    KeyVaultError _errorBody = SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, this.DeserializationSettings);
+                    KeyVaultError _errorBody =  SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, DeserializationSettings);
                     if (_errorBody != null)
                     {
                         ex.Body = _errorBody;
@@ -4123,7 +4237,7 @@ private void Initialize()
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = SafeJsonConvert.DeserializeObject<SecretBundle>(_responseContent, this.DeserializationSettings);
+                    _result.Body = SafeJsonConvert.DeserializeObject<SecretBundle>(_responseContent, DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -4143,14 +4257,14 @@ private void Initialize()
         }
 
         /// <summary>
-        /// List secrets in the specified vault
+        /// List secrets in a specified key vault
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='maxresults'>
-        /// Maximum number of results to return in a page. If not specified the
-        /// service will return up to 25 results.
+        /// Maximum number of results to return in a page. If not specified the service
+        /// will return up to 25 results.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -4167,6 +4281,9 @@ private void Initialize()
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
@@ -4184,7 +4301,7 @@ private void Initialize()
             {
                 throw new ValidationException(ValidationRules.InclusiveMinimum, "maxresults", 1);
             }
-            if (this.ApiVersion == null)
+            if (ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.ApiVersion");
             }
@@ -4201,40 +4318,42 @@ private void Initialize()
                 ServiceClientTracing.Enter(_invocationId, this, "GetSecrets", tracingParameters);
             }
             // Construct URL
-            var _baseUrl = this.BaseUri;
+            var _baseUrl = BaseUri;
             var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "secrets";
             _url = _url.Replace("{vaultBaseUrl}", vaultBaseUrl);
             List<string> _queryParameters = new List<string>();
             if (maxresults != null)
             {
-                _queryParameters.Add(string.Format("maxresults={0}", Uri.EscapeDataString(SafeJsonConvert.SerializeObject(maxresults, this.SerializationSettings).Trim('"'))));
+                _queryParameters.Add(string.Format("maxresults={0}", System.Uri.EscapeDataString(SafeJsonConvert.SerializeObject(maxresults, SerializationSettings).Trim('"'))));
             }
-            if (this.ApiVersion != null)
+            if (ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", Uri.EscapeDataString(this.ApiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
-                _url += "?" + string.Join("&", _queryParameters);
+                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
             }
             // Create HTTP transport objects
-            HttpRequestMessage _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
-            _httpRequest.RequestUri = new Uri(_url);
+            var _httpRequest = new System.Net.Http.HttpRequestMessage();
+            System.Net.Http.HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new System.Net.Http.HttpMethod("GET");
+            _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
-            if (this.GenerateClientRequestId != null && this.GenerateClientRequestId.Value)
+            if (GenerateClientRequestId != null && GenerateClientRequestId.Value)
             {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", Guid.NewGuid().ToString());
+                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
             }
-            if (this.AcceptLanguage != null)
+            if (AcceptLanguage != null)
             {
                 if (_httpRequest.Headers.Contains("accept-language"))
                 {
                     _httpRequest.Headers.Remove("accept-language");
                 }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", this.AcceptLanguage);
+                _httpRequest.Headers.TryAddWithoutValidation("accept-language", AcceptLanguage);
             }
+
+
             if (customHeaders != null)
             {
                 foreach(var _header in customHeaders)
@@ -4250,10 +4369,10 @@ private void Initialize()
             // Serialize Request
             string _requestContent = null;
             // Set Credentials
-            if (this.Credentials != null)
+            if (Credentials != null)
             {
                 cancellationToken.ThrowIfCancellationRequested();
-                await this.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+                await Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             }
             // Send Request
             if (_shouldTrace)
@@ -4261,7 +4380,7 @@ private void Initialize()
                 ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
             }
             cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await this.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            _httpResponse = await HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             if (_shouldTrace)
             {
                 ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
@@ -4275,7 +4394,7 @@ private void Initialize()
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    KeyVaultError _errorBody = SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, this.DeserializationSettings);
+                    KeyVaultError _errorBody =  SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, DeserializationSettings);
                     if (_errorBody != null)
                     {
                         ex.Body = _errorBody;
@@ -4312,7 +4431,7 @@ private void Initialize()
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = SafeJsonConvert.DeserializeObject<Page<SecretItem>>(_responseContent, this.DeserializationSettings);
+                    _result.Body = SafeJsonConvert.DeserializeObject<Page<SecretItem>>(_responseContent, DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -4332,17 +4451,17 @@ private void Initialize()
         }
 
         /// <summary>
-        /// List the versions of the specified secret
+        /// List the versions of the specified secret.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='secretName'>
-        /// The name of the secret in the given vault
+        /// The name of the secret.
         /// </param>
         /// <param name='maxresults'>
-        /// Maximum number of results to return in a page. If not specified the
-        /// service will return up to 25 results.
+        /// Maximum number of results to return in a page. If not specified the service
+        /// will return up to 25 results.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -4359,6 +4478,9 @@ private void Initialize()
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
@@ -4380,7 +4502,7 @@ private void Initialize()
             {
                 throw new ValidationException(ValidationRules.InclusiveMinimum, "maxresults", 1);
             }
-            if (this.ApiVersion == null)
+            if (ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.ApiVersion");
             }
@@ -4398,41 +4520,43 @@ private void Initialize()
                 ServiceClientTracing.Enter(_invocationId, this, "GetSecretVersions", tracingParameters);
             }
             // Construct URL
-            var _baseUrl = this.BaseUri;
+            var _baseUrl = BaseUri;
             var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "secrets/{secret-name}/versions";
             _url = _url.Replace("{vaultBaseUrl}", vaultBaseUrl);
-            _url = _url.Replace("{secret-name}", Uri.EscapeDataString(secretName));
+            _url = _url.Replace("{secret-name}", System.Uri.EscapeDataString(secretName));
             List<string> _queryParameters = new List<string>();
             if (maxresults != null)
             {
-                _queryParameters.Add(string.Format("maxresults={0}", Uri.EscapeDataString(SafeJsonConvert.SerializeObject(maxresults, this.SerializationSettings).Trim('"'))));
+                _queryParameters.Add(string.Format("maxresults={0}", System.Uri.EscapeDataString(SafeJsonConvert.SerializeObject(maxresults, SerializationSettings).Trim('"'))));
             }
-            if (this.ApiVersion != null)
+            if (ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", Uri.EscapeDataString(this.ApiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
-                _url += "?" + string.Join("&", _queryParameters);
+                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
             }
             // Create HTTP transport objects
-            HttpRequestMessage _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
-            _httpRequest.RequestUri = new Uri(_url);
+            var _httpRequest = new System.Net.Http.HttpRequestMessage();
+            System.Net.Http.HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new System.Net.Http.HttpMethod("GET");
+            _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
-            if (this.GenerateClientRequestId != null && this.GenerateClientRequestId.Value)
+            if (GenerateClientRequestId != null && GenerateClientRequestId.Value)
             {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", Guid.NewGuid().ToString());
+                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
             }
-            if (this.AcceptLanguage != null)
+            if (AcceptLanguage != null)
             {
                 if (_httpRequest.Headers.Contains("accept-language"))
                 {
                     _httpRequest.Headers.Remove("accept-language");
                 }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", this.AcceptLanguage);
+                _httpRequest.Headers.TryAddWithoutValidation("accept-language", AcceptLanguage);
             }
+
+
             if (customHeaders != null)
             {
                 foreach(var _header in customHeaders)
@@ -4448,10 +4572,10 @@ private void Initialize()
             // Serialize Request
             string _requestContent = null;
             // Set Credentials
-            if (this.Credentials != null)
+            if (Credentials != null)
             {
                 cancellationToken.ThrowIfCancellationRequested();
-                await this.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+                await Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             }
             // Send Request
             if (_shouldTrace)
@@ -4459,7 +4583,7 @@ private void Initialize()
                 ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
             }
             cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await this.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            _httpResponse = await HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             if (_shouldTrace)
             {
                 ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
@@ -4473,7 +4597,7 @@ private void Initialize()
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    KeyVaultError _errorBody = SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, this.DeserializationSettings);
+                    KeyVaultError _errorBody =  SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, DeserializationSettings);
                     if (_errorBody != null)
                     {
                         ex.Body = _errorBody;
@@ -4510,7 +4634,7 @@ private void Initialize()
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = SafeJsonConvert.DeserializeObject<Page<SecretItem>>(_responseContent, this.DeserializationSettings);
+                    _result.Body = SafeJsonConvert.DeserializeObject<Page<SecretItem>>(_responseContent, DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -4530,14 +4654,14 @@ private void Initialize()
         }
 
         /// <summary>
-        /// List certificates in the specified vault
+        /// List certificates in a specified key vault
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='maxresults'>
-        /// Maximum number of results to return in a page. If not specified the
-        /// service will return up to 25 results.
+        /// Maximum number of results to return in a page. If not specified the service
+        /// will return up to 25 results.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -4554,6 +4678,9 @@ private void Initialize()
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
@@ -4571,7 +4698,7 @@ private void Initialize()
             {
                 throw new ValidationException(ValidationRules.InclusiveMinimum, "maxresults", 1);
             }
-            if (this.ApiVersion == null)
+            if (ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.ApiVersion");
             }
@@ -4588,40 +4715,42 @@ private void Initialize()
                 ServiceClientTracing.Enter(_invocationId, this, "GetCertificates", tracingParameters);
             }
             // Construct URL
-            var _baseUrl = this.BaseUri;
+            var _baseUrl = BaseUri;
             var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "certificates";
             _url = _url.Replace("{vaultBaseUrl}", vaultBaseUrl);
             List<string> _queryParameters = new List<string>();
             if (maxresults != null)
             {
-                _queryParameters.Add(string.Format("maxresults={0}", Uri.EscapeDataString(SafeJsonConvert.SerializeObject(maxresults, this.SerializationSettings).Trim('"'))));
+                _queryParameters.Add(string.Format("maxresults={0}", System.Uri.EscapeDataString(SafeJsonConvert.SerializeObject(maxresults, SerializationSettings).Trim('"'))));
             }
-            if (this.ApiVersion != null)
+            if (ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", Uri.EscapeDataString(this.ApiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
-                _url += "?" + string.Join("&", _queryParameters);
+                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
             }
             // Create HTTP transport objects
-            HttpRequestMessage _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
-            _httpRequest.RequestUri = new Uri(_url);
+            var _httpRequest = new System.Net.Http.HttpRequestMessage();
+            System.Net.Http.HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new System.Net.Http.HttpMethod("GET");
+            _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
-            if (this.GenerateClientRequestId != null && this.GenerateClientRequestId.Value)
+            if (GenerateClientRequestId != null && GenerateClientRequestId.Value)
             {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", Guid.NewGuid().ToString());
+                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
             }
-            if (this.AcceptLanguage != null)
+            if (AcceptLanguage != null)
             {
                 if (_httpRequest.Headers.Contains("accept-language"))
                 {
                     _httpRequest.Headers.Remove("accept-language");
                 }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", this.AcceptLanguage);
+                _httpRequest.Headers.TryAddWithoutValidation("accept-language", AcceptLanguage);
             }
+
+
             if (customHeaders != null)
             {
                 foreach(var _header in customHeaders)
@@ -4637,10 +4766,10 @@ private void Initialize()
             // Serialize Request
             string _requestContent = null;
             // Set Credentials
-            if (this.Credentials != null)
+            if (Credentials != null)
             {
                 cancellationToken.ThrowIfCancellationRequested();
-                await this.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+                await Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             }
             // Send Request
             if (_shouldTrace)
@@ -4648,7 +4777,7 @@ private void Initialize()
                 ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
             }
             cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await this.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            _httpResponse = await HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             if (_shouldTrace)
             {
                 ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
@@ -4662,7 +4791,7 @@ private void Initialize()
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    KeyVaultError _errorBody = SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, this.DeserializationSettings);
+                    KeyVaultError _errorBody =  SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, DeserializationSettings);
                     if (_errorBody != null)
                     {
                         ex.Body = _errorBody;
@@ -4699,7 +4828,7 @@ private void Initialize()
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = SafeJsonConvert.DeserializeObject<Page<CertificateItem>>(_responseContent, this.DeserializationSettings);
+                    _result.Body = SafeJsonConvert.DeserializeObject<Page<CertificateItem>>(_responseContent, DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -4719,13 +4848,13 @@ private void Initialize()
         }
 
         /// <summary>
-        /// Deletes a certificate from the specified vault.
+        /// Deletes a certificate from a specified key vault.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='certificateName'>
-        /// The name of the certificate in the given vault
+        /// The name of the certificate.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -4742,6 +4871,9 @@ private void Initialize()
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
@@ -4755,7 +4887,7 @@ private void Initialize()
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "certificateName");
             }
-            if (this.ApiVersion == null)
+            if (ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.ApiVersion");
             }
@@ -4772,37 +4904,39 @@ private void Initialize()
                 ServiceClientTracing.Enter(_invocationId, this, "DeleteCertificate", tracingParameters);
             }
             // Construct URL
-            var _baseUrl = this.BaseUri;
+            var _baseUrl = BaseUri;
             var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "certificates/{certificate-name}";
             _url = _url.Replace("{vaultBaseUrl}", vaultBaseUrl);
-            _url = _url.Replace("{certificate-name}", Uri.EscapeDataString(certificateName));
+            _url = _url.Replace("{certificate-name}", System.Uri.EscapeDataString(certificateName));
             List<string> _queryParameters = new List<string>();
-            if (this.ApiVersion != null)
+            if (ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", Uri.EscapeDataString(this.ApiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
-                _url += "?" + string.Join("&", _queryParameters);
+                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
             }
             // Create HTTP transport objects
-            HttpRequestMessage _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("DELETE");
-            _httpRequest.RequestUri = new Uri(_url);
+            var _httpRequest = new System.Net.Http.HttpRequestMessage();
+            System.Net.Http.HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new System.Net.Http.HttpMethod("DELETE");
+            _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
-            if (this.GenerateClientRequestId != null && this.GenerateClientRequestId.Value)
+            if (GenerateClientRequestId != null && GenerateClientRequestId.Value)
             {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", Guid.NewGuid().ToString());
+                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
             }
-            if (this.AcceptLanguage != null)
+            if (AcceptLanguage != null)
             {
                 if (_httpRequest.Headers.Contains("accept-language"))
                 {
                     _httpRequest.Headers.Remove("accept-language");
                 }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", this.AcceptLanguage);
+                _httpRequest.Headers.TryAddWithoutValidation("accept-language", AcceptLanguage);
             }
+
+
             if (customHeaders != null)
             {
                 foreach(var _header in customHeaders)
@@ -4818,10 +4952,10 @@ private void Initialize()
             // Serialize Request
             string _requestContent = null;
             // Set Credentials
-            if (this.Credentials != null)
+            if (Credentials != null)
             {
                 cancellationToken.ThrowIfCancellationRequested();
-                await this.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+                await Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             }
             // Send Request
             if (_shouldTrace)
@@ -4829,7 +4963,7 @@ private void Initialize()
                 ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
             }
             cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await this.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            _httpResponse = await HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             if (_shouldTrace)
             {
                 ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
@@ -4843,7 +4977,7 @@ private void Initialize()
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    KeyVaultError _errorBody = SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, this.DeserializationSettings);
+                    KeyVaultError _errorBody =  SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, DeserializationSettings);
                     if (_errorBody != null)
                     {
                         ex.Body = _errorBody;
@@ -4880,7 +5014,7 @@ private void Initialize()
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = SafeJsonConvert.DeserializeObject<CertificateBundle>(_responseContent, this.DeserializationSettings);
+                    _result.Body = SafeJsonConvert.DeserializeObject<CertificateBundle>(_responseContent, DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -4900,13 +5034,13 @@ private void Initialize()
         }
 
         /// <summary>
-        /// Sets the certificate contacts for the specified vault.
+        /// Sets the certificate contacts for the specified key vault.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='contacts'>
-        /// The contacts for the vault certificates.
+        /// The contacts for the key vault certificate.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -4923,6 +5057,9 @@ private void Initialize()
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
@@ -4936,7 +5073,7 @@ private void Initialize()
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "contacts");
             }
-            if (this.ApiVersion == null)
+            if (ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.ApiVersion");
             }
@@ -4953,36 +5090,38 @@ private void Initialize()
                 ServiceClientTracing.Enter(_invocationId, this, "SetCertificateContacts", tracingParameters);
             }
             // Construct URL
-            var _baseUrl = this.BaseUri;
+            var _baseUrl = BaseUri;
             var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "certificates/contacts";
             _url = _url.Replace("{vaultBaseUrl}", vaultBaseUrl);
             List<string> _queryParameters = new List<string>();
-            if (this.ApiVersion != null)
+            if (ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", Uri.EscapeDataString(this.ApiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
-                _url += "?" + string.Join("&", _queryParameters);
+                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
             }
             // Create HTTP transport objects
-            HttpRequestMessage _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("PUT");
-            _httpRequest.RequestUri = new Uri(_url);
+            var _httpRequest = new System.Net.Http.HttpRequestMessage();
+            System.Net.Http.HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new System.Net.Http.HttpMethod("PUT");
+            _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
-            if (this.GenerateClientRequestId != null && this.GenerateClientRequestId.Value)
+            if (GenerateClientRequestId != null && GenerateClientRequestId.Value)
             {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", Guid.NewGuid().ToString());
+                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
             }
-            if (this.AcceptLanguage != null)
+            if (AcceptLanguage != null)
             {
                 if (_httpRequest.Headers.Contains("accept-language"))
                 {
                     _httpRequest.Headers.Remove("accept-language");
                 }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", this.AcceptLanguage);
+                _httpRequest.Headers.TryAddWithoutValidation("accept-language", AcceptLanguage);
             }
+
+
             if (customHeaders != null)
             {
                 foreach(var _header in customHeaders)
@@ -4999,15 +5138,15 @@ private void Initialize()
             string _requestContent = null;
             if(contacts != null)
             {
-                _requestContent = SafeJsonConvert.SerializeObject(contacts, this.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
+                _requestContent = SafeJsonConvert.SerializeObject(contacts, SerializationSettings);
+                _httpRequest.Content = new System.Net.Http.StringContent(_requestContent, System.Text.Encoding.UTF8);
+                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             }
             // Set Credentials
-            if (this.Credentials != null)
+            if (Credentials != null)
             {
                 cancellationToken.ThrowIfCancellationRequested();
-                await this.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+                await Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             }
             // Send Request
             if (_shouldTrace)
@@ -5015,7 +5154,7 @@ private void Initialize()
                 ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
             }
             cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await this.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            _httpResponse = await HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             if (_shouldTrace)
             {
                 ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
@@ -5029,7 +5168,7 @@ private void Initialize()
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    KeyVaultError _errorBody = SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, this.DeserializationSettings);
+                    KeyVaultError _errorBody =  SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, DeserializationSettings);
                     if (_errorBody != null)
                     {
                         ex.Body = _errorBody;
@@ -5066,7 +5205,7 @@ private void Initialize()
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = SafeJsonConvert.DeserializeObject<Contacts>(_responseContent, this.DeserializationSettings);
+                    _result.Body = SafeJsonConvert.DeserializeObject<Contacts>(_responseContent, DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -5086,10 +5225,10 @@ private void Initialize()
         }
 
         /// <summary>
-        /// Gets the certificate contacts for the specified vault.
+        /// Lists the certificate contacts for a specified key vault.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -5106,6 +5245,9 @@ private void Initialize()
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
@@ -5115,7 +5257,7 @@ private void Initialize()
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "vaultBaseUrl");
             }
-            if (this.ApiVersion == null)
+            if (ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.ApiVersion");
             }
@@ -5131,36 +5273,38 @@ private void Initialize()
                 ServiceClientTracing.Enter(_invocationId, this, "GetCertificateContacts", tracingParameters);
             }
             // Construct URL
-            var _baseUrl = this.BaseUri;
+            var _baseUrl = BaseUri;
             var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "certificates/contacts";
             _url = _url.Replace("{vaultBaseUrl}", vaultBaseUrl);
             List<string> _queryParameters = new List<string>();
-            if (this.ApiVersion != null)
+            if (ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", Uri.EscapeDataString(this.ApiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
-                _url += "?" + string.Join("&", _queryParameters);
+                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
             }
             // Create HTTP transport objects
-            HttpRequestMessage _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
-            _httpRequest.RequestUri = new Uri(_url);
+            var _httpRequest = new System.Net.Http.HttpRequestMessage();
+            System.Net.Http.HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new System.Net.Http.HttpMethod("GET");
+            _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
-            if (this.GenerateClientRequestId != null && this.GenerateClientRequestId.Value)
+            if (GenerateClientRequestId != null && GenerateClientRequestId.Value)
             {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", Guid.NewGuid().ToString());
+                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
             }
-            if (this.AcceptLanguage != null)
+            if (AcceptLanguage != null)
             {
                 if (_httpRequest.Headers.Contains("accept-language"))
                 {
                     _httpRequest.Headers.Remove("accept-language");
                 }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", this.AcceptLanguage);
+                _httpRequest.Headers.TryAddWithoutValidation("accept-language", AcceptLanguage);
             }
+
+
             if (customHeaders != null)
             {
                 foreach(var _header in customHeaders)
@@ -5176,10 +5320,10 @@ private void Initialize()
             // Serialize Request
             string _requestContent = null;
             // Set Credentials
-            if (this.Credentials != null)
+            if (Credentials != null)
             {
                 cancellationToken.ThrowIfCancellationRequested();
-                await this.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+                await Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             }
             // Send Request
             if (_shouldTrace)
@@ -5187,7 +5331,7 @@ private void Initialize()
                 ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
             }
             cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await this.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            _httpResponse = await HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             if (_shouldTrace)
             {
                 ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
@@ -5201,7 +5345,7 @@ private void Initialize()
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    KeyVaultError _errorBody = SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, this.DeserializationSettings);
+                    KeyVaultError _errorBody =  SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, DeserializationSettings);
                     if (_errorBody != null)
                     {
                         ex.Body = _errorBody;
@@ -5238,7 +5382,7 @@ private void Initialize()
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = SafeJsonConvert.DeserializeObject<Contacts>(_responseContent, this.DeserializationSettings);
+                    _result.Body = SafeJsonConvert.DeserializeObject<Contacts>(_responseContent, DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -5258,10 +5402,10 @@ private void Initialize()
         }
 
         /// <summary>
-        /// Deletes the certificate contacts for the specified vault.
+        /// Deletes the certificate contacts for a specified key vault.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -5278,6 +5422,9 @@ private void Initialize()
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
@@ -5287,7 +5434,7 @@ private void Initialize()
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "vaultBaseUrl");
             }
-            if (this.ApiVersion == null)
+            if (ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.ApiVersion");
             }
@@ -5303,36 +5450,38 @@ private void Initialize()
                 ServiceClientTracing.Enter(_invocationId, this, "DeleteCertificateContacts", tracingParameters);
             }
             // Construct URL
-            var _baseUrl = this.BaseUri;
+            var _baseUrl = BaseUri;
             var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "certificates/contacts";
             _url = _url.Replace("{vaultBaseUrl}", vaultBaseUrl);
             List<string> _queryParameters = new List<string>();
-            if (this.ApiVersion != null)
+            if (ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", Uri.EscapeDataString(this.ApiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
-                _url += "?" + string.Join("&", _queryParameters);
+                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
             }
             // Create HTTP transport objects
-            HttpRequestMessage _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("DELETE");
-            _httpRequest.RequestUri = new Uri(_url);
+            var _httpRequest = new System.Net.Http.HttpRequestMessage();
+            System.Net.Http.HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new System.Net.Http.HttpMethod("DELETE");
+            _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
-            if (this.GenerateClientRequestId != null && this.GenerateClientRequestId.Value)
+            if (GenerateClientRequestId != null && GenerateClientRequestId.Value)
             {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", Guid.NewGuid().ToString());
+                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
             }
-            if (this.AcceptLanguage != null)
+            if (AcceptLanguage != null)
             {
                 if (_httpRequest.Headers.Contains("accept-language"))
                 {
                     _httpRequest.Headers.Remove("accept-language");
                 }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", this.AcceptLanguage);
+                _httpRequest.Headers.TryAddWithoutValidation("accept-language", AcceptLanguage);
             }
+
+
             if (customHeaders != null)
             {
                 foreach(var _header in customHeaders)
@@ -5348,10 +5497,10 @@ private void Initialize()
             // Serialize Request
             string _requestContent = null;
             // Set Credentials
-            if (this.Credentials != null)
+            if (Credentials != null)
             {
                 cancellationToken.ThrowIfCancellationRequested();
-                await this.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+                await Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             }
             // Send Request
             if (_shouldTrace)
@@ -5359,7 +5508,7 @@ private void Initialize()
                 ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
             }
             cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await this.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            _httpResponse = await HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             if (_shouldTrace)
             {
                 ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
@@ -5373,7 +5522,7 @@ private void Initialize()
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    KeyVaultError _errorBody = SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, this.DeserializationSettings);
+                    KeyVaultError _errorBody =  SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, DeserializationSettings);
                     if (_errorBody != null)
                     {
                         ex.Body = _errorBody;
@@ -5410,7 +5559,7 @@ private void Initialize()
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = SafeJsonConvert.DeserializeObject<Contacts>(_responseContent, this.DeserializationSettings);
+                    _result.Body = SafeJsonConvert.DeserializeObject<Contacts>(_responseContent, DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -5430,14 +5579,14 @@ private void Initialize()
         }
 
         /// <summary>
-        /// List certificate issuers for the specified vault.
+        /// List certificate issuers for a specified key vault.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='maxresults'>
-        /// Maximum number of results to return in a page. If not specified the
-        /// service will return up to 25 results.
+        /// Maximum number of results to return in a page. If not specified the service
+        /// will return up to 25 results.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -5454,6 +5603,9 @@ private void Initialize()
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
@@ -5471,7 +5623,7 @@ private void Initialize()
             {
                 throw new ValidationException(ValidationRules.InclusiveMinimum, "maxresults", 1);
             }
-            if (this.ApiVersion == null)
+            if (ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.ApiVersion");
             }
@@ -5488,40 +5640,42 @@ private void Initialize()
                 ServiceClientTracing.Enter(_invocationId, this, "GetCertificateIssuers", tracingParameters);
             }
             // Construct URL
-            var _baseUrl = this.BaseUri;
+            var _baseUrl = BaseUri;
             var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "certificates/issuers";
             _url = _url.Replace("{vaultBaseUrl}", vaultBaseUrl);
             List<string> _queryParameters = new List<string>();
             if (maxresults != null)
             {
-                _queryParameters.Add(string.Format("maxresults={0}", Uri.EscapeDataString(SafeJsonConvert.SerializeObject(maxresults, this.SerializationSettings).Trim('"'))));
+                _queryParameters.Add(string.Format("maxresults={0}", System.Uri.EscapeDataString(SafeJsonConvert.SerializeObject(maxresults, SerializationSettings).Trim('"'))));
             }
-            if (this.ApiVersion != null)
+            if (ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", Uri.EscapeDataString(this.ApiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
-                _url += "?" + string.Join("&", _queryParameters);
+                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
             }
             // Create HTTP transport objects
-            HttpRequestMessage _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
-            _httpRequest.RequestUri = new Uri(_url);
+            var _httpRequest = new System.Net.Http.HttpRequestMessage();
+            System.Net.Http.HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new System.Net.Http.HttpMethod("GET");
+            _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
-            if (this.GenerateClientRequestId != null && this.GenerateClientRequestId.Value)
+            if (GenerateClientRequestId != null && GenerateClientRequestId.Value)
             {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", Guid.NewGuid().ToString());
+                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
             }
-            if (this.AcceptLanguage != null)
+            if (AcceptLanguage != null)
             {
                 if (_httpRequest.Headers.Contains("accept-language"))
                 {
                     _httpRequest.Headers.Remove("accept-language");
                 }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", this.AcceptLanguage);
+                _httpRequest.Headers.TryAddWithoutValidation("accept-language", AcceptLanguage);
             }
+
+
             if (customHeaders != null)
             {
                 foreach(var _header in customHeaders)
@@ -5537,10 +5691,10 @@ private void Initialize()
             // Serialize Request
             string _requestContent = null;
             // Set Credentials
-            if (this.Credentials != null)
+            if (Credentials != null)
             {
                 cancellationToken.ThrowIfCancellationRequested();
-                await this.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+                await Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             }
             // Send Request
             if (_shouldTrace)
@@ -5548,7 +5702,7 @@ private void Initialize()
                 ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
             }
             cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await this.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            _httpResponse = await HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             if (_shouldTrace)
             {
                 ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
@@ -5562,7 +5716,7 @@ private void Initialize()
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    KeyVaultError _errorBody = SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, this.DeserializationSettings);
+                    KeyVaultError _errorBody =  SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, DeserializationSettings);
                     if (_errorBody != null)
                     {
                         ex.Body = _errorBody;
@@ -5599,7 +5753,7 @@ private void Initialize()
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = SafeJsonConvert.DeserializeObject<Page<CertificateIssuerItem>>(_responseContent, this.DeserializationSettings);
+                    _result.Body = SafeJsonConvert.DeserializeObject<Page<CertificateIssuerItem>>(_responseContent, DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -5622,7 +5776,7 @@ private void Initialize()
         /// Sets the specified certificate issuer.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='issuerName'>
         /// The name of the issuer.
@@ -5654,6 +5808,9 @@ private void Initialize()
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
@@ -5667,7 +5824,7 @@ private void Initialize()
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "issuerName");
             }
-            if (this.ApiVersion == null)
+            if (ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.ApiVersion");
             }
@@ -5697,37 +5854,39 @@ private void Initialize()
                 ServiceClientTracing.Enter(_invocationId, this, "SetCertificateIssuer", tracingParameters);
             }
             // Construct URL
-            var _baseUrl = this.BaseUri;
+            var _baseUrl = BaseUri;
             var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "certificates/issuers/{issuer-name}";
             _url = _url.Replace("{vaultBaseUrl}", vaultBaseUrl);
-            _url = _url.Replace("{issuer-name}", Uri.EscapeDataString(issuerName));
+            _url = _url.Replace("{issuer-name}", System.Uri.EscapeDataString(issuerName));
             List<string> _queryParameters = new List<string>();
-            if (this.ApiVersion != null)
+            if (ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", Uri.EscapeDataString(this.ApiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
-                _url += "?" + string.Join("&", _queryParameters);
+                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
             }
             // Create HTTP transport objects
-            HttpRequestMessage _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("PUT");
-            _httpRequest.RequestUri = new Uri(_url);
+            var _httpRequest = new System.Net.Http.HttpRequestMessage();
+            System.Net.Http.HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new System.Net.Http.HttpMethod("PUT");
+            _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
-            if (this.GenerateClientRequestId != null && this.GenerateClientRequestId.Value)
+            if (GenerateClientRequestId != null && GenerateClientRequestId.Value)
             {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", Guid.NewGuid().ToString());
+                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
             }
-            if (this.AcceptLanguage != null)
+            if (AcceptLanguage != null)
             {
                 if (_httpRequest.Headers.Contains("accept-language"))
                 {
                     _httpRequest.Headers.Remove("accept-language");
                 }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", this.AcceptLanguage);
+                _httpRequest.Headers.TryAddWithoutValidation("accept-language", AcceptLanguage);
             }
+
+
             if (customHeaders != null)
             {
                 foreach(var _header in customHeaders)
@@ -5744,15 +5903,15 @@ private void Initialize()
             string _requestContent = null;
             if(parameter != null)
             {
-                _requestContent = SafeJsonConvert.SerializeObject(parameter, this.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
+                _requestContent = SafeJsonConvert.SerializeObject(parameter, SerializationSettings);
+                _httpRequest.Content = new System.Net.Http.StringContent(_requestContent, System.Text.Encoding.UTF8);
+                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             }
             // Set Credentials
-            if (this.Credentials != null)
+            if (Credentials != null)
             {
                 cancellationToken.ThrowIfCancellationRequested();
-                await this.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+                await Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             }
             // Send Request
             if (_shouldTrace)
@@ -5760,7 +5919,7 @@ private void Initialize()
                 ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
             }
             cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await this.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            _httpResponse = await HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             if (_shouldTrace)
             {
                 ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
@@ -5774,7 +5933,7 @@ private void Initialize()
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    KeyVaultError _errorBody = SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, this.DeserializationSettings);
+                    KeyVaultError _errorBody =  SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, DeserializationSettings);
                     if (_errorBody != null)
                     {
                         ex.Body = _errorBody;
@@ -5811,7 +5970,7 @@ private void Initialize()
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = SafeJsonConvert.DeserializeObject<IssuerBundle>(_responseContent, this.DeserializationSettings);
+                    _result.Body = SafeJsonConvert.DeserializeObject<IssuerBundle>(_responseContent, DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -5834,7 +5993,7 @@ private void Initialize()
         /// Updates the specified certificate issuer.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='issuerName'>
         /// The name of the issuer.
@@ -5866,6 +6025,9 @@ private void Initialize()
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
@@ -5879,7 +6041,7 @@ private void Initialize()
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "issuerName");
             }
-            if (this.ApiVersion == null)
+            if (ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.ApiVersion");
             }
@@ -5905,37 +6067,39 @@ private void Initialize()
                 ServiceClientTracing.Enter(_invocationId, this, "UpdateCertificateIssuer", tracingParameters);
             }
             // Construct URL
-            var _baseUrl = this.BaseUri;
+            var _baseUrl = BaseUri;
             var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "certificates/issuers/{issuer-name}";
             _url = _url.Replace("{vaultBaseUrl}", vaultBaseUrl);
-            _url = _url.Replace("{issuer-name}", Uri.EscapeDataString(issuerName));
+            _url = _url.Replace("{issuer-name}", System.Uri.EscapeDataString(issuerName));
             List<string> _queryParameters = new List<string>();
-            if (this.ApiVersion != null)
+            if (ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", Uri.EscapeDataString(this.ApiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
-                _url += "?" + string.Join("&", _queryParameters);
+                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
             }
             // Create HTTP transport objects
-            HttpRequestMessage _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("PATCH");
-            _httpRequest.RequestUri = new Uri(_url);
+            var _httpRequest = new System.Net.Http.HttpRequestMessage();
+            System.Net.Http.HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new System.Net.Http.HttpMethod("PATCH");
+            _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
-            if (this.GenerateClientRequestId != null && this.GenerateClientRequestId.Value)
+            if (GenerateClientRequestId != null && GenerateClientRequestId.Value)
             {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", Guid.NewGuid().ToString());
+                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
             }
-            if (this.AcceptLanguage != null)
+            if (AcceptLanguage != null)
             {
                 if (_httpRequest.Headers.Contains("accept-language"))
                 {
                     _httpRequest.Headers.Remove("accept-language");
                 }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", this.AcceptLanguage);
+                _httpRequest.Headers.TryAddWithoutValidation("accept-language", AcceptLanguage);
             }
+
+
             if (customHeaders != null)
             {
                 foreach(var _header in customHeaders)
@@ -5952,15 +6116,15 @@ private void Initialize()
             string _requestContent = null;
             if(parameter != null)
             {
-                _requestContent = SafeJsonConvert.SerializeObject(parameter, this.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
+                _requestContent = SafeJsonConvert.SerializeObject(parameter, SerializationSettings);
+                _httpRequest.Content = new System.Net.Http.StringContent(_requestContent, System.Text.Encoding.UTF8);
+                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             }
             // Set Credentials
-            if (this.Credentials != null)
+            if (Credentials != null)
             {
                 cancellationToken.ThrowIfCancellationRequested();
-                await this.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+                await Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             }
             // Send Request
             if (_shouldTrace)
@@ -5968,7 +6132,7 @@ private void Initialize()
                 ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
             }
             cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await this.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            _httpResponse = await HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             if (_shouldTrace)
             {
                 ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
@@ -5982,7 +6146,7 @@ private void Initialize()
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    KeyVaultError _errorBody = SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, this.DeserializationSettings);
+                    KeyVaultError _errorBody =  SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, DeserializationSettings);
                     if (_errorBody != null)
                     {
                         ex.Body = _errorBody;
@@ -6019,7 +6183,7 @@ private void Initialize()
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = SafeJsonConvert.DeserializeObject<IssuerBundle>(_responseContent, this.DeserializationSettings);
+                    _result.Body = SafeJsonConvert.DeserializeObject<IssuerBundle>(_responseContent, DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -6039,10 +6203,10 @@ private void Initialize()
         }
 
         /// <summary>
-        /// Gets the specified certificate issuer.
+        /// Lists the specified certificate issuer.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='issuerName'>
         /// The name of the issuer.
@@ -6062,6 +6226,9 @@ private void Initialize()
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
@@ -6075,7 +6242,7 @@ private void Initialize()
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "issuerName");
             }
-            if (this.ApiVersion == null)
+            if (ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.ApiVersion");
             }
@@ -6092,37 +6259,39 @@ private void Initialize()
                 ServiceClientTracing.Enter(_invocationId, this, "GetCertificateIssuer", tracingParameters);
             }
             // Construct URL
-            var _baseUrl = this.BaseUri;
+            var _baseUrl = BaseUri;
             var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "certificates/issuers/{issuer-name}";
             _url = _url.Replace("{vaultBaseUrl}", vaultBaseUrl);
-            _url = _url.Replace("{issuer-name}", Uri.EscapeDataString(issuerName));
+            _url = _url.Replace("{issuer-name}", System.Uri.EscapeDataString(issuerName));
             List<string> _queryParameters = new List<string>();
-            if (this.ApiVersion != null)
+            if (ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", Uri.EscapeDataString(this.ApiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
-                _url += "?" + string.Join("&", _queryParameters);
+                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
             }
             // Create HTTP transport objects
-            HttpRequestMessage _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
-            _httpRequest.RequestUri = new Uri(_url);
+            var _httpRequest = new System.Net.Http.HttpRequestMessage();
+            System.Net.Http.HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new System.Net.Http.HttpMethod("GET");
+            _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
-            if (this.GenerateClientRequestId != null && this.GenerateClientRequestId.Value)
+            if (GenerateClientRequestId != null && GenerateClientRequestId.Value)
             {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", Guid.NewGuid().ToString());
+                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
             }
-            if (this.AcceptLanguage != null)
+            if (AcceptLanguage != null)
             {
                 if (_httpRequest.Headers.Contains("accept-language"))
                 {
                     _httpRequest.Headers.Remove("accept-language");
                 }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", this.AcceptLanguage);
+                _httpRequest.Headers.TryAddWithoutValidation("accept-language", AcceptLanguage);
             }
+
+
             if (customHeaders != null)
             {
                 foreach(var _header in customHeaders)
@@ -6138,10 +6307,10 @@ private void Initialize()
             // Serialize Request
             string _requestContent = null;
             // Set Credentials
-            if (this.Credentials != null)
+            if (Credentials != null)
             {
                 cancellationToken.ThrowIfCancellationRequested();
-                await this.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+                await Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             }
             // Send Request
             if (_shouldTrace)
@@ -6149,7 +6318,7 @@ private void Initialize()
                 ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
             }
             cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await this.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            _httpResponse = await HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             if (_shouldTrace)
             {
                 ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
@@ -6163,7 +6332,7 @@ private void Initialize()
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    KeyVaultError _errorBody = SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, this.DeserializationSettings);
+                    KeyVaultError _errorBody =  SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, DeserializationSettings);
                     if (_errorBody != null)
                     {
                         ex.Body = _errorBody;
@@ -6200,7 +6369,7 @@ private void Initialize()
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = SafeJsonConvert.DeserializeObject<IssuerBundle>(_responseContent, this.DeserializationSettings);
+                    _result.Body = SafeJsonConvert.DeserializeObject<IssuerBundle>(_responseContent, DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -6223,7 +6392,7 @@ private void Initialize()
         /// Deletes the specified certificate issuer.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='issuerName'>
         /// The name of the issuer.
@@ -6243,6 +6412,9 @@ private void Initialize()
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
@@ -6256,7 +6428,7 @@ private void Initialize()
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "issuerName");
             }
-            if (this.ApiVersion == null)
+            if (ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.ApiVersion");
             }
@@ -6273,37 +6445,39 @@ private void Initialize()
                 ServiceClientTracing.Enter(_invocationId, this, "DeleteCertificateIssuer", tracingParameters);
             }
             // Construct URL
-            var _baseUrl = this.BaseUri;
+            var _baseUrl = BaseUri;
             var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "certificates/issuers/{issuer-name}";
             _url = _url.Replace("{vaultBaseUrl}", vaultBaseUrl);
-            _url = _url.Replace("{issuer-name}", Uri.EscapeDataString(issuerName));
+            _url = _url.Replace("{issuer-name}", System.Uri.EscapeDataString(issuerName));
             List<string> _queryParameters = new List<string>();
-            if (this.ApiVersion != null)
+            if (ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", Uri.EscapeDataString(this.ApiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
-                _url += "?" + string.Join("&", _queryParameters);
+                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
             }
             // Create HTTP transport objects
-            HttpRequestMessage _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("DELETE");
-            _httpRequest.RequestUri = new Uri(_url);
+            var _httpRequest = new System.Net.Http.HttpRequestMessage();
+            System.Net.Http.HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new System.Net.Http.HttpMethod("DELETE");
+            _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
-            if (this.GenerateClientRequestId != null && this.GenerateClientRequestId.Value)
+            if (GenerateClientRequestId != null && GenerateClientRequestId.Value)
             {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", Guid.NewGuid().ToString());
+                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
             }
-            if (this.AcceptLanguage != null)
+            if (AcceptLanguage != null)
             {
                 if (_httpRequest.Headers.Contains("accept-language"))
                 {
                     _httpRequest.Headers.Remove("accept-language");
                 }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", this.AcceptLanguage);
+                _httpRequest.Headers.TryAddWithoutValidation("accept-language", AcceptLanguage);
             }
+
+
             if (customHeaders != null)
             {
                 foreach(var _header in customHeaders)
@@ -6319,10 +6493,10 @@ private void Initialize()
             // Serialize Request
             string _requestContent = null;
             // Set Credentials
-            if (this.Credentials != null)
+            if (Credentials != null)
             {
                 cancellationToken.ThrowIfCancellationRequested();
-                await this.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+                await Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             }
             // Send Request
             if (_shouldTrace)
@@ -6330,7 +6504,7 @@ private void Initialize()
                 ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
             }
             cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await this.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            _httpResponse = await HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             if (_shouldTrace)
             {
                 ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
@@ -6344,7 +6518,7 @@ private void Initialize()
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    KeyVaultError _errorBody = SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, this.DeserializationSettings);
+                    KeyVaultError _errorBody =  SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, DeserializationSettings);
                     if (_errorBody != null)
                     {
                         ex.Body = _errorBody;
@@ -6381,7 +6555,7 @@ private void Initialize()
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = SafeJsonConvert.DeserializeObject<IssuerBundle>(_responseContent, this.DeserializationSettings);
+                    _result.Body = SafeJsonConvert.DeserializeObject<IssuerBundle>(_responseContent, DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -6401,23 +6575,23 @@ private void Initialize()
         }
 
         /// <summary>
-        /// Creates a new certificate version. If this is the first version, the
-        /// certificate resource is created.
+        /// Creates a new certificate. If this is the first version, the certificate
+        /// resource is created.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='certificateName'>
-        /// The name of the certificate
+        /// The name of the certificate.
         /// </param>
         /// <param name='certificatePolicy'>
-        /// The management policy for the certificate
+        /// The management policy for the certificate.
         /// </param>
         /// <param name='certificateAttributes'>
-        /// The attributes of the certificate (optional)
+        /// The attributes of the certificate (optional).
         /// </param>
         /// <param name='tags'>
-        /// Application-specific metadata in the form of key-value pairs
+        /// Application specific metadata in the form of key-value pairs.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -6434,6 +6608,9 @@ private void Initialize()
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
@@ -6454,7 +6631,7 @@ private void Initialize()
                     throw new ValidationException(ValidationRules.Pattern, "certificateName", "^[0-9a-zA-Z-]+$");
                 }
             }
-            if (this.ApiVersion == null)
+            if (ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.ApiVersion");
             }
@@ -6483,37 +6660,39 @@ private void Initialize()
                 ServiceClientTracing.Enter(_invocationId, this, "CreateCertificate", tracingParameters);
             }
             // Construct URL
-            var _baseUrl = this.BaseUri;
+            var _baseUrl = BaseUri;
             var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "certificates/{certificate-name}/create";
             _url = _url.Replace("{vaultBaseUrl}", vaultBaseUrl);
-            _url = _url.Replace("{certificate-name}", Uri.EscapeDataString(certificateName));
+            _url = _url.Replace("{certificate-name}", System.Uri.EscapeDataString(certificateName));
             List<string> _queryParameters = new List<string>();
-            if (this.ApiVersion != null)
+            if (ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", Uri.EscapeDataString(this.ApiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
-                _url += "?" + string.Join("&", _queryParameters);
+                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
             }
             // Create HTTP transport objects
-            HttpRequestMessage _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("POST");
-            _httpRequest.RequestUri = new Uri(_url);
+            var _httpRequest = new System.Net.Http.HttpRequestMessage();
+            System.Net.Http.HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new System.Net.Http.HttpMethod("POST");
+            _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
-            if (this.GenerateClientRequestId != null && this.GenerateClientRequestId.Value)
+            if (GenerateClientRequestId != null && GenerateClientRequestId.Value)
             {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", Guid.NewGuid().ToString());
+                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
             }
-            if (this.AcceptLanguage != null)
+            if (AcceptLanguage != null)
             {
                 if (_httpRequest.Headers.Contains("accept-language"))
                 {
                     _httpRequest.Headers.Remove("accept-language");
                 }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", this.AcceptLanguage);
+                _httpRequest.Headers.TryAddWithoutValidation("accept-language", AcceptLanguage);
             }
+
+
             if (customHeaders != null)
             {
                 foreach(var _header in customHeaders)
@@ -6530,15 +6709,15 @@ private void Initialize()
             string _requestContent = null;
             if(parameters != null)
             {
-                _requestContent = SafeJsonConvert.SerializeObject(parameters, this.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
+                _requestContent = SafeJsonConvert.SerializeObject(parameters, SerializationSettings);
+                _httpRequest.Content = new System.Net.Http.StringContent(_requestContent, System.Text.Encoding.UTF8);
+                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             }
             // Set Credentials
-            if (this.Credentials != null)
+            if (Credentials != null)
             {
                 cancellationToken.ThrowIfCancellationRequested();
-                await this.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+                await Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             }
             // Send Request
             if (_shouldTrace)
@@ -6546,7 +6725,7 @@ private void Initialize()
                 ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
             }
             cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await this.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            _httpResponse = await HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             if (_shouldTrace)
             {
                 ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
@@ -6560,7 +6739,7 @@ private void Initialize()
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    KeyVaultError _errorBody = SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, this.DeserializationSettings);
+                    KeyVaultError _errorBody =  SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, DeserializationSettings);
                     if (_errorBody != null)
                     {
                         ex.Body = _errorBody;
@@ -6597,7 +6776,7 @@ private void Initialize()
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = SafeJsonConvert.DeserializeObject<CertificateOperation>(_responseContent, this.DeserializationSettings);
+                    _result.Body = SafeJsonConvert.DeserializeObject<CertificateOperation>(_responseContent, DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -6617,13 +6796,13 @@ private void Initialize()
         }
 
         /// <summary>
-        /// Imports a certificate into the specified vault
+        /// Imports a certificate into a specified key vault.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='certificateName'>
-        /// The name of the certificate
+        /// The name of the certificate.
         /// </param>
         /// <param name='base64EncodedCertificate'>
         /// Base64 encoded representation of the certificate object to import. This
@@ -6631,16 +6810,16 @@ private void Initialize()
         /// </param>
         /// <param name='password'>
         /// If the private key in base64EncodedCertificate is encrypted, the password
-        /// used for encryption
+        /// used for encryption.
         /// </param>
         /// <param name='certificatePolicy'>
-        /// The management policy for the certificate
+        /// The management policy for the certificate.
         /// </param>
         /// <param name='certificateAttributes'>
-        /// The attributes of the certificate (optional)
+        /// The attributes of the certificate (optional).
         /// </param>
         /// <param name='tags'>
-        /// Application-specific metadata in the form of key-value pairs
+        /// Application specific metadata in the form of key-value pairs.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -6657,6 +6836,9 @@ private void Initialize()
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
@@ -6677,7 +6859,7 @@ private void Initialize()
                     throw new ValidationException(ValidationRules.Pattern, "certificateName", "^[0-9a-zA-Z-]+$");
                 }
             }
-            if (this.ApiVersion == null)
+            if (ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.ApiVersion");
             }
@@ -6712,37 +6894,39 @@ private void Initialize()
                 ServiceClientTracing.Enter(_invocationId, this, "ImportCertificate", tracingParameters);
             }
             // Construct URL
-            var _baseUrl = this.BaseUri;
+            var _baseUrl = BaseUri;
             var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "certificates/{certificate-name}/import";
             _url = _url.Replace("{vaultBaseUrl}", vaultBaseUrl);
-            _url = _url.Replace("{certificate-name}", Uri.EscapeDataString(certificateName));
+            _url = _url.Replace("{certificate-name}", System.Uri.EscapeDataString(certificateName));
             List<string> _queryParameters = new List<string>();
-            if (this.ApiVersion != null)
+            if (ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", Uri.EscapeDataString(this.ApiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
-                _url += "?" + string.Join("&", _queryParameters);
+                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
             }
             // Create HTTP transport objects
-            HttpRequestMessage _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("POST");
-            _httpRequest.RequestUri = new Uri(_url);
+            var _httpRequest = new System.Net.Http.HttpRequestMessage();
+            System.Net.Http.HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new System.Net.Http.HttpMethod("POST");
+            _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
-            if (this.GenerateClientRequestId != null && this.GenerateClientRequestId.Value)
+            if (GenerateClientRequestId != null && GenerateClientRequestId.Value)
             {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", Guid.NewGuid().ToString());
+                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
             }
-            if (this.AcceptLanguage != null)
+            if (AcceptLanguage != null)
             {
                 if (_httpRequest.Headers.Contains("accept-language"))
                 {
                     _httpRequest.Headers.Remove("accept-language");
                 }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", this.AcceptLanguage);
+                _httpRequest.Headers.TryAddWithoutValidation("accept-language", AcceptLanguage);
             }
+
+
             if (customHeaders != null)
             {
                 foreach(var _header in customHeaders)
@@ -6759,15 +6943,15 @@ private void Initialize()
             string _requestContent = null;
             if(parameters != null)
             {
-                _requestContent = SafeJsonConvert.SerializeObject(parameters, this.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
+                _requestContent = SafeJsonConvert.SerializeObject(parameters, SerializationSettings);
+                _httpRequest.Content = new System.Net.Http.StringContent(_requestContent, System.Text.Encoding.UTF8);
+                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             }
             // Set Credentials
-            if (this.Credentials != null)
+            if (Credentials != null)
             {
                 cancellationToken.ThrowIfCancellationRequested();
-                await this.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+                await Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             }
             // Send Request
             if (_shouldTrace)
@@ -6775,7 +6959,7 @@ private void Initialize()
                 ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
             }
             cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await this.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            _httpResponse = await HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             if (_shouldTrace)
             {
                 ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
@@ -6789,7 +6973,7 @@ private void Initialize()
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    KeyVaultError _errorBody = SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, this.DeserializationSettings);
+                    KeyVaultError _errorBody =  SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, DeserializationSettings);
                     if (_errorBody != null)
                     {
                         ex.Body = _errorBody;
@@ -6826,7 +7010,7 @@ private void Initialize()
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = SafeJsonConvert.DeserializeObject<CertificateBundle>(_responseContent, this.DeserializationSettings);
+                    _result.Body = SafeJsonConvert.DeserializeObject<CertificateBundle>(_responseContent, DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -6849,14 +7033,14 @@ private void Initialize()
         /// List the versions of a certificate.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='certificateName'>
-        /// The name of the certificate
+        /// The name of the certificate.
         /// </param>
         /// <param name='maxresults'>
-        /// Maximum number of results to return in a page. If not specified the
-        /// service will return up to 25 results.
+        /// Maximum number of results to return in a page. If not specified the service
+        /// will return up to 25 results.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -6873,6 +7057,9 @@ private void Initialize()
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
@@ -6894,7 +7081,7 @@ private void Initialize()
             {
                 throw new ValidationException(ValidationRules.InclusiveMinimum, "maxresults", 1);
             }
-            if (this.ApiVersion == null)
+            if (ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.ApiVersion");
             }
@@ -6912,41 +7099,43 @@ private void Initialize()
                 ServiceClientTracing.Enter(_invocationId, this, "GetCertificateVersions", tracingParameters);
             }
             // Construct URL
-            var _baseUrl = this.BaseUri;
+            var _baseUrl = BaseUri;
             var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "certificates/{certificate-name}/versions";
             _url = _url.Replace("{vaultBaseUrl}", vaultBaseUrl);
-            _url = _url.Replace("{certificate-name}", Uri.EscapeDataString(certificateName));
+            _url = _url.Replace("{certificate-name}", System.Uri.EscapeDataString(certificateName));
             List<string> _queryParameters = new List<string>();
             if (maxresults != null)
             {
-                _queryParameters.Add(string.Format("maxresults={0}", Uri.EscapeDataString(SafeJsonConvert.SerializeObject(maxresults, this.SerializationSettings).Trim('"'))));
+                _queryParameters.Add(string.Format("maxresults={0}", System.Uri.EscapeDataString(SafeJsonConvert.SerializeObject(maxresults, SerializationSettings).Trim('"'))));
             }
-            if (this.ApiVersion != null)
+            if (ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", Uri.EscapeDataString(this.ApiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
-                _url += "?" + string.Join("&", _queryParameters);
+                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
             }
             // Create HTTP transport objects
-            HttpRequestMessage _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
-            _httpRequest.RequestUri = new Uri(_url);
+            var _httpRequest = new System.Net.Http.HttpRequestMessage();
+            System.Net.Http.HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new System.Net.Http.HttpMethod("GET");
+            _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
-            if (this.GenerateClientRequestId != null && this.GenerateClientRequestId.Value)
+            if (GenerateClientRequestId != null && GenerateClientRequestId.Value)
             {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", Guid.NewGuid().ToString());
+                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
             }
-            if (this.AcceptLanguage != null)
+            if (AcceptLanguage != null)
             {
                 if (_httpRequest.Headers.Contains("accept-language"))
                 {
                     _httpRequest.Headers.Remove("accept-language");
                 }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", this.AcceptLanguage);
+                _httpRequest.Headers.TryAddWithoutValidation("accept-language", AcceptLanguage);
             }
+
+
             if (customHeaders != null)
             {
                 foreach(var _header in customHeaders)
@@ -6962,10 +7151,10 @@ private void Initialize()
             // Serialize Request
             string _requestContent = null;
             // Set Credentials
-            if (this.Credentials != null)
+            if (Credentials != null)
             {
                 cancellationToken.ThrowIfCancellationRequested();
-                await this.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+                await Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             }
             // Send Request
             if (_shouldTrace)
@@ -6973,7 +7162,7 @@ private void Initialize()
                 ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
             }
             cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await this.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            _httpResponse = await HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             if (_shouldTrace)
             {
                 ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
@@ -6987,7 +7176,7 @@ private void Initialize()
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    KeyVaultError _errorBody = SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, this.DeserializationSettings);
+                    KeyVaultError _errorBody =  SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, DeserializationSettings);
                     if (_errorBody != null)
                     {
                         ex.Body = _errorBody;
@@ -7024,7 +7213,7 @@ private void Initialize()
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = SafeJsonConvert.DeserializeObject<Page<CertificateItem>>(_responseContent, this.DeserializationSettings);
+                    _result.Body = SafeJsonConvert.DeserializeObject<Page<CertificateItem>>(_responseContent, DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -7044,13 +7233,13 @@ private void Initialize()
         }
 
         /// <summary>
-        /// Gets the policy for a certificate.
+        /// Lists the policy for a certificate.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='certificateName'>
-        /// The name of the certificate in the given vault.
+        /// The name of the certificate in a given key vault.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -7067,6 +7256,9 @@ private void Initialize()
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
@@ -7080,7 +7272,7 @@ private void Initialize()
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "certificateName");
             }
-            if (this.ApiVersion == null)
+            if (ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.ApiVersion");
             }
@@ -7097,37 +7289,39 @@ private void Initialize()
                 ServiceClientTracing.Enter(_invocationId, this, "GetCertificatePolicy", tracingParameters);
             }
             // Construct URL
-            var _baseUrl = this.BaseUri;
+            var _baseUrl = BaseUri;
             var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "certificates/{certificate-name}/policy";
             _url = _url.Replace("{vaultBaseUrl}", vaultBaseUrl);
-            _url = _url.Replace("{certificate-name}", Uri.EscapeDataString(certificateName));
+            _url = _url.Replace("{certificate-name}", System.Uri.EscapeDataString(certificateName));
             List<string> _queryParameters = new List<string>();
-            if (this.ApiVersion != null)
+            if (ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", Uri.EscapeDataString(this.ApiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
-                _url += "?" + string.Join("&", _queryParameters);
+                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
             }
             // Create HTTP transport objects
-            HttpRequestMessage _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
-            _httpRequest.RequestUri = new Uri(_url);
+            var _httpRequest = new System.Net.Http.HttpRequestMessage();
+            System.Net.Http.HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new System.Net.Http.HttpMethod("GET");
+            _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
-            if (this.GenerateClientRequestId != null && this.GenerateClientRequestId.Value)
+            if (GenerateClientRequestId != null && GenerateClientRequestId.Value)
             {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", Guid.NewGuid().ToString());
+                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
             }
-            if (this.AcceptLanguage != null)
+            if (AcceptLanguage != null)
             {
                 if (_httpRequest.Headers.Contains("accept-language"))
                 {
                     _httpRequest.Headers.Remove("accept-language");
                 }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", this.AcceptLanguage);
+                _httpRequest.Headers.TryAddWithoutValidation("accept-language", AcceptLanguage);
             }
+
+
             if (customHeaders != null)
             {
                 foreach(var _header in customHeaders)
@@ -7143,10 +7337,10 @@ private void Initialize()
             // Serialize Request
             string _requestContent = null;
             // Set Credentials
-            if (this.Credentials != null)
+            if (Credentials != null)
             {
                 cancellationToken.ThrowIfCancellationRequested();
-                await this.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+                await Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             }
             // Send Request
             if (_shouldTrace)
@@ -7154,7 +7348,7 @@ private void Initialize()
                 ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
             }
             cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await this.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            _httpResponse = await HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             if (_shouldTrace)
             {
                 ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
@@ -7168,7 +7362,7 @@ private void Initialize()
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    KeyVaultError _errorBody = SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, this.DeserializationSettings);
+                    KeyVaultError _errorBody =  SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, DeserializationSettings);
                     if (_errorBody != null)
                     {
                         ex.Body = _errorBody;
@@ -7205,7 +7399,7 @@ private void Initialize()
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = SafeJsonConvert.DeserializeObject<CertificatePolicy>(_responseContent, this.DeserializationSettings);
+                    _result.Body = SafeJsonConvert.DeserializeObject<CertificatePolicy>(_responseContent, DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -7225,11 +7419,11 @@ private void Initialize()
         }
 
         /// <summary>
-        /// Updates the policy for a certificate. Set appropriate members in the
-        /// certificatePolicy that must be updated. Leave others as null.
+        /// Updates the policy for a certificate. Set specified members in the
+        /// certificate policy. Leave others as null.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='certificateName'>
         /// The name of the certificate in the given vault.
@@ -7252,6 +7446,9 @@ private void Initialize()
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
@@ -7269,7 +7466,7 @@ private void Initialize()
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "certificatePolicy");
             }
-            if (this.ApiVersion == null)
+            if (ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.ApiVersion");
             }
@@ -7287,37 +7484,39 @@ private void Initialize()
                 ServiceClientTracing.Enter(_invocationId, this, "UpdateCertificatePolicy", tracingParameters);
             }
             // Construct URL
-            var _baseUrl = this.BaseUri;
+            var _baseUrl = BaseUri;
             var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "certificates/{certificate-name}/policy";
             _url = _url.Replace("{vaultBaseUrl}", vaultBaseUrl);
-            _url = _url.Replace("{certificate-name}", Uri.EscapeDataString(certificateName));
+            _url = _url.Replace("{certificate-name}", System.Uri.EscapeDataString(certificateName));
             List<string> _queryParameters = new List<string>();
-            if (this.ApiVersion != null)
+            if (ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", Uri.EscapeDataString(this.ApiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
-                _url += "?" + string.Join("&", _queryParameters);
+                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
             }
             // Create HTTP transport objects
-            HttpRequestMessage _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("PATCH");
-            _httpRequest.RequestUri = new Uri(_url);
+            var _httpRequest = new System.Net.Http.HttpRequestMessage();
+            System.Net.Http.HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new System.Net.Http.HttpMethod("PATCH");
+            _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
-            if (this.GenerateClientRequestId != null && this.GenerateClientRequestId.Value)
+            if (GenerateClientRequestId != null && GenerateClientRequestId.Value)
             {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", Guid.NewGuid().ToString());
+                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
             }
-            if (this.AcceptLanguage != null)
+            if (AcceptLanguage != null)
             {
                 if (_httpRequest.Headers.Contains("accept-language"))
                 {
                     _httpRequest.Headers.Remove("accept-language");
                 }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", this.AcceptLanguage);
+                _httpRequest.Headers.TryAddWithoutValidation("accept-language", AcceptLanguage);
             }
+
+
             if (customHeaders != null)
             {
                 foreach(var _header in customHeaders)
@@ -7334,15 +7533,15 @@ private void Initialize()
             string _requestContent = null;
             if(certificatePolicy != null)
             {
-                _requestContent = SafeJsonConvert.SerializeObject(certificatePolicy, this.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
+                _requestContent = SafeJsonConvert.SerializeObject(certificatePolicy, SerializationSettings);
+                _httpRequest.Content = new System.Net.Http.StringContent(_requestContent, System.Text.Encoding.UTF8);
+                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             }
             // Set Credentials
-            if (this.Credentials != null)
+            if (Credentials != null)
             {
                 cancellationToken.ThrowIfCancellationRequested();
-                await this.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+                await Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             }
             // Send Request
             if (_shouldTrace)
@@ -7350,7 +7549,7 @@ private void Initialize()
                 ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
             }
             cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await this.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            _httpResponse = await HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             if (_shouldTrace)
             {
                 ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
@@ -7364,7 +7563,7 @@ private void Initialize()
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    KeyVaultError _errorBody = SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, this.DeserializationSettings);
+                    KeyVaultError _errorBody =  SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, DeserializationSettings);
                     if (_errorBody != null)
                     {
                         ex.Body = _errorBody;
@@ -7401,7 +7600,7 @@ private void Initialize()
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = SafeJsonConvert.DeserializeObject<CertificatePolicy>(_responseContent, this.DeserializationSettings);
+                    _result.Body = SafeJsonConvert.DeserializeObject<CertificatePolicy>(_responseContent, DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -7421,25 +7620,25 @@ private void Initialize()
         }
 
         /// <summary>
-        /// Updates the attributes associated with the specified certificate
+        /// Updates the specified attributes associated with the given certificate.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='certificateName'>
-        /// The name of the certificate in the given vault
+        /// The name of the certificate in the given key vault.
         /// </param>
         /// <param name='certificateVersion'>
-        /// The version of the certificate
+        /// The version of the certificate.
         /// </param>
         /// <param name='certificatePolicy'>
-        /// The management policy for the certificate
+        /// The management policy for the certificate.
         /// </param>
         /// <param name='certificateAttributes'>
-        /// The attributes of the certificate (optional)
+        /// The attributes of the certificate (optional).
         /// </param>
         /// <param name='tags'>
-        /// Application-specific metadata in the form of key-value pairs
+        /// Application specific metadata in the form of key-value pairs.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -7456,6 +7655,9 @@ private void Initialize()
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
@@ -7473,7 +7675,7 @@ private void Initialize()
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "certificateVersion");
             }
-            if (this.ApiVersion == null)
+            if (ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.ApiVersion");
             }
@@ -7503,38 +7705,40 @@ private void Initialize()
                 ServiceClientTracing.Enter(_invocationId, this, "UpdateCertificate", tracingParameters);
             }
             // Construct URL
-            var _baseUrl = this.BaseUri;
+            var _baseUrl = BaseUri;
             var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "certificates/{certificate-name}/{certificate-version}";
             _url = _url.Replace("{vaultBaseUrl}", vaultBaseUrl);
-            _url = _url.Replace("{certificate-name}", Uri.EscapeDataString(certificateName));
-            _url = _url.Replace("{certificate-version}", Uri.EscapeDataString(certificateVersion));
+            _url = _url.Replace("{certificate-name}", System.Uri.EscapeDataString(certificateName));
+            _url = _url.Replace("{certificate-version}", System.Uri.EscapeDataString(certificateVersion));
             List<string> _queryParameters = new List<string>();
-            if (this.ApiVersion != null)
+            if (ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", Uri.EscapeDataString(this.ApiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
-                _url += "?" + string.Join("&", _queryParameters);
+                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
             }
             // Create HTTP transport objects
-            HttpRequestMessage _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("PATCH");
-            _httpRequest.RequestUri = new Uri(_url);
+            var _httpRequest = new System.Net.Http.HttpRequestMessage();
+            System.Net.Http.HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new System.Net.Http.HttpMethod("PATCH");
+            _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
-            if (this.GenerateClientRequestId != null && this.GenerateClientRequestId.Value)
+            if (GenerateClientRequestId != null && GenerateClientRequestId.Value)
             {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", Guid.NewGuid().ToString());
+                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
             }
-            if (this.AcceptLanguage != null)
+            if (AcceptLanguage != null)
             {
                 if (_httpRequest.Headers.Contains("accept-language"))
                 {
                     _httpRequest.Headers.Remove("accept-language");
                 }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", this.AcceptLanguage);
+                _httpRequest.Headers.TryAddWithoutValidation("accept-language", AcceptLanguage);
             }
+
+
             if (customHeaders != null)
             {
                 foreach(var _header in customHeaders)
@@ -7551,15 +7755,15 @@ private void Initialize()
             string _requestContent = null;
             if(parameters != null)
             {
-                _requestContent = SafeJsonConvert.SerializeObject(parameters, this.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
+                _requestContent = SafeJsonConvert.SerializeObject(parameters, SerializationSettings);
+                _httpRequest.Content = new System.Net.Http.StringContent(_requestContent, System.Text.Encoding.UTF8);
+                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             }
             // Set Credentials
-            if (this.Credentials != null)
+            if (Credentials != null)
             {
                 cancellationToken.ThrowIfCancellationRequested();
-                await this.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+                await Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             }
             // Send Request
             if (_shouldTrace)
@@ -7567,7 +7771,7 @@ private void Initialize()
                 ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
             }
             cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await this.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            _httpResponse = await HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             if (_shouldTrace)
             {
                 ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
@@ -7581,7 +7785,7 @@ private void Initialize()
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    KeyVaultError _errorBody = SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, this.DeserializationSettings);
+                    KeyVaultError _errorBody =  SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, DeserializationSettings);
                     if (_errorBody != null)
                     {
                         ex.Body = _errorBody;
@@ -7618,7 +7822,7 @@ private void Initialize()
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = SafeJsonConvert.DeserializeObject<CertificateBundle>(_responseContent, this.DeserializationSettings);
+                    _result.Body = SafeJsonConvert.DeserializeObject<CertificateBundle>(_responseContent, DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -7638,16 +7842,16 @@ private void Initialize()
         }
 
         /// <summary>
-        /// Gets a Certificate.
+        /// Gets information about a specified certificate.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='certificateName'>
-        /// The name of the certificate in the given vault
+        /// The name of the certificate in the given vault.
         /// </param>
         /// <param name='certificateVersion'>
-        /// The version of the certificate
+        /// The version of the certificate.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -7664,6 +7868,9 @@ private void Initialize()
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
@@ -7681,7 +7888,7 @@ private void Initialize()
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "certificateVersion");
             }
-            if (this.ApiVersion == null)
+            if (ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.ApiVersion");
             }
@@ -7699,38 +7906,40 @@ private void Initialize()
                 ServiceClientTracing.Enter(_invocationId, this, "GetCertificate", tracingParameters);
             }
             // Construct URL
-            var _baseUrl = this.BaseUri;
+            var _baseUrl = BaseUri;
             var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "certificates/{certificate-name}/{certificate-version}";
             _url = _url.Replace("{vaultBaseUrl}", vaultBaseUrl);
-            _url = _url.Replace("{certificate-name}", Uri.EscapeDataString(certificateName));
-            _url = _url.Replace("{certificate-version}", Uri.EscapeDataString(certificateVersion));
+            _url = _url.Replace("{certificate-name}", System.Uri.EscapeDataString(certificateName));
+            _url = _url.Replace("{certificate-version}", System.Uri.EscapeDataString(certificateVersion));
             List<string> _queryParameters = new List<string>();
-            if (this.ApiVersion != null)
+            if (ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", Uri.EscapeDataString(this.ApiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
-                _url += "?" + string.Join("&", _queryParameters);
+                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
             }
             // Create HTTP transport objects
-            HttpRequestMessage _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
-            _httpRequest.RequestUri = new Uri(_url);
+            var _httpRequest = new System.Net.Http.HttpRequestMessage();
+            System.Net.Http.HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new System.Net.Http.HttpMethod("GET");
+            _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
-            if (this.GenerateClientRequestId != null && this.GenerateClientRequestId.Value)
+            if (GenerateClientRequestId != null && GenerateClientRequestId.Value)
             {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", Guid.NewGuid().ToString());
+                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
             }
-            if (this.AcceptLanguage != null)
+            if (AcceptLanguage != null)
             {
                 if (_httpRequest.Headers.Contains("accept-language"))
                 {
                     _httpRequest.Headers.Remove("accept-language");
                 }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", this.AcceptLanguage);
+                _httpRequest.Headers.TryAddWithoutValidation("accept-language", AcceptLanguage);
             }
+
+
             if (customHeaders != null)
             {
                 foreach(var _header in customHeaders)
@@ -7746,10 +7955,10 @@ private void Initialize()
             // Serialize Request
             string _requestContent = null;
             // Set Credentials
-            if (this.Credentials != null)
+            if (Credentials != null)
             {
                 cancellationToken.ThrowIfCancellationRequested();
-                await this.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+                await Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             }
             // Send Request
             if (_shouldTrace)
@@ -7757,7 +7966,7 @@ private void Initialize()
                 ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
             }
             cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await this.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            _httpResponse = await HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             if (_shouldTrace)
             {
                 ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
@@ -7771,7 +7980,7 @@ private void Initialize()
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    KeyVaultError _errorBody = SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, this.DeserializationSettings);
+                    KeyVaultError _errorBody =  SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, DeserializationSettings);
                     if (_errorBody != null)
                     {
                         ex.Body = _errorBody;
@@ -7808,7 +8017,7 @@ private void Initialize()
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = SafeJsonConvert.DeserializeObject<CertificateBundle>(_responseContent, this.DeserializationSettings);
+                    _result.Body = SafeJsonConvert.DeserializeObject<CertificateBundle>(_responseContent, DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -7831,10 +8040,10 @@ private void Initialize()
         /// Updates a certificate operation.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='certificateName'>
-        /// The name of the certificate
+        /// The name of the certificate.
         /// </param>
         /// <param name='cancellationRequested'>
         /// Indicates if cancellation was requested on the certificate operation.
@@ -7854,6 +8063,9 @@ private void Initialize()
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
@@ -7867,7 +8079,7 @@ private void Initialize()
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "certificateName");
             }
-            if (this.ApiVersion == null)
+            if (ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.ApiVersion");
             }
@@ -7887,37 +8099,39 @@ private void Initialize()
                 ServiceClientTracing.Enter(_invocationId, this, "UpdateCertificateOperation", tracingParameters);
             }
             // Construct URL
-            var _baseUrl = this.BaseUri;
+            var _baseUrl = BaseUri;
             var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "certificates/{certificate-name}/pending";
             _url = _url.Replace("{vaultBaseUrl}", vaultBaseUrl);
-            _url = _url.Replace("{certificate-name}", Uri.EscapeDataString(certificateName));
+            _url = _url.Replace("{certificate-name}", System.Uri.EscapeDataString(certificateName));
             List<string> _queryParameters = new List<string>();
-            if (this.ApiVersion != null)
+            if (ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", Uri.EscapeDataString(this.ApiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
-                _url += "?" + string.Join("&", _queryParameters);
+                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
             }
             // Create HTTP transport objects
-            HttpRequestMessage _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("PATCH");
-            _httpRequest.RequestUri = new Uri(_url);
+            var _httpRequest = new System.Net.Http.HttpRequestMessage();
+            System.Net.Http.HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new System.Net.Http.HttpMethod("PATCH");
+            _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
-            if (this.GenerateClientRequestId != null && this.GenerateClientRequestId.Value)
+            if (GenerateClientRequestId != null && GenerateClientRequestId.Value)
             {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", Guid.NewGuid().ToString());
+                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
             }
-            if (this.AcceptLanguage != null)
+            if (AcceptLanguage != null)
             {
                 if (_httpRequest.Headers.Contains("accept-language"))
                 {
                     _httpRequest.Headers.Remove("accept-language");
                 }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", this.AcceptLanguage);
+                _httpRequest.Headers.TryAddWithoutValidation("accept-language", AcceptLanguage);
             }
+
+
             if (customHeaders != null)
             {
                 foreach(var _header in customHeaders)
@@ -7934,15 +8148,15 @@ private void Initialize()
             string _requestContent = null;
             if(certificateOperation != null)
             {
-                _requestContent = SafeJsonConvert.SerializeObject(certificateOperation, this.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
+                _requestContent = SafeJsonConvert.SerializeObject(certificateOperation, SerializationSettings);
+                _httpRequest.Content = new System.Net.Http.StringContent(_requestContent, System.Text.Encoding.UTF8);
+                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             }
             // Set Credentials
-            if (this.Credentials != null)
+            if (Credentials != null)
             {
                 cancellationToken.ThrowIfCancellationRequested();
-                await this.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+                await Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             }
             // Send Request
             if (_shouldTrace)
@@ -7950,7 +8164,7 @@ private void Initialize()
                 ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
             }
             cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await this.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            _httpResponse = await HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             if (_shouldTrace)
             {
                 ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
@@ -7964,7 +8178,7 @@ private void Initialize()
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    KeyVaultError _errorBody = SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, this.DeserializationSettings);
+                    KeyVaultError _errorBody =  SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, DeserializationSettings);
                     if (_errorBody != null)
                     {
                         ex.Body = _errorBody;
@@ -8001,7 +8215,7 @@ private void Initialize()
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = SafeJsonConvert.DeserializeObject<CertificateOperation>(_responseContent, this.DeserializationSettings);
+                    _result.Body = SafeJsonConvert.DeserializeObject<CertificateOperation>(_responseContent, DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -8021,13 +8235,13 @@ private void Initialize()
         }
 
         /// <summary>
-        /// Gets the certificate operation response.
+        /// Gets the operation associated with a specified certificate.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='certificateName'>
-        /// The name of the certificate
+        /// The name of the certificate.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -8044,6 +8258,9 @@ private void Initialize()
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
@@ -8057,7 +8274,7 @@ private void Initialize()
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "certificateName");
             }
-            if (this.ApiVersion == null)
+            if (ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.ApiVersion");
             }
@@ -8074,37 +8291,39 @@ private void Initialize()
                 ServiceClientTracing.Enter(_invocationId, this, "GetCertificateOperation", tracingParameters);
             }
             // Construct URL
-            var _baseUrl = this.BaseUri;
+            var _baseUrl = BaseUri;
             var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "certificates/{certificate-name}/pending";
             _url = _url.Replace("{vaultBaseUrl}", vaultBaseUrl);
-            _url = _url.Replace("{certificate-name}", Uri.EscapeDataString(certificateName));
+            _url = _url.Replace("{certificate-name}", System.Uri.EscapeDataString(certificateName));
             List<string> _queryParameters = new List<string>();
-            if (this.ApiVersion != null)
+            if (ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", Uri.EscapeDataString(this.ApiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
-                _url += "?" + string.Join("&", _queryParameters);
+                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
             }
             // Create HTTP transport objects
-            HttpRequestMessage _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
-            _httpRequest.RequestUri = new Uri(_url);
+            var _httpRequest = new System.Net.Http.HttpRequestMessage();
+            System.Net.Http.HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new System.Net.Http.HttpMethod("GET");
+            _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
-            if (this.GenerateClientRequestId != null && this.GenerateClientRequestId.Value)
+            if (GenerateClientRequestId != null && GenerateClientRequestId.Value)
             {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", Guid.NewGuid().ToString());
+                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
             }
-            if (this.AcceptLanguage != null)
+            if (AcceptLanguage != null)
             {
                 if (_httpRequest.Headers.Contains("accept-language"))
                 {
                     _httpRequest.Headers.Remove("accept-language");
                 }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", this.AcceptLanguage);
+                _httpRequest.Headers.TryAddWithoutValidation("accept-language", AcceptLanguage);
             }
+
+
             if (customHeaders != null)
             {
                 foreach(var _header in customHeaders)
@@ -8120,10 +8339,10 @@ private void Initialize()
             // Serialize Request
             string _requestContent = null;
             // Set Credentials
-            if (this.Credentials != null)
+            if (Credentials != null)
             {
                 cancellationToken.ThrowIfCancellationRequested();
-                await this.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+                await Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             }
             // Send Request
             if (_shouldTrace)
@@ -8131,7 +8350,7 @@ private void Initialize()
                 ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
             }
             cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await this.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            _httpResponse = await HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             if (_shouldTrace)
             {
                 ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
@@ -8145,7 +8364,7 @@ private void Initialize()
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    KeyVaultError _errorBody = SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, this.DeserializationSettings);
+                    KeyVaultError _errorBody =  SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, DeserializationSettings);
                     if (_errorBody != null)
                     {
                         ex.Body = _errorBody;
@@ -8182,7 +8401,7 @@ private void Initialize()
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = SafeJsonConvert.DeserializeObject<CertificateOperation>(_responseContent, this.DeserializationSettings);
+                    _result.Body = SafeJsonConvert.DeserializeObject<CertificateOperation>(_responseContent, DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -8202,13 +8421,13 @@ private void Initialize()
         }
 
         /// <summary>
-        /// Deletes the certificate operation.
+        /// Deletes the operation for a specified certificate.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='certificateName'>
-        /// The name of the certificate
+        /// The name of the certificate.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -8225,6 +8444,9 @@ private void Initialize()
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
@@ -8238,7 +8460,7 @@ private void Initialize()
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "certificateName");
             }
-            if (this.ApiVersion == null)
+            if (ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.ApiVersion");
             }
@@ -8255,37 +8477,39 @@ private void Initialize()
                 ServiceClientTracing.Enter(_invocationId, this, "DeleteCertificateOperation", tracingParameters);
             }
             // Construct URL
-            var _baseUrl = this.BaseUri;
+            var _baseUrl = BaseUri;
             var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "certificates/{certificate-name}/pending";
             _url = _url.Replace("{vaultBaseUrl}", vaultBaseUrl);
-            _url = _url.Replace("{certificate-name}", Uri.EscapeDataString(certificateName));
+            _url = _url.Replace("{certificate-name}", System.Uri.EscapeDataString(certificateName));
             List<string> _queryParameters = new List<string>();
-            if (this.ApiVersion != null)
+            if (ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", Uri.EscapeDataString(this.ApiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
-                _url += "?" + string.Join("&", _queryParameters);
+                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
             }
             // Create HTTP transport objects
-            HttpRequestMessage _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("DELETE");
-            _httpRequest.RequestUri = new Uri(_url);
+            var _httpRequest = new System.Net.Http.HttpRequestMessage();
+            System.Net.Http.HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new System.Net.Http.HttpMethod("DELETE");
+            _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
-            if (this.GenerateClientRequestId != null && this.GenerateClientRequestId.Value)
+            if (GenerateClientRequestId != null && GenerateClientRequestId.Value)
             {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", Guid.NewGuid().ToString());
+                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
             }
-            if (this.AcceptLanguage != null)
+            if (AcceptLanguage != null)
             {
                 if (_httpRequest.Headers.Contains("accept-language"))
                 {
                     _httpRequest.Headers.Remove("accept-language");
                 }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", this.AcceptLanguage);
+                _httpRequest.Headers.TryAddWithoutValidation("accept-language", AcceptLanguage);
             }
+
+
             if (customHeaders != null)
             {
                 foreach(var _header in customHeaders)
@@ -8301,10 +8525,10 @@ private void Initialize()
             // Serialize Request
             string _requestContent = null;
             // Set Credentials
-            if (this.Credentials != null)
+            if (Credentials != null)
             {
                 cancellationToken.ThrowIfCancellationRequested();
-                await this.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+                await Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             }
             // Send Request
             if (_shouldTrace)
@@ -8312,7 +8536,7 @@ private void Initialize()
                 ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
             }
             cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await this.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            _httpResponse = await HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             if (_shouldTrace)
             {
                 ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
@@ -8326,7 +8550,7 @@ private void Initialize()
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    KeyVaultError _errorBody = SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, this.DeserializationSettings);
+                    KeyVaultError _errorBody =  SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, DeserializationSettings);
                     if (_errorBody != null)
                     {
                         ex.Body = _errorBody;
@@ -8363,7 +8587,7 @@ private void Initialize()
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = SafeJsonConvert.DeserializeObject<CertificateOperation>(_responseContent, this.DeserializationSettings);
+                    _result.Body = SafeJsonConvert.DeserializeObject<CertificateOperation>(_responseContent, DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -8383,23 +8607,23 @@ private void Initialize()
         }
 
         /// <summary>
-        /// Merges a certificate or a certificate chain with a key pair existing on
-        /// the server.
+        /// Merges a certificate or a certificate chain with a key pair existing on the
+        /// server.
         /// </summary>
         /// <param name='vaultBaseUrl'>
-        /// The vault name, e.g. https://myvault.vault.azure.net
+        /// The vault name, for example https://myvault.vault.azure.net.
         /// </param>
         /// <param name='certificateName'>
-        /// The name of the certificate
+        /// The name of the certificate.
         /// </param>
         /// <param name='x509Certificates'>
-        /// The certificate or the certificate chain to merge
+        /// The certificate or the certificate chain to merge.
         /// </param>
         /// <param name='certificateAttributes'>
-        /// The attributes of the certificate (optional)
+        /// The attributes of the certificate (optional).
         /// </param>
         /// <param name='tags'>
-        /// Application-specific metadata in the form of key-value pairs
+        /// Application specific metadata in the form of key-value pairs.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -8416,6 +8640,9 @@ private void Initialize()
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
@@ -8429,7 +8656,7 @@ private void Initialize()
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "certificateName");
             }
-            if (this.ApiVersion == null)
+            if (ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.ApiVersion");
             }
@@ -8458,37 +8685,39 @@ private void Initialize()
                 ServiceClientTracing.Enter(_invocationId, this, "MergeCertificate", tracingParameters);
             }
             // Construct URL
-            var _baseUrl = this.BaseUri;
+            var _baseUrl = BaseUri;
             var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "certificates/{certificate-name}/pending/merge";
             _url = _url.Replace("{vaultBaseUrl}", vaultBaseUrl);
-            _url = _url.Replace("{certificate-name}", Uri.EscapeDataString(certificateName));
+            _url = _url.Replace("{certificate-name}", System.Uri.EscapeDataString(certificateName));
             List<string> _queryParameters = new List<string>();
-            if (this.ApiVersion != null)
+            if (ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", Uri.EscapeDataString(this.ApiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
-                _url += "?" + string.Join("&", _queryParameters);
+                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
             }
             // Create HTTP transport objects
-            HttpRequestMessage _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("POST");
-            _httpRequest.RequestUri = new Uri(_url);
+            var _httpRequest = new System.Net.Http.HttpRequestMessage();
+            System.Net.Http.HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new System.Net.Http.HttpMethod("POST");
+            _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
-            if (this.GenerateClientRequestId != null && this.GenerateClientRequestId.Value)
+            if (GenerateClientRequestId != null && GenerateClientRequestId.Value)
             {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", Guid.NewGuid().ToString());
+                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
             }
-            if (this.AcceptLanguage != null)
+            if (AcceptLanguage != null)
             {
                 if (_httpRequest.Headers.Contains("accept-language"))
                 {
                     _httpRequest.Headers.Remove("accept-language");
                 }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", this.AcceptLanguage);
+                _httpRequest.Headers.TryAddWithoutValidation("accept-language", AcceptLanguage);
             }
+
+
             if (customHeaders != null)
             {
                 foreach(var _header in customHeaders)
@@ -8505,15 +8734,15 @@ private void Initialize()
             string _requestContent = null;
             if(parameters != null)
             {
-                _requestContent = SafeJsonConvert.SerializeObject(parameters, this.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
+                _requestContent = SafeJsonConvert.SerializeObject(parameters, SerializationSettings);
+                _httpRequest.Content = new System.Net.Http.StringContent(_requestContent, System.Text.Encoding.UTF8);
+                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             }
             // Set Credentials
-            if (this.Credentials != null)
+            if (Credentials != null)
             {
                 cancellationToken.ThrowIfCancellationRequested();
-                await this.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+                await Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             }
             // Send Request
             if (_shouldTrace)
@@ -8521,7 +8750,7 @@ private void Initialize()
                 ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
             }
             cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await this.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            _httpResponse = await HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             if (_shouldTrace)
             {
                 ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
@@ -8535,7 +8764,7 @@ private void Initialize()
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    KeyVaultError _errorBody = SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, this.DeserializationSettings);
+                    KeyVaultError _errorBody =  SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, DeserializationSettings);
                     if (_errorBody != null)
                     {
                         ex.Body = _errorBody;
@@ -8572,7 +8801,7 @@ private void Initialize()
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = SafeJsonConvert.DeserializeObject<CertificateBundle>(_responseContent, this.DeserializationSettings);
+                    _result.Body = SafeJsonConvert.DeserializeObject<CertificateBundle>(_responseContent, DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -8592,7 +8821,9 @@ private void Initialize()
         }
 
         /// <summary>
-        /// List the versions of the specified key
+        /// Retrieves a list of individual key versions with the same key name. The
+        /// full key identifier, attributes, and tags are provided in the response.
+        /// Authorization: Requires the keys/list permission.
         /// </summary>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -8612,6 +8843,9 @@ private void Initialize()
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
@@ -8638,26 +8872,28 @@ private void Initialize()
             List<string> _queryParameters = new List<string>();
             if (_queryParameters.Count > 0)
             {
-                _url += "?" + string.Join("&", _queryParameters);
+                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
             }
             // Create HTTP transport objects
-            HttpRequestMessage _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
-            _httpRequest.RequestUri = new Uri(_url);
+            var _httpRequest = new System.Net.Http.HttpRequestMessage();
+            System.Net.Http.HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new System.Net.Http.HttpMethod("GET");
+            _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
-            if (this.GenerateClientRequestId != null && this.GenerateClientRequestId.Value)
+            if (GenerateClientRequestId != null && GenerateClientRequestId.Value)
             {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", Guid.NewGuid().ToString());
+                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
             }
-            if (this.AcceptLanguage != null)
+            if (AcceptLanguage != null)
             {
                 if (_httpRequest.Headers.Contains("accept-language"))
                 {
                     _httpRequest.Headers.Remove("accept-language");
                 }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", this.AcceptLanguage);
+                _httpRequest.Headers.TryAddWithoutValidation("accept-language", AcceptLanguage);
             }
+
+
             if (customHeaders != null)
             {
                 foreach(var _header in customHeaders)
@@ -8673,10 +8909,10 @@ private void Initialize()
             // Serialize Request
             string _requestContent = null;
             // Set Credentials
-            if (this.Credentials != null)
+            if (Credentials != null)
             {
                 cancellationToken.ThrowIfCancellationRequested();
-                await this.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+                await Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             }
             // Send Request
             if (_shouldTrace)
@@ -8684,7 +8920,7 @@ private void Initialize()
                 ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
             }
             cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await this.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            _httpResponse = await HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             if (_shouldTrace)
             {
                 ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
@@ -8698,7 +8934,7 @@ private void Initialize()
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    KeyVaultError _errorBody = SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, this.DeserializationSettings);
+                    KeyVaultError _errorBody =  SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, DeserializationSettings);
                     if (_errorBody != null)
                     {
                         ex.Body = _errorBody;
@@ -8735,7 +8971,7 @@ private void Initialize()
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = SafeJsonConvert.DeserializeObject<Page<KeyItem>>(_responseContent, this.DeserializationSettings);
+                    _result.Body = SafeJsonConvert.DeserializeObject<Page<KeyItem>>(_responseContent, DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -8755,7 +8991,7 @@ private void Initialize()
         }
 
         /// <summary>
-        /// List keys in the specified vault
+        /// List keys in the specified vault.
         /// </summary>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -8775,6 +9011,9 @@ private void Initialize()
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
@@ -8801,26 +9040,28 @@ private void Initialize()
             List<string> _queryParameters = new List<string>();
             if (_queryParameters.Count > 0)
             {
-                _url += "?" + string.Join("&", _queryParameters);
+                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
             }
             // Create HTTP transport objects
-            HttpRequestMessage _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
-            _httpRequest.RequestUri = new Uri(_url);
+            var _httpRequest = new System.Net.Http.HttpRequestMessage();
+            System.Net.Http.HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new System.Net.Http.HttpMethod("GET");
+            _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
-            if (this.GenerateClientRequestId != null && this.GenerateClientRequestId.Value)
+            if (GenerateClientRequestId != null && GenerateClientRequestId.Value)
             {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", Guid.NewGuid().ToString());
+                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
             }
-            if (this.AcceptLanguage != null)
+            if (AcceptLanguage != null)
             {
                 if (_httpRequest.Headers.Contains("accept-language"))
                 {
                     _httpRequest.Headers.Remove("accept-language");
                 }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", this.AcceptLanguage);
+                _httpRequest.Headers.TryAddWithoutValidation("accept-language", AcceptLanguage);
             }
+
+
             if (customHeaders != null)
             {
                 foreach(var _header in customHeaders)
@@ -8836,10 +9077,10 @@ private void Initialize()
             // Serialize Request
             string _requestContent = null;
             // Set Credentials
-            if (this.Credentials != null)
+            if (Credentials != null)
             {
                 cancellationToken.ThrowIfCancellationRequested();
-                await this.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+                await Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             }
             // Send Request
             if (_shouldTrace)
@@ -8847,7 +9088,7 @@ private void Initialize()
                 ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
             }
             cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await this.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            _httpResponse = await HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             if (_shouldTrace)
             {
                 ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
@@ -8861,7 +9102,7 @@ private void Initialize()
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    KeyVaultError _errorBody = SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, this.DeserializationSettings);
+                    KeyVaultError _errorBody =  SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, DeserializationSettings);
                     if (_errorBody != null)
                     {
                         ex.Body = _errorBody;
@@ -8898,7 +9139,7 @@ private void Initialize()
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = SafeJsonConvert.DeserializeObject<Page<KeyItem>>(_responseContent, this.DeserializationSettings);
+                    _result.Body = SafeJsonConvert.DeserializeObject<Page<KeyItem>>(_responseContent, DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -8918,7 +9159,7 @@ private void Initialize()
         }
 
         /// <summary>
-        /// List secrets in the specified vault
+        /// List secrets in a specified key vault
         /// </summary>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -8938,6 +9179,9 @@ private void Initialize()
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
@@ -8964,26 +9208,28 @@ private void Initialize()
             List<string> _queryParameters = new List<string>();
             if (_queryParameters.Count > 0)
             {
-                _url += "?" + string.Join("&", _queryParameters);
+                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
             }
             // Create HTTP transport objects
-            HttpRequestMessage _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
-            _httpRequest.RequestUri = new Uri(_url);
+            var _httpRequest = new System.Net.Http.HttpRequestMessage();
+            System.Net.Http.HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new System.Net.Http.HttpMethod("GET");
+            _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
-            if (this.GenerateClientRequestId != null && this.GenerateClientRequestId.Value)
+            if (GenerateClientRequestId != null && GenerateClientRequestId.Value)
             {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", Guid.NewGuid().ToString());
+                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
             }
-            if (this.AcceptLanguage != null)
+            if (AcceptLanguage != null)
             {
                 if (_httpRequest.Headers.Contains("accept-language"))
                 {
                     _httpRequest.Headers.Remove("accept-language");
                 }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", this.AcceptLanguage);
+                _httpRequest.Headers.TryAddWithoutValidation("accept-language", AcceptLanguage);
             }
+
+
             if (customHeaders != null)
             {
                 foreach(var _header in customHeaders)
@@ -8999,10 +9245,10 @@ private void Initialize()
             // Serialize Request
             string _requestContent = null;
             // Set Credentials
-            if (this.Credentials != null)
+            if (Credentials != null)
             {
                 cancellationToken.ThrowIfCancellationRequested();
-                await this.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+                await Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             }
             // Send Request
             if (_shouldTrace)
@@ -9010,7 +9256,7 @@ private void Initialize()
                 ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
             }
             cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await this.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            _httpResponse = await HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             if (_shouldTrace)
             {
                 ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
@@ -9024,7 +9270,7 @@ private void Initialize()
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    KeyVaultError _errorBody = SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, this.DeserializationSettings);
+                    KeyVaultError _errorBody =  SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, DeserializationSettings);
                     if (_errorBody != null)
                     {
                         ex.Body = _errorBody;
@@ -9061,7 +9307,7 @@ private void Initialize()
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = SafeJsonConvert.DeserializeObject<Page<SecretItem>>(_responseContent, this.DeserializationSettings);
+                    _result.Body = SafeJsonConvert.DeserializeObject<Page<SecretItem>>(_responseContent, DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -9081,7 +9327,7 @@ private void Initialize()
         }
 
         /// <summary>
-        /// List the versions of the specified secret
+        /// List the versions of the specified secret.
         /// </summary>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -9101,6 +9347,9 @@ private void Initialize()
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
@@ -9127,26 +9376,28 @@ private void Initialize()
             List<string> _queryParameters = new List<string>();
             if (_queryParameters.Count > 0)
             {
-                _url += "?" + string.Join("&", _queryParameters);
+                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
             }
             // Create HTTP transport objects
-            HttpRequestMessage _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
-            _httpRequest.RequestUri = new Uri(_url);
+            var _httpRequest = new System.Net.Http.HttpRequestMessage();
+            System.Net.Http.HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new System.Net.Http.HttpMethod("GET");
+            _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
-            if (this.GenerateClientRequestId != null && this.GenerateClientRequestId.Value)
+            if (GenerateClientRequestId != null && GenerateClientRequestId.Value)
             {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", Guid.NewGuid().ToString());
+                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
             }
-            if (this.AcceptLanguage != null)
+            if (AcceptLanguage != null)
             {
                 if (_httpRequest.Headers.Contains("accept-language"))
                 {
                     _httpRequest.Headers.Remove("accept-language");
                 }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", this.AcceptLanguage);
+                _httpRequest.Headers.TryAddWithoutValidation("accept-language", AcceptLanguage);
             }
+
+
             if (customHeaders != null)
             {
                 foreach(var _header in customHeaders)
@@ -9162,10 +9413,10 @@ private void Initialize()
             // Serialize Request
             string _requestContent = null;
             // Set Credentials
-            if (this.Credentials != null)
+            if (Credentials != null)
             {
                 cancellationToken.ThrowIfCancellationRequested();
-                await this.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+                await Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             }
             // Send Request
             if (_shouldTrace)
@@ -9173,7 +9424,7 @@ private void Initialize()
                 ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
             }
             cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await this.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            _httpResponse = await HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             if (_shouldTrace)
             {
                 ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
@@ -9187,7 +9438,7 @@ private void Initialize()
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    KeyVaultError _errorBody = SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, this.DeserializationSettings);
+                    KeyVaultError _errorBody =  SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, DeserializationSettings);
                     if (_errorBody != null)
                     {
                         ex.Body = _errorBody;
@@ -9224,7 +9475,7 @@ private void Initialize()
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = SafeJsonConvert.DeserializeObject<Page<SecretItem>>(_responseContent, this.DeserializationSettings);
+                    _result.Body = SafeJsonConvert.DeserializeObject<Page<SecretItem>>(_responseContent, DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -9244,7 +9495,7 @@ private void Initialize()
         }
 
         /// <summary>
-        /// List certificates in the specified vault
+        /// List certificates in a specified key vault
         /// </summary>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -9264,6 +9515,9 @@ private void Initialize()
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
@@ -9290,26 +9544,28 @@ private void Initialize()
             List<string> _queryParameters = new List<string>();
             if (_queryParameters.Count > 0)
             {
-                _url += "?" + string.Join("&", _queryParameters);
+                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
             }
             // Create HTTP transport objects
-            HttpRequestMessage _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
-            _httpRequest.RequestUri = new Uri(_url);
+            var _httpRequest = new System.Net.Http.HttpRequestMessage();
+            System.Net.Http.HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new System.Net.Http.HttpMethod("GET");
+            _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
-            if (this.GenerateClientRequestId != null && this.GenerateClientRequestId.Value)
+            if (GenerateClientRequestId != null && GenerateClientRequestId.Value)
             {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", Guid.NewGuid().ToString());
+                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
             }
-            if (this.AcceptLanguage != null)
+            if (AcceptLanguage != null)
             {
                 if (_httpRequest.Headers.Contains("accept-language"))
                 {
                     _httpRequest.Headers.Remove("accept-language");
                 }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", this.AcceptLanguage);
+                _httpRequest.Headers.TryAddWithoutValidation("accept-language", AcceptLanguage);
             }
+
+
             if (customHeaders != null)
             {
                 foreach(var _header in customHeaders)
@@ -9325,10 +9581,10 @@ private void Initialize()
             // Serialize Request
             string _requestContent = null;
             // Set Credentials
-            if (this.Credentials != null)
+            if (Credentials != null)
             {
                 cancellationToken.ThrowIfCancellationRequested();
-                await this.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+                await Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             }
             // Send Request
             if (_shouldTrace)
@@ -9336,7 +9592,7 @@ private void Initialize()
                 ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
             }
             cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await this.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            _httpResponse = await HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             if (_shouldTrace)
             {
                 ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
@@ -9350,7 +9606,7 @@ private void Initialize()
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    KeyVaultError _errorBody = SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, this.DeserializationSettings);
+                    KeyVaultError _errorBody =  SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, DeserializationSettings);
                     if (_errorBody != null)
                     {
                         ex.Body = _errorBody;
@@ -9387,7 +9643,7 @@ private void Initialize()
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = SafeJsonConvert.DeserializeObject<Page<CertificateItem>>(_responseContent, this.DeserializationSettings);
+                    _result.Body = SafeJsonConvert.DeserializeObject<Page<CertificateItem>>(_responseContent, DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -9407,7 +9663,7 @@ private void Initialize()
         }
 
         /// <summary>
-        /// List certificate issuers for the specified vault.
+        /// List certificate issuers for a specified key vault.
         /// </summary>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -9427,6 +9683,9 @@ private void Initialize()
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
@@ -9453,26 +9712,28 @@ private void Initialize()
             List<string> _queryParameters = new List<string>();
             if (_queryParameters.Count > 0)
             {
-                _url += "?" + string.Join("&", _queryParameters);
+                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
             }
             // Create HTTP transport objects
-            HttpRequestMessage _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
-            _httpRequest.RequestUri = new Uri(_url);
+            var _httpRequest = new System.Net.Http.HttpRequestMessage();
+            System.Net.Http.HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new System.Net.Http.HttpMethod("GET");
+            _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
-            if (this.GenerateClientRequestId != null && this.GenerateClientRequestId.Value)
+            if (GenerateClientRequestId != null && GenerateClientRequestId.Value)
             {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", Guid.NewGuid().ToString());
+                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
             }
-            if (this.AcceptLanguage != null)
+            if (AcceptLanguage != null)
             {
                 if (_httpRequest.Headers.Contains("accept-language"))
                 {
                     _httpRequest.Headers.Remove("accept-language");
                 }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", this.AcceptLanguage);
+                _httpRequest.Headers.TryAddWithoutValidation("accept-language", AcceptLanguage);
             }
+
+
             if (customHeaders != null)
             {
                 foreach(var _header in customHeaders)
@@ -9488,10 +9749,10 @@ private void Initialize()
             // Serialize Request
             string _requestContent = null;
             // Set Credentials
-            if (this.Credentials != null)
+            if (Credentials != null)
             {
                 cancellationToken.ThrowIfCancellationRequested();
-                await this.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+                await Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             }
             // Send Request
             if (_shouldTrace)
@@ -9499,7 +9760,7 @@ private void Initialize()
                 ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
             }
             cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await this.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            _httpResponse = await HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             if (_shouldTrace)
             {
                 ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
@@ -9513,7 +9774,7 @@ private void Initialize()
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    KeyVaultError _errorBody = SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, this.DeserializationSettings);
+                    KeyVaultError _errorBody =  SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, DeserializationSettings);
                     if (_errorBody != null)
                     {
                         ex.Body = _errorBody;
@@ -9550,7 +9811,7 @@ private void Initialize()
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = SafeJsonConvert.DeserializeObject<Page<CertificateIssuerItem>>(_responseContent, this.DeserializationSettings);
+                    _result.Body = SafeJsonConvert.DeserializeObject<Page<CertificateIssuerItem>>(_responseContent, DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -9590,6 +9851,9 @@ private void Initialize()
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
@@ -9616,26 +9880,28 @@ private void Initialize()
             List<string> _queryParameters = new List<string>();
             if (_queryParameters.Count > 0)
             {
-                _url += "?" + string.Join("&", _queryParameters);
+                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
             }
             // Create HTTP transport objects
-            HttpRequestMessage _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
-            _httpRequest.RequestUri = new Uri(_url);
+            var _httpRequest = new System.Net.Http.HttpRequestMessage();
+            System.Net.Http.HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new System.Net.Http.HttpMethod("GET");
+            _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
-            if (this.GenerateClientRequestId != null && this.GenerateClientRequestId.Value)
+            if (GenerateClientRequestId != null && GenerateClientRequestId.Value)
             {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", Guid.NewGuid().ToString());
+                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
             }
-            if (this.AcceptLanguage != null)
+            if (AcceptLanguage != null)
             {
                 if (_httpRequest.Headers.Contains("accept-language"))
                 {
                     _httpRequest.Headers.Remove("accept-language");
                 }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", this.AcceptLanguage);
+                _httpRequest.Headers.TryAddWithoutValidation("accept-language", AcceptLanguage);
             }
+
+
             if (customHeaders != null)
             {
                 foreach(var _header in customHeaders)
@@ -9651,10 +9917,10 @@ private void Initialize()
             // Serialize Request
             string _requestContent = null;
             // Set Credentials
-            if (this.Credentials != null)
+            if (Credentials != null)
             {
                 cancellationToken.ThrowIfCancellationRequested();
-                await this.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+                await Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             }
             // Send Request
             if (_shouldTrace)
@@ -9662,7 +9928,7 @@ private void Initialize()
                 ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
             }
             cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await this.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            _httpResponse = await HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             if (_shouldTrace)
             {
                 ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
@@ -9676,7 +9942,7 @@ private void Initialize()
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    KeyVaultError _errorBody = SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, this.DeserializationSettings);
+                    KeyVaultError _errorBody =  SafeJsonConvert.DeserializeObject<KeyVaultError>(_responseContent, DeserializationSettings);
                     if (_errorBody != null)
                     {
                         ex.Body = _errorBody;
@@ -9713,7 +9979,7 @@ private void Initialize()
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = SafeJsonConvert.DeserializeObject<Page<CertificateItem>>(_responseContent, this.DeserializationSettings);
+                    _result.Body = SafeJsonConvert.DeserializeObject<Page<CertificateItem>>(_responseContent, DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -9734,3 +10000,4 @@ private void Initialize()
 
     }
 }
+
diff --git a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/KeyVaultClientExtensions.cs b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/KeyVaultClientExtensions.cs
index 8471db409c90c..26b4717a3cc0e 100644
--- a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/KeyVaultClientExtensions.cs
+++ b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/KeyVaultClientExtensions.cs
@@ -1,21 +1,21 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-// 
-// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
 // Changes may cause incorrect behavior and will be lost if the code is
 // regenerated.
 
 namespace Microsoft.Azure.KeyVault
 {
-    using System;
+    using Azure;
+    using Rest;
+    using Rest.Azure;
+    using Models;
     using System.Collections;
     using System.Collections.Generic;
     using System.Threading;
     using System.Threading.Tasks;
-    using Microsoft.Rest;
-    using Microsoft.Rest.Azure;
-    using Models;
     using Microsoft.Azure.KeyVault.WebKey;
 
     /// <summary>
@@ -24,31 +24,35 @@ namespace Microsoft.Azure.KeyVault
     public static partial class KeyVaultClientExtensions
     {
             /// <summary>
-            /// Creates a new, named, key in the specified vault.
+            /// Creates a new key, stores it, then returns key parameters and attributes to
+            /// the client. The create key operation can be used to create any key type in
+            /// Azure Key Vault. If the named key already exists, Azure Key Vault creates a
+            /// new version of the key. Authorization: Requires the keys/create permission.
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='vaultBaseUrl'>
-            /// The vault name, e.g. https://myvault.vault.azure.net
+            /// The vault name, for example https://myvault.vault.azure.net.
             /// </param>
             /// <param name='keyName'>
-            /// The name of the key
+            /// The name for the new key. The system will generate the version name for the
+            /// new key.
             /// </param>
             /// <param name='kty'>
-            /// The type of key to create. Valid key types, see JsonWebKeyType. Supported
-            /// JsonWebKey key types (kty) for Elliptic Curve, RSA, HSM, Octet. Possible
-            /// values include: 'EC', 'RSA', 'RSA-HSM', 'oct'
+            /// The type of key to create. For valid key types, see JsonWebKeyType.
+            /// Supported JsonWebKey key types (kty) for Elliptic Curve, RSA, HSM, Octet.
+            /// Possible values include: 'EC', 'RSA', 'RSA-HSM', 'oct'
             /// </param>
             /// <param name='keySize'>
-            /// The key size in bytes. e.g. 1024 or 2048.
+            /// The key size in bytes. For example, 1024 or 2048.
             /// </param>
             /// <param name='keyOps'>
             /// </param>
             /// <param name='keyAttributes'>
             /// </param>
             /// <param name='tags'>
-            /// Application-specific metadata in the form of key-value pairs
+            /// Application specific metadata in the form of key-value pairs.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -62,28 +66,32 @@ public static partial class KeyVaultClientExtensions
             }
 
             /// <summary>
-            /// Imports a key into the specified vault
+            /// Imports an externally created key, stores it, and returns key parameters
+            /// and attributes to the client. The import key operation may be used to
+            /// import any key type into an Azure Key Vault. If the named key already
+            /// exists, Azure Key Vault creates a new version of the key. Authorization:
+            /// requires the keys/import permission.
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='vaultBaseUrl'>
-            /// The vault name, e.g. https://myvault.vault.azure.net
+            /// The vault name, for example https://myvault.vault.azure.net.
             /// </param>
             /// <param name='keyName'>
-            /// The name of the key
+            /// Name for the imported key.
             /// </param>
             /// <param name='key'>
             /// The Json web key
             /// </param>
             /// <param name='hsm'>
-            /// Whether to import as a hardware key (HSM) or software key
+            /// Whether to import as a hardware key (HSM) or software key.
             /// </param>
             /// <param name='keyAttributes'>
-            /// The key management attributes
+            /// The key management attributes.
             /// </param>
             /// <param name='tags'>
-            /// Application-specific metadata in the form of key-value pairs
+            /// Application specific metadata in the form of key-value pairs.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -97,16 +105,20 @@ public static partial class KeyVaultClientExtensions
             }
 
             /// <summary>
-            /// Deletes the specified key
+            /// Deletes a key of any type from storage in Azure Key Vault. The delete key
+            /// operation cannot be used to remove individual versions of a key. This
+            /// operation removes the cryptographic material associated with the key, which
+            /// means the key is not usable for Sign/Verify, Wrap/Unwrap or Encrypt/Decrypt
+            /// operations. Authorization: Requires the keys/delete permission.
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='vaultBaseUrl'>
-            /// The vault name, e.g. https://myvault.vault.azure.net
+            /// The vault name, for example https://myvault.vault.azure.net.
             /// </param>
             /// <param name='keyName'>
-            /// The name of the key
+            /// The name of the key to delete.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -120,19 +132,23 @@ public static partial class KeyVaultClientExtensions
             }
 
             /// <summary>
-            /// Updates the Key Attributes associated with the specified key
+            /// The update key operation changes specified attributes of a stored key and
+            /// can be applied to any key type and key version stored in Azure Key Vault.
+            /// The cryptographic material of a key itself cannot be changed. In order to
+            /// perform this operation, the key must already exist in the Key Vault.
+            /// Authorization: requires the keys/update permission.
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='vaultBaseUrl'>
-            /// The vault name, e.g. https://myvault.vault.azure.net
+            /// The vault name, for example https://myvault.vault.azure.net.
             /// </param>
             /// <param name='keyName'>
-            /// The name of the key
+            /// The name of key to update.
             /// </param>
             /// <param name='keyVersion'>
-            /// The version of the key
+            /// The version of the key to update.
             /// </param>
             /// <param name='keyOps'>
             /// Json web key operations. For more information on possible key operations,
@@ -141,7 +157,7 @@ public static partial class KeyVaultClientExtensions
             /// <param name='keyAttributes'>
             /// </param>
             /// <param name='tags'>
-            /// Application-specific metadata in the form of key-value pairs
+            /// Application specific metadata in the form of key-value pairs.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -155,19 +171,22 @@ public static partial class KeyVaultClientExtensions
             }
 
             /// <summary>
-            /// Retrieves the public portion of a key plus its attributes
+            /// Gets the public part of a stored key. The get key operation is applicable
+            /// to all key types. If the requested key is symmetric, then no key material
+            /// is released in the response. Authorization: Requires the keys/get
+            /// permission.
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='vaultBaseUrl'>
-            /// The vault name, e.g. https://myvault.vault.azure.net
+            /// The vault name, for example https://myvault.vault.azure.net.
             /// </param>
             /// <param name='keyName'>
-            /// The name of the key
+            /// The name of the key to get.
             /// </param>
             /// <param name='keyVersion'>
-            /// The version of the key
+            /// Adding the version parameter retrieves a specific version of a key.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -181,20 +200,22 @@ public static partial class KeyVaultClientExtensions
             }
 
             /// <summary>
-            /// List the versions of the specified key
+            /// Retrieves a list of individual key versions with the same key name. The
+            /// full key identifier, attributes, and tags are provided in the response.
+            /// Authorization: Requires the keys/list permission.
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='vaultBaseUrl'>
-            /// The vault name, e.g. https://myvault.vault.azure.net
+            /// The vault name, for example https://myvault.vault.azure.net.
             /// </param>
             /// <param name='keyName'>
-            /// The name of the key
+            /// The name of the key.
             /// </param>
             /// <param name='maxresults'>
-            /// Maximum number of results to return in a page. If not specified the
-            /// service will return up to 25 results.
+            /// Maximum number of results to return in a page. If not specified the service
+            /// will return up to 25 results.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -208,17 +229,17 @@ public static partial class KeyVaultClientExtensions
             }
 
             /// <summary>
-            /// List keys in the specified vault
+            /// List keys in the specified vault.
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='vaultBaseUrl'>
-            /// The vault name, e.g. https://myvault.vault.azure.net
+            /// The vault name, for example https://myvault.vault.azure.net.
             /// </param>
             /// <param name='maxresults'>
-            /// Maximum number of results to return in a page. If not specified the
-            /// service will return up to 25 results.
+            /// Maximum number of results to return in a page. If not specified the service
+            /// will return up to 25 results.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -238,10 +259,10 @@ public static partial class KeyVaultClientExtensions
             /// The operations group for this extension method.
             /// </param>
             /// <param name='vaultBaseUrl'>
-            /// The vault name, e.g. https://myvault.vault.azure.net
+            /// The vault name, for example https://myvault.vault.azure.net.
             /// </param>
             /// <param name='keyName'>
-            /// The name of the key
+            /// The name of the key.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -255,16 +276,16 @@ public static partial class KeyVaultClientExtensions
             }
 
             /// <summary>
-            /// Restores the backup key in to a vault
+            /// Restores a backed up key to a vault.
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='vaultBaseUrl'>
-            /// The vault name, e.g. https://myvault.vault.azure.net
+            /// The vault name, for example https://myvault.vault.azure.net.
             /// </param>
             /// <param name='keyBundleBackup'>
-            /// the backup blob associated with a key bundle
+            /// The backup blob associated with a key bundle.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -279,19 +300,19 @@ public static partial class KeyVaultClientExtensions
 
             /// <summary>
             /// Encrypts an arbitrary sequence of bytes using an encryption key that is
-            /// stored in Azure Key Vault.
+            /// stored in a key vault.
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='vaultBaseUrl'>
-            /// The vault name, e.g. https://myvault.vault.azure.net
+            /// The vault name, for example https://myvault.vault.azure.net.
             /// </param>
             /// <param name='keyName'>
-            /// The name of the key
+            /// The name of the key.
             /// </param>
             /// <param name='keyVersion'>
-            /// The version of the key
+            /// The version of the key.
             /// </param>
             /// <param name='algorithm'>
             /// algorithm identifier. Possible values include: 'RSA-OAEP', 'RSA1_5'
@@ -310,19 +331,19 @@ public static partial class KeyVaultClientExtensions
             }
 
             /// <summary>
-            /// Decrypts a single block of encrypted data
+            /// Decrypts a single block of encrypted data.
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='vaultBaseUrl'>
-            /// The vault name, e.g. https://myvault.vault.azure.net
+            /// The vault name, for example https://myvault.vault.azure.net.
             /// </param>
             /// <param name='keyName'>
-            /// The name of the key
+            /// The name of the key.
             /// </param>
             /// <param name='keyVersion'>
-            /// The version of the key
+            /// The version of the key.
             /// </param>
             /// <param name='algorithm'>
             /// algorithm identifier. Possible values include: 'RSA-OAEP', 'RSA1_5'
@@ -341,24 +362,24 @@ public static partial class KeyVaultClientExtensions
             }
 
             /// <summary>
-            /// Creates a signature from a digest using the specified key in the vault
+            /// Creates a signature from a digest using the specified key.
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='vaultBaseUrl'>
-            /// The vault name, e.g. https://myvault.vault.azure.net
+            /// The vault name, for example https://myvault.vault.azure.net.
             /// </param>
             /// <param name='keyName'>
-            /// The name of the key
+            /// The name of the key.
             /// </param>
             /// <param name='keyVersion'>
-            /// The version of the key
+            /// The version of the key.
             /// </param>
             /// <param name='algorithm'>
             /// The signing/verification algorithm identifier. For more information on
-            /// possible algorithm types, see JsonWebKeySignatureAlgorithm. Possible
-            /// values include: 'RS256', 'RS384', 'RS512', 'RSNULL'
+            /// possible algorithm types, see JsonWebKeySignatureAlgorithm. Possible values
+            /// include: 'RS256', 'RS384', 'RS512', 'RSNULL'
             /// </param>
             /// <param name='value'>
             /// </param>
@@ -374,30 +395,30 @@ public static partial class KeyVaultClientExtensions
             }
 
             /// <summary>
-            /// Verifies a signature using the specified key
+            /// Verifies a signature using a specified key.
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='vaultBaseUrl'>
-            /// The vault name, e.g. https://myvault.vault.azure.net
+            /// The vault name, for example https://myvault.vault.azure.net.
             /// </param>
             /// <param name='keyName'>
-            /// The name of the key
+            /// The name of the key.
             /// </param>
             /// <param name='keyVersion'>
-            /// The version of the key
+            /// The version of the key.
             /// </param>
             /// <param name='algorithm'>
             /// The signing/verification algorithm. For more information on possible
-            /// algorithm types, see JsonWebKeySignatureAlgorithm. Possible values
-            /// include: 'RS256', 'RS384', 'RS512', 'RSNULL'
+            /// algorithm types, see JsonWebKeySignatureAlgorithm. Possible values include:
+            /// 'RS256', 'RS384', 'RS512', 'RSNULL'
             /// </param>
             /// <param name='digest'>
-            /// The digest used for signing
+            /// The digest used for signing.
             /// </param>
             /// <param name='signature'>
-            /// The signature to be verified
+            /// The signature to be verified.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -411,19 +432,19 @@ public static partial class KeyVaultClientExtensions
             }
 
             /// <summary>
-            /// Wraps a symmetric key using the specified key
+            /// Wraps a symmetric key using a specified key.
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='vaultBaseUrl'>
-            /// The vault name, e.g. https://myvault.vault.azure.net
+            /// The vault name, for example https://myvault.vault.azure.net.
             /// </param>
             /// <param name='keyName'>
-            /// The name of the key
+            /// The name of the key.
             /// </param>
             /// <param name='keyVersion'>
-            /// The version of the key
+            /// The version of the key.
             /// </param>
             /// <param name='algorithm'>
             /// algorithm identifier. Possible values include: 'RSA-OAEP', 'RSA1_5'
@@ -442,20 +463,20 @@ public static partial class KeyVaultClientExtensions
             }
 
             /// <summary>
-            /// Unwraps a symmetric key using the specified key in the vault that has
-            /// initially been used for wrapping the key.
+            /// Unwraps a symmetric key using the specified key that was initially used for
+            /// wrapping that key.
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='vaultBaseUrl'>
-            /// The vault name, e.g. https://myvault.vault.azure.net
+            /// The vault name, for example https://myvault.vault.azure.net.
             /// </param>
             /// <param name='keyName'>
-            /// The name of the key
+            /// The name of the key.
             /// </param>
             /// <param name='keyVersion'>
-            /// The version of the key
+            /// The version of the key.
             /// </param>
             /// <param name='algorithm'>
             /// algorithm identifier. Possible values include: 'RSA-OAEP', 'RSA1_5'
@@ -474,28 +495,28 @@ public static partial class KeyVaultClientExtensions
             }
 
             /// <summary>
-            /// Sets a secret in the specified vault.
+            /// Sets a secret in a specified key vault.
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='vaultBaseUrl'>
-            /// The vault name, e.g. https://myvault.vault.azure.net
+            /// The vault name, for example https://myvault.vault.azure.net.
             /// </param>
             /// <param name='secretName'>
-            /// The name of the secret in the given vault
+            /// The name of the secret.
             /// </param>
             /// <param name='value'>
-            /// The value of the secret
+            /// The value of the secret.
             /// </param>
             /// <param name='tags'>
-            /// Application-specific metadata in the form of key-value pairs
+            /// Application specific metadata in the form of key-value pairs.
             /// </param>
             /// <param name='contentType'>
-            /// Type of the secret value such as a password
+            /// Type of the secret value such as a password.
             /// </param>
             /// <param name='secretAttributes'>
-            /// The secret management attributes
+            /// The secret management attributes.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -509,16 +530,16 @@ public static partial class KeyVaultClientExtensions
             }
 
             /// <summary>
-            /// Deletes a secret from the specified vault.
+            /// Deletes a secret from a specified key vault.
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='vaultBaseUrl'>
-            /// The vault name, e.g. https://myvault.vault.azure.net
+            /// The vault name, for example https://myvault.vault.azure.net.
             /// </param>
             /// <param name='secretName'>
-            /// The name of the secret in the given vault
+            /// The name of the secret.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -532,28 +553,29 @@ public static partial class KeyVaultClientExtensions
             }
 
             /// <summary>
-            /// Updates the attributes associated with the specified secret
+            /// Updates the attributes associated with a specified secret in a given key
+            /// vault.
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='vaultBaseUrl'>
-            /// The vault name, e.g. https://myvault.vault.azure.net
+            /// The vault name, for example https://myvault.vault.azure.net.
             /// </param>
             /// <param name='secretName'>
-            /// The name of the secret in the given vault
+            /// The name of the secret.
             /// </param>
             /// <param name='secretVersion'>
-            /// The version of the secret
+            /// The version of the secret.
             /// </param>
             /// <param name='contentType'>
-            /// Type of the secret value such as a password
+            /// Type of the secret value such as a password.
             /// </param>
             /// <param name='secretAttributes'>
-            /// The secret management attributes
+            /// The secret management attributes.
             /// </param>
             /// <param name='tags'>
-            /// Application-specific metadata in the form of key-value pairs
+            /// Application specific metadata in the form of key-value pairs.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -567,19 +589,19 @@ public static partial class KeyVaultClientExtensions
             }
 
             /// <summary>
-            /// Gets a secret.
+            /// Get a specified secret from a given key vault.
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='vaultBaseUrl'>
-            /// The vault name, e.g. https://myvault.vault.azure.net
+            /// The vault name, for example https://myvault.vault.azure.net.
             /// </param>
             /// <param name='secretName'>
-            /// The name of the secret in the given vault
+            /// The name of the secret.
             /// </param>
             /// <param name='secretVersion'>
-            /// The version of the secret
+            /// The version of the secret.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -593,17 +615,17 @@ public static partial class KeyVaultClientExtensions
             }
 
             /// <summary>
-            /// List secrets in the specified vault
+            /// List secrets in a specified key vault
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='vaultBaseUrl'>
-            /// The vault name, e.g. https://myvault.vault.azure.net
+            /// The vault name, for example https://myvault.vault.azure.net.
             /// </param>
             /// <param name='maxresults'>
-            /// Maximum number of results to return in a page. If not specified the
-            /// service will return up to 25 results.
+            /// Maximum number of results to return in a page. If not specified the service
+            /// will return up to 25 results.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -617,20 +639,20 @@ public static partial class KeyVaultClientExtensions
             }
 
             /// <summary>
-            /// List the versions of the specified secret
+            /// List the versions of the specified secret.
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='vaultBaseUrl'>
-            /// The vault name, e.g. https://myvault.vault.azure.net
+            /// The vault name, for example https://myvault.vault.azure.net.
             /// </param>
             /// <param name='secretName'>
-            /// The name of the secret in the given vault
+            /// The name of the secret.
             /// </param>
             /// <param name='maxresults'>
-            /// Maximum number of results to return in a page. If not specified the
-            /// service will return up to 25 results.
+            /// Maximum number of results to return in a page. If not specified the service
+            /// will return up to 25 results.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -644,17 +666,17 @@ public static partial class KeyVaultClientExtensions
             }
 
             /// <summary>
-            /// List certificates in the specified vault
+            /// List certificates in a specified key vault
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='vaultBaseUrl'>
-            /// The vault name, e.g. https://myvault.vault.azure.net
+            /// The vault name, for example https://myvault.vault.azure.net.
             /// </param>
             /// <param name='maxresults'>
-            /// Maximum number of results to return in a page. If not specified the
-            /// service will return up to 25 results.
+            /// Maximum number of results to return in a page. If not specified the service
+            /// will return up to 25 results.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -668,16 +690,16 @@ public static partial class KeyVaultClientExtensions
             }
 
             /// <summary>
-            /// Deletes a certificate from the specified vault.
+            /// Deletes a certificate from a specified key vault.
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='vaultBaseUrl'>
-            /// The vault name, e.g. https://myvault.vault.azure.net
+            /// The vault name, for example https://myvault.vault.azure.net.
             /// </param>
             /// <param name='certificateName'>
-            /// The name of the certificate in the given vault
+            /// The name of the certificate.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -691,16 +713,16 @@ public static partial class KeyVaultClientExtensions
             }
 
             /// <summary>
-            /// Sets the certificate contacts for the specified vault.
+            /// Sets the certificate contacts for the specified key vault.
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='vaultBaseUrl'>
-            /// The vault name, e.g. https://myvault.vault.azure.net
+            /// The vault name, for example https://myvault.vault.azure.net.
             /// </param>
             /// <param name='contacts'>
-            /// The contacts for the vault certificates.
+            /// The contacts for the key vault certificate.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -714,13 +736,13 @@ public static partial class KeyVaultClientExtensions
             }
 
             /// <summary>
-            /// Gets the certificate contacts for the specified vault.
+            /// Lists the certificate contacts for a specified key vault.
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='vaultBaseUrl'>
-            /// The vault name, e.g. https://myvault.vault.azure.net
+            /// The vault name, for example https://myvault.vault.azure.net.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -734,13 +756,13 @@ public static partial class KeyVaultClientExtensions
             }
 
             /// <summary>
-            /// Deletes the certificate contacts for the specified vault.
+            /// Deletes the certificate contacts for a specified key vault.
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='vaultBaseUrl'>
-            /// The vault name, e.g. https://myvault.vault.azure.net
+            /// The vault name, for example https://myvault.vault.azure.net.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -754,17 +776,17 @@ public static partial class KeyVaultClientExtensions
             }
 
             /// <summary>
-            /// List certificate issuers for the specified vault.
+            /// List certificate issuers for a specified key vault.
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='vaultBaseUrl'>
-            /// The vault name, e.g. https://myvault.vault.azure.net
+            /// The vault name, for example https://myvault.vault.azure.net.
             /// </param>
             /// <param name='maxresults'>
-            /// Maximum number of results to return in a page. If not specified the
-            /// service will return up to 25 results.
+            /// Maximum number of results to return in a page. If not specified the service
+            /// will return up to 25 results.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -784,7 +806,7 @@ public static partial class KeyVaultClientExtensions
             /// The operations group for this extension method.
             /// </param>
             /// <param name='vaultBaseUrl'>
-            /// The vault name, e.g. https://myvault.vault.azure.net
+            /// The vault name, for example https://myvault.vault.azure.net.
             /// </param>
             /// <param name='issuerName'>
             /// The name of the issuer.
@@ -819,7 +841,7 @@ public static partial class KeyVaultClientExtensions
             /// The operations group for this extension method.
             /// </param>
             /// <param name='vaultBaseUrl'>
-            /// The vault name, e.g. https://myvault.vault.azure.net
+            /// The vault name, for example https://myvault.vault.azure.net.
             /// </param>
             /// <param name='issuerName'>
             /// The name of the issuer.
@@ -848,13 +870,13 @@ public static partial class KeyVaultClientExtensions
             }
 
             /// <summary>
-            /// Gets the specified certificate issuer.
+            /// Lists the specified certificate issuer.
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='vaultBaseUrl'>
-            /// The vault name, e.g. https://myvault.vault.azure.net
+            /// The vault name, for example https://myvault.vault.azure.net.
             /// </param>
             /// <param name='issuerName'>
             /// The name of the issuer.
@@ -877,7 +899,7 @@ public static partial class KeyVaultClientExtensions
             /// The operations group for this extension method.
             /// </param>
             /// <param name='vaultBaseUrl'>
-            /// The vault name, e.g. https://myvault.vault.azure.net
+            /// The vault name, for example https://myvault.vault.azure.net.
             /// </param>
             /// <param name='issuerName'>
             /// The name of the issuer.
@@ -894,26 +916,26 @@ public static partial class KeyVaultClientExtensions
             }
 
             /// <summary>
-            /// Creates a new certificate version. If this is the first version, the
-            /// certificate resource is created.
+            /// Creates a new certificate. If this is the first version, the certificate
+            /// resource is created.
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='vaultBaseUrl'>
-            /// The vault name, e.g. https://myvault.vault.azure.net
+            /// The vault name, for example https://myvault.vault.azure.net.
             /// </param>
             /// <param name='certificateName'>
-            /// The name of the certificate
+            /// The name of the certificate.
             /// </param>
             /// <param name='certificatePolicy'>
-            /// The management policy for the certificate
+            /// The management policy for the certificate.
             /// </param>
             /// <param name='certificateAttributes'>
-            /// The attributes of the certificate (optional)
+            /// The attributes of the certificate (optional).
             /// </param>
             /// <param name='tags'>
-            /// Application-specific metadata in the form of key-value pairs
+            /// Application specific metadata in the form of key-value pairs.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -927,16 +949,16 @@ public static partial class KeyVaultClientExtensions
             }
 
             /// <summary>
-            /// Imports a certificate into the specified vault
+            /// Imports a certificate into a specified key vault.
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='vaultBaseUrl'>
-            /// The vault name, e.g. https://myvault.vault.azure.net
+            /// The vault name, for example https://myvault.vault.azure.net.
             /// </param>
             /// <param name='certificateName'>
-            /// The name of the certificate
+            /// The name of the certificate.
             /// </param>
             /// <param name='base64EncodedCertificate'>
             /// Base64 encoded representation of the certificate object to import. This
@@ -944,16 +966,16 @@ public static partial class KeyVaultClientExtensions
             /// </param>
             /// <param name='password'>
             /// If the private key in base64EncodedCertificate is encrypted, the password
-            /// used for encryption
+            /// used for encryption.
             /// </param>
             /// <param name='certificatePolicy'>
-            /// The management policy for the certificate
+            /// The management policy for the certificate.
             /// </param>
             /// <param name='certificateAttributes'>
-            /// The attributes of the certificate (optional)
+            /// The attributes of the certificate (optional).
             /// </param>
             /// <param name='tags'>
-            /// Application-specific metadata in the form of key-value pairs
+            /// Application specific metadata in the form of key-value pairs.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -973,14 +995,14 @@ public static partial class KeyVaultClientExtensions
             /// The operations group for this extension method.
             /// </param>
             /// <param name='vaultBaseUrl'>
-            /// The vault name, e.g. https://myvault.vault.azure.net
+            /// The vault name, for example https://myvault.vault.azure.net.
             /// </param>
             /// <param name='certificateName'>
-            /// The name of the certificate
+            /// The name of the certificate.
             /// </param>
             /// <param name='maxresults'>
-            /// Maximum number of results to return in a page. If not specified the
-            /// service will return up to 25 results.
+            /// Maximum number of results to return in a page. If not specified the service
+            /// will return up to 25 results.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -994,16 +1016,16 @@ public static partial class KeyVaultClientExtensions
             }
 
             /// <summary>
-            /// Gets the policy for a certificate.
+            /// Lists the policy for a certificate.
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='vaultBaseUrl'>
-            /// The vault name, e.g. https://myvault.vault.azure.net
+            /// The vault name, for example https://myvault.vault.azure.net.
             /// </param>
             /// <param name='certificateName'>
-            /// The name of the certificate in the given vault.
+            /// The name of the certificate in a given key vault.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -1017,14 +1039,14 @@ public static partial class KeyVaultClientExtensions
             }
 
             /// <summary>
-            /// Updates the policy for a certificate. Set appropriate members in the
-            /// certificatePolicy that must be updated. Leave others as null.
+            /// Updates the policy for a certificate. Set specified members in the
+            /// certificate policy. Leave others as null.
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='vaultBaseUrl'>
-            /// The vault name, e.g. https://myvault.vault.azure.net
+            /// The vault name, for example https://myvault.vault.azure.net.
             /// </param>
             /// <param name='certificateName'>
             /// The name of the certificate in the given vault.
@@ -1044,28 +1066,28 @@ public static partial class KeyVaultClientExtensions
             }
 
             /// <summary>
-            /// Updates the attributes associated with the specified certificate
+            /// Updates the specified attributes associated with the given certificate.
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='vaultBaseUrl'>
-            /// The vault name, e.g. https://myvault.vault.azure.net
+            /// The vault name, for example https://myvault.vault.azure.net.
             /// </param>
             /// <param name='certificateName'>
-            /// The name of the certificate in the given vault
+            /// The name of the certificate in the given key vault.
             /// </param>
             /// <param name='certificateVersion'>
-            /// The version of the certificate
+            /// The version of the certificate.
             /// </param>
             /// <param name='certificatePolicy'>
-            /// The management policy for the certificate
+            /// The management policy for the certificate.
             /// </param>
             /// <param name='certificateAttributes'>
-            /// The attributes of the certificate (optional)
+            /// The attributes of the certificate (optional).
             /// </param>
             /// <param name='tags'>
-            /// Application-specific metadata in the form of key-value pairs
+            /// Application specific metadata in the form of key-value pairs.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -1079,19 +1101,19 @@ public static partial class KeyVaultClientExtensions
             }
 
             /// <summary>
-            /// Gets a Certificate.
+            /// Gets information about a specified certificate.
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='vaultBaseUrl'>
-            /// The vault name, e.g. https://myvault.vault.azure.net
+            /// The vault name, for example https://myvault.vault.azure.net.
             /// </param>
             /// <param name='certificateName'>
-            /// The name of the certificate in the given vault
+            /// The name of the certificate in the given vault.
             /// </param>
             /// <param name='certificateVersion'>
-            /// The version of the certificate
+            /// The version of the certificate.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -1111,10 +1133,10 @@ public static partial class KeyVaultClientExtensions
             /// The operations group for this extension method.
             /// </param>
             /// <param name='vaultBaseUrl'>
-            /// The vault name, e.g. https://myvault.vault.azure.net
+            /// The vault name, for example https://myvault.vault.azure.net.
             /// </param>
             /// <param name='certificateName'>
-            /// The name of the certificate
+            /// The name of the certificate.
             /// </param>
             /// <param name='cancellationRequested'>
             /// Indicates if cancellation was requested on the certificate operation.
@@ -1131,16 +1153,16 @@ public static partial class KeyVaultClientExtensions
             }
 
             /// <summary>
-            /// Gets the certificate operation response.
+            /// Gets the operation associated with a specified certificate.
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='vaultBaseUrl'>
-            /// The vault name, e.g. https://myvault.vault.azure.net
+            /// The vault name, for example https://myvault.vault.azure.net.
             /// </param>
             /// <param name='certificateName'>
-            /// The name of the certificate
+            /// The name of the certificate.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -1154,16 +1176,16 @@ public static partial class KeyVaultClientExtensions
             }
 
             /// <summary>
-            /// Deletes the certificate operation.
+            /// Deletes the operation for a specified certificate.
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='vaultBaseUrl'>
-            /// The vault name, e.g. https://myvault.vault.azure.net
+            /// The vault name, for example https://myvault.vault.azure.net.
             /// </param>
             /// <param name='certificateName'>
-            /// The name of the certificate
+            /// The name of the certificate.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -1177,26 +1199,26 @@ public static partial class KeyVaultClientExtensions
             }
 
             /// <summary>
-            /// Merges a certificate or a certificate chain with a key pair existing on
-            /// the server.
+            /// Merges a certificate or a certificate chain with a key pair existing on the
+            /// server.
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='vaultBaseUrl'>
-            /// The vault name, e.g. https://myvault.vault.azure.net
+            /// The vault name, for example https://myvault.vault.azure.net.
             /// </param>
             /// <param name='certificateName'>
-            /// The name of the certificate
+            /// The name of the certificate.
             /// </param>
             /// <param name='x509Certificates'>
-            /// The certificate or the certificate chain to merge
+            /// The certificate or the certificate chain to merge.
             /// </param>
             /// <param name='certificateAttributes'>
-            /// The attributes of the certificate (optional)
+            /// The attributes of the certificate (optional).
             /// </param>
             /// <param name='tags'>
-            /// Application-specific metadata in the form of key-value pairs
+            /// Application specific metadata in the form of key-value pairs.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -1210,7 +1232,9 @@ public static partial class KeyVaultClientExtensions
             }
 
             /// <summary>
-            /// List the versions of the specified key
+            /// Retrieves a list of individual key versions with the same key name. The
+            /// full key identifier, attributes, and tags are provided in the response.
+            /// Authorization: Requires the keys/list permission.
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1230,7 +1254,7 @@ public static partial class KeyVaultClientExtensions
             }
 
             /// <summary>
-            /// List keys in the specified vault
+            /// List keys in the specified vault.
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1250,7 +1274,7 @@ public static partial class KeyVaultClientExtensions
             }
 
             /// <summary>
-            /// List secrets in the specified vault
+            /// List secrets in a specified key vault
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1270,7 +1294,7 @@ public static partial class KeyVaultClientExtensions
             }
 
             /// <summary>
-            /// List the versions of the specified secret
+            /// List the versions of the specified secret.
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1290,7 +1314,7 @@ public static partial class KeyVaultClientExtensions
             }
 
             /// <summary>
-            /// List certificates in the specified vault
+            /// List certificates in a specified key vault
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1310,7 +1334,7 @@ public static partial class KeyVaultClientExtensions
             }
 
             /// <summary>
-            /// List certificate issuers for the specified vault.
+            /// List certificate issuers for a specified key vault.
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1351,3 +1375,4 @@ public static partial class KeyVaultClientExtensions
 
     }
 }
+
diff --git a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/Action.cs b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/Action.cs
index 6d098fa6f937a..37cd35ed1adcc 100644
--- a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/Action.cs
+++ b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/Action.cs
@@ -1,20 +1,17 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-// 
-// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
 // Changes may cause incorrect behavior and will be lost if the code is
 // regenerated.
 
 namespace Microsoft.Azure.KeyVault.Models
 {
-    using System;
-    using System.Linq;
-    using System.Collections.Generic;
+    using Azure;
+    using KeyVault;
     using Newtonsoft.Json;
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Microsoft.Rest.Azure;
+    using System.Linq;
 
     /// <summary>
     /// The action that will be executed.
@@ -45,3 +42,4 @@ public Action() { }
 
     }
 }
+
diff --git a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/ActionType.cs b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/ActionType.cs
index 474d693ba7739..34c70dbeceddb 100644
--- a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/ActionType.cs
+++ b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/ActionType.cs
@@ -1,15 +1,18 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-// 
-// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
 // Changes may cause incorrect behavior and will be lost if the code is
 // regenerated.
 
 namespace Microsoft.Azure.KeyVault.Models
 {
+    using Azure;
+    using KeyVault;
     using Newtonsoft.Json;
     using Newtonsoft.Json.Converters;
+    using System.Runtime;
     using System.Runtime.Serialization;
 
     /// <summary>
@@ -24,3 +27,4 @@ public enum ActionType
         AutoRenew
     }
 }
+
diff --git a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/AdministratorDetails.cs b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/AdministratorDetails.cs
index 41ab274e1e0f5..52412a3477afa 100644
--- a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/AdministratorDetails.cs
+++ b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/AdministratorDetails.cs
@@ -1,23 +1,20 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-// 
-// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
 // Changes may cause incorrect behavior and will be lost if the code is
 // regenerated.
 
 namespace Microsoft.Azure.KeyVault.Models
 {
-    using System;
-    using System.Linq;
-    using System.Collections.Generic;
+    using Azure;
+    using KeyVault;
     using Newtonsoft.Json;
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Microsoft.Rest.Azure;
+    using System.Linq;
 
     /// <summary>
-    /// Details of the organization administrator of the certificate issuer
+    /// Details of the organization administrator of the certificate issuer.
     /// </summary>
     public partial class AdministratorDetails
     {
@@ -67,3 +64,4 @@ public AdministratorDetails() { }
 
     }
 }
+
diff --git a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/Attributes.cs b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/Attributes.cs
index ff6f82a638b04..6ffb4fd6cb04e 100644
--- a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/Attributes.cs
+++ b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/Attributes.cs
@@ -1,23 +1,22 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-// 
-// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
 // Changes may cause incorrect behavior and will be lost if the code is
 // regenerated.
 
 namespace Microsoft.Azure.KeyVault.Models
 {
-    using System;
-    using System.Linq;
-    using System.Collections.Generic;
+    using Azure;
+    using KeyVault;
+    using Rest;
+    using Rest.Serialization;
     using Newtonsoft.Json;
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Microsoft.Rest.Azure;
+    using System.Linq;
 
     /// <summary>
-    /// The object attributes managed by the KeyVault service
+    /// The object attributes managed by the KeyVault service.
     /// </summary>
     public partial class Attributes
     {
@@ -30,12 +29,12 @@ public Attributes() { }
         /// Initializes a new instance of the Attributes class.
         /// </summary>
         /// <param name="enabled">Determines whether the object is
-        /// enabled</param>
-        /// <param name="notBefore">Not before date in UTC</param>
-        /// <param name="expires">Expiry date in UTC</param>
-        /// <param name="created">Creation time in UTC</param>
-        /// <param name="updated">Last updated time in UTC</param>
-        public Attributes(bool? enabled = default(bool?), DateTime? notBefore = default(DateTime?), DateTime? expires = default(DateTime?), DateTime? created = default(DateTime?), DateTime? updated = default(DateTime?))
+        /// enabled.</param>
+        /// <param name="notBefore">Not before date in UTC.</param>
+        /// <param name="expires">Expiry date in UTC.</param>
+        /// <param name="created">Creation time in UTC.</param>
+        /// <param name="updated">Last updated time in UTC.</param>
+        public Attributes(bool? enabled = default(bool?), System.DateTime? notBefore = default(System.DateTime?), System.DateTime? expires = default(System.DateTime?), System.DateTime? created = default(System.DateTime?), System.DateTime? updated = default(System.DateTime?))
         {
             Enabled = enabled;
             NotBefore = notBefore;
@@ -45,38 +44,39 @@ public Attributes() { }
         }
 
         /// <summary>
-        /// Gets or sets determines whether the object is enabled
+        /// Gets or sets determines whether the object is enabled.
         /// </summary>
         [JsonProperty(PropertyName = "enabled")]
         public bool? Enabled { get; set; }
 
         /// <summary>
-        /// Gets or sets not before date in UTC
+        /// Gets or sets not before date in UTC.
         /// </summary>
         [JsonConverter(typeof(UnixTimeJsonConverter))]
         [JsonProperty(PropertyName = "nbf")]
-        public DateTime? NotBefore { get; set; }
+        public System.DateTime? NotBefore { get; set; }
 
         /// <summary>
-        /// Gets or sets expiry date in UTC
+        /// Gets or sets expiry date in UTC.
         /// </summary>
         [JsonConverter(typeof(UnixTimeJsonConverter))]
         [JsonProperty(PropertyName = "exp")]
-        public DateTime? Expires { get; set; }
+        public System.DateTime? Expires { get; set; }
 
         /// <summary>
-        /// Gets creation time in UTC
+        /// Gets creation time in UTC.
         /// </summary>
         [JsonConverter(typeof(UnixTimeJsonConverter))]
         [JsonProperty(PropertyName = "created")]
-        public DateTime? Created { get; private set; }
+        public System.DateTime? Created { get; protected set; }
 
         /// <summary>
-        /// Gets last updated time in UTC
+        /// Gets last updated time in UTC.
         /// </summary>
         [JsonConverter(typeof(UnixTimeJsonConverter))]
         [JsonProperty(PropertyName = "updated")]
-        public DateTime? Updated { get; private set; }
+        public System.DateTime? Updated { get; protected set; }
 
     }
 }
+
diff --git a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/BackupKeyResult.cs b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/BackupKeyResult.cs
index 218bb1a7b4230..8c31511e6a16c 100644
--- a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/BackupKeyResult.cs
+++ b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/BackupKeyResult.cs
@@ -1,23 +1,22 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-// 
-// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
 // Changes may cause incorrect behavior and will be lost if the code is
 // regenerated.
 
 namespace Microsoft.Azure.KeyVault.Models
 {
-    using System;
-    using System.Linq;
-    using System.Collections.Generic;
+    using Azure;
+    using KeyVault;
+    using Rest;
+    using Rest.Serialization;
     using Newtonsoft.Json;
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Microsoft.Rest.Azure;
+    using System.Linq;
 
     /// <summary>
-    /// The backup key result, containing the backup blob
+    /// The backup key result, containing the backup blob.
     /// </summary>
     public partial class BackupKeyResult
     {
@@ -30,18 +29,19 @@ public BackupKeyResult() { }
         /// Initializes a new instance of the BackupKeyResult class.
         /// </summary>
         /// <param name="value">The backup blob containing the backed up
-        /// key</param>
+        /// key.</param>
         public BackupKeyResult(byte[] value = default(byte[]))
         {
             Value = value;
         }
 
         /// <summary>
-        /// Gets the backup blob containing the backed up key
+        /// Gets the backup blob containing the backed up key.
         /// </summary>
         [JsonConverter(typeof(Base64UrlJsonConverter))]
         [JsonProperty(PropertyName = "value")]
-        public byte[] Value { get; private set; }
+        public byte[] Value { get; protected set; }
 
     }
 }
+
diff --git a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/CertificateAttributes.cs b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/CertificateAttributes.cs
index 17210a4762c3a..9328e8e620142 100644
--- a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/CertificateAttributes.cs
+++ b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/CertificateAttributes.cs
@@ -1,23 +1,19 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-// 
-// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
 // Changes may cause incorrect behavior and will be lost if the code is
 // regenerated.
 
 namespace Microsoft.Azure.KeyVault.Models
 {
-    using System;
+    using Azure;
+    using KeyVault;
     using System.Linq;
-    using System.Collections.Generic;
-    using Newtonsoft.Json;
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Microsoft.Rest.Azure;
 
     /// <summary>
-    /// The certificate management attributes
+    /// The certificate management attributes.
     /// </summary>
     public partial class CertificateAttributes : Attributes
     {
@@ -30,15 +26,16 @@ public CertificateAttributes() { }
         /// Initializes a new instance of the CertificateAttributes class.
         /// </summary>
         /// <param name="enabled">Determines whether the object is
-        /// enabled</param>
-        /// <param name="notBefore">Not before date in UTC</param>
-        /// <param name="expires">Expiry date in UTC</param>
-        /// <param name="created">Creation time in UTC</param>
-        /// <param name="updated">Last updated time in UTC</param>
-        public CertificateAttributes(bool? enabled = default(bool?), DateTime? notBefore = default(DateTime?), DateTime? expires = default(DateTime?), DateTime? created = default(DateTime?), DateTime? updated = default(DateTime?))
+        /// enabled.</param>
+        /// <param name="notBefore">Not before date in UTC.</param>
+        /// <param name="expires">Expiry date in UTC.</param>
+        /// <param name="created">Creation time in UTC.</param>
+        /// <param name="updated">Last updated time in UTC.</param>
+        public CertificateAttributes(bool? enabled = default(bool?), System.DateTime? notBefore = default(System.DateTime?), System.DateTime? expires = default(System.DateTime?), System.DateTime? created = default(System.DateTime?), System.DateTime? updated = default(System.DateTime?))
             : base(enabled, notBefore, expires, created, updated)
         {
         }
 
     }
 }
+
diff --git a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/CertificateBundle.cs b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/CertificateBundle.cs
index d6b64bdaa7024..4b60bd384ae49 100644
--- a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/CertificateBundle.cs
+++ b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/CertificateBundle.cs
@@ -1,20 +1,21 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-// 
-// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
 // Changes may cause incorrect behavior and will be lost if the code is
 // regenerated.
 
 namespace Microsoft.Azure.KeyVault.Models
 {
-    using System;
-    using System.Linq;
-    using System.Collections.Generic;
+    using Azure;
+    using KeyVault;
+    using Rest;
+    using Rest.Serialization;
     using Newtonsoft.Json;
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Microsoft.Rest.Azure;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Linq;
 
     /// <summary>
     /// A certificate bundle consists of a certificate (X509) plus its
@@ -30,15 +31,15 @@ public CertificateBundle() { }
         /// <summary>
         /// Initializes a new instance of the CertificateBundle class.
         /// </summary>
-        /// <param name="id">The certificate id</param>
-        /// <param name="kid">The key id</param>
-        /// <param name="sid">The secret id</param>
+        /// <param name="id">The certificate id.</param>
+        /// <param name="kid">The key id.</param>
+        /// <param name="sid">The secret id.</param>
         /// <param name="x509Thumbprint">Thumbprint of the certificate.</param>
         /// <param name="policy">The management policy.</param>
         /// <param name="cer">CER contents of x509 certificate.</param>
-        /// <param name="contentType">The content type of the secret</param>
+        /// <param name="contentType">The content type of the secret.</param>
         /// <param name="attributes">The certificate attributes.</param>
-        /// <param name="tags">Application-specific metadata in the form of
+        /// <param name="tags">Application specific metadata in the form of
         /// key-value pairs</param>
         public CertificateBundle(string id = default(string), string kid = default(string), string sid = default(string), byte[] x509Thumbprint = default(byte[]), CertificatePolicy policy = default(CertificatePolicy), byte[] cer = default(byte[]), string contentType = default(string), CertificateAttributes attributes = default(CertificateAttributes), IDictionary<string, string> tags = default(IDictionary<string, string>))
         {
@@ -54,35 +55,35 @@ public CertificateBundle() { }
         }
 
         /// <summary>
-        /// Gets the certificate id
+        /// Gets the certificate id.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public string Id { get; private set; }
+        public string Id { get; protected set; }
 
         /// <summary>
-        /// Gets the key id
+        /// Gets the key id.
         /// </summary>
         [JsonProperty(PropertyName = "kid")]
-        public string Kid { get; private set; }
+        public string Kid { get; protected set; }
 
         /// <summary>
-        /// Gets the secret id
+        /// Gets the secret id.
         /// </summary>
         [JsonProperty(PropertyName = "sid")]
-        public string Sid { get; private set; }
+        public string Sid { get; protected set; }
 
         /// <summary>
         /// Gets thumbprint of the certificate.
         /// </summary>
         [JsonConverter(typeof(Base64UrlJsonConverter))]
         [JsonProperty(PropertyName = "x5t")]
-        public byte[] X509Thumbprint { get; private set; }
+        public byte[] X509Thumbprint { get; protected set; }
 
         /// <summary>
         /// Gets the management policy.
         /// </summary>
         [JsonProperty(PropertyName = "policy")]
-        public CertificatePolicy Policy { get; private set; }
+        public CertificatePolicy Policy { get; protected set; }
 
         /// <summary>
         /// Gets or sets CER contents of x509 certificate.
@@ -91,7 +92,7 @@ public CertificateBundle() { }
         public byte[] Cer { get; set; }
 
         /// <summary>
-        /// Gets or sets the content type of the secret
+        /// Gets or sets the content type of the secret.
         /// </summary>
         [JsonProperty(PropertyName = "contentType")]
         public string ContentType { get; set; }
@@ -103,8 +104,8 @@ public CertificateBundle() { }
         public CertificateAttributes Attributes { get; set; }
 
         /// <summary>
-        /// Gets or sets application-specific metadata in the form of
-        /// key-value pairs
+        /// Gets or sets application specific metadata in the form of key-value
+        /// pairs
         /// </summary>
         [JsonProperty(PropertyName = "tags")]
         public IDictionary<string, string> Tags { get; set; }
@@ -117,10 +118,11 @@ public CertificateBundle() { }
         /// </exception>
         public virtual void Validate()
         {
-            if (this.Policy != null)
+            if (Policy != null)
             {
-                this.Policy.Validate();
+                Policy.Validate();
             }
         }
     }
 }
+
diff --git a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/CertificateCreateParameters.cs b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/CertificateCreateParameters.cs
index fe3078450e504..2e7a7db8ddc74 100644
--- a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/CertificateCreateParameters.cs
+++ b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/CertificateCreateParameters.cs
@@ -1,23 +1,22 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-// 
-// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
 // Changes may cause incorrect behavior and will be lost if the code is
 // regenerated.
 
 namespace Microsoft.Azure.KeyVault.Models
 {
-    using System;
-    using System.Linq;
-    using System.Collections.Generic;
+    using Azure;
+    using KeyVault;
     using Newtonsoft.Json;
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Microsoft.Rest.Azure;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Linq;
 
     /// <summary>
-    /// The certificate create parameters
+    /// The certificate create parameters.
     /// </summary>
     public partial class CertificateCreateParameters
     {
@@ -32,11 +31,11 @@ public CertificateCreateParameters() { }
         /// class.
         /// </summary>
         /// <param name="certificatePolicy">The management policy for the
-        /// certificate</param>
+        /// certificate.</param>
         /// <param name="certificateAttributes">The attributes of the
-        /// certificate (optional)</param>
-        /// <param name="tags">Application-specific metadata in the form of
-        /// key-value pairs</param>
+        /// certificate (optional).</param>
+        /// <param name="tags">Application specific metadata in the form of
+        /// key-value pairs.</param>
         public CertificateCreateParameters(CertificatePolicy certificatePolicy = default(CertificatePolicy), CertificateAttributes certificateAttributes = default(CertificateAttributes), IDictionary<string, string> tags = default(IDictionary<string, string>))
         {
             CertificatePolicy = certificatePolicy;
@@ -45,20 +44,20 @@ public CertificateCreateParameters() { }
         }
 
         /// <summary>
-        /// Gets or sets the management policy for the certificate
+        /// Gets or sets the management policy for the certificate.
         /// </summary>
         [JsonProperty(PropertyName = "policy")]
         public CertificatePolicy CertificatePolicy { get; set; }
 
         /// <summary>
-        /// Gets or sets the attributes of the certificate (optional)
+        /// Gets or sets the attributes of the certificate (optional).
         /// </summary>
         [JsonProperty(PropertyName = "attributes")]
         public CertificateAttributes CertificateAttributes { get; set; }
 
         /// <summary>
-        /// Gets or sets application-specific metadata in the form of
-        /// key-value pairs
+        /// Gets or sets application specific metadata in the form of key-value
+        /// pairs.
         /// </summary>
         [JsonProperty(PropertyName = "tags")]
         public IDictionary<string, string> Tags { get; set; }
@@ -66,15 +65,16 @@ public CertificateCreateParameters() { }
         /// <summary>
         /// Validate the object.
         /// </summary>
-        /// <exception cref="ValidationException">
+        /// <exception cref="Rest.ValidationException">
         /// Thrown if validation fails
         /// </exception>
         public virtual void Validate()
         {
-            if (this.CertificatePolicy != null)
+            if (CertificatePolicy != null)
             {
-                this.CertificatePolicy.Validate();
+                CertificatePolicy.Validate();
             }
         }
     }
 }
+
diff --git a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/CertificateImportParameters.cs b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/CertificateImportParameters.cs
index aaaf6733251d8..b0f9321f70ed8 100644
--- a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/CertificateImportParameters.cs
+++ b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/CertificateImportParameters.cs
@@ -1,23 +1,23 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-// 
-// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
 // Changes may cause incorrect behavior and will be lost if the code is
 // regenerated.
 
 namespace Microsoft.Azure.KeyVault.Models
 {
-    using System;
-    using System.Linq;
-    using System.Collections.Generic;
+    using Azure;
+    using KeyVault;
+    using Rest;
     using Newtonsoft.Json;
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Microsoft.Rest.Azure;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Linq;
 
     /// <summary>
-    /// The certificate import parameters
+    /// The certificate import parameters.
     /// </summary>
     public partial class CertificateImportParameters
     {
@@ -36,13 +36,13 @@ public CertificateImportParameters() { }
         /// certificate needs to contain the private key.</param>
         /// <param name="password">If the private key in
         /// base64EncodedCertificate is encrypted, the password used for
-        /// encryption</param>
+        /// encryption.</param>
         /// <param name="certificatePolicy">The management policy for the
-        /// certificate</param>
+        /// certificate.</param>
         /// <param name="certificateAttributes">The attributes of the
-        /// certificate (optional)</param>
-        /// <param name="tags">Application-specific metadata in the form of
-        /// key-value pairs</param>
+        /// certificate (optional).</param>
+        /// <param name="tags">Application specific metadata in the form of
+        /// key-value pairs.</param>
         public CertificateImportParameters(string base64EncodedCertificate, string password = default(string), CertificatePolicy certificatePolicy = default(CertificatePolicy), CertificateAttributes certificateAttributes = default(CertificateAttributes), IDictionary<string, string> tags = default(IDictionary<string, string>))
         {
             Base64EncodedCertificate = base64EncodedCertificate;
@@ -62,26 +62,26 @@ public CertificateImportParameters() { }
 
         /// <summary>
         /// Gets or sets if the private key in base64EncodedCertificate is
-        /// encrypted, the password used for encryption
+        /// encrypted, the password used for encryption.
         /// </summary>
         [JsonProperty(PropertyName = "pwd")]
         public string Password { get; set; }
 
         /// <summary>
-        /// Gets or sets the management policy for the certificate
+        /// Gets or sets the management policy for the certificate.
         /// </summary>
         [JsonProperty(PropertyName = "policy")]
         public CertificatePolicy CertificatePolicy { get; set; }
 
         /// <summary>
-        /// Gets or sets the attributes of the certificate (optional)
+        /// Gets or sets the attributes of the certificate (optional).
         /// </summary>
         [JsonProperty(PropertyName = "attributes")]
         public CertificateAttributes CertificateAttributes { get; set; }
 
         /// <summary>
-        /// Gets or sets application-specific metadata in the form of
-        /// key-value pairs
+        /// Gets or sets application specific metadata in the form of key-value
+        /// pairs.
         /// </summary>
         [JsonProperty(PropertyName = "tags")]
         public IDictionary<string, string> Tags { get; set; }
@@ -98,10 +98,11 @@ public virtual void Validate()
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "Base64EncodedCertificate");
             }
-            if (this.CertificatePolicy != null)
+            if (CertificatePolicy != null)
             {
-                this.CertificatePolicy.Validate();
+                CertificatePolicy.Validate();
             }
         }
     }
 }
+
diff --git a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/CertificateIssuerItem.cs b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/CertificateIssuerItem.cs
index 28d2e6f842df6..c8dadd507cf2b 100644
--- a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/CertificateIssuerItem.cs
+++ b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/CertificateIssuerItem.cs
@@ -1,23 +1,20 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-// 
-// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
 // Changes may cause incorrect behavior and will be lost if the code is
 // regenerated.
 
 namespace Microsoft.Azure.KeyVault.Models
 {
-    using System;
-    using System.Linq;
-    using System.Collections.Generic;
+    using Azure;
+    using KeyVault;
     using Newtonsoft.Json;
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Microsoft.Rest.Azure;
+    using System.Linq;
 
     /// <summary>
-    /// The certificate issuer item containing certificate issuer metadata
+    /// The certificate issuer item containing certificate issuer metadata.
     /// </summary>
     public partial class CertificateIssuerItem
     {
@@ -29,7 +26,7 @@ public CertificateIssuerItem() { }
         /// <summary>
         /// Initializes a new instance of the CertificateIssuerItem class.
         /// </summary>
-        /// <param name="id">Certificate Identifier</param>
+        /// <param name="id">Certificate Identifier.</param>
         /// <param name="provider">The issuer provider.</param>
         public CertificateIssuerItem(string id = default(string), string provider = default(string))
         {
@@ -38,7 +35,7 @@ public CertificateIssuerItem() { }
         }
 
         /// <summary>
-        /// Gets or sets certificate Identifier
+        /// Gets or sets certificate Identifier.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public string Id { get; set; }
@@ -51,3 +48,4 @@ public CertificateIssuerItem() { }
 
     }
 }
+
diff --git a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/CertificateIssuerSetParameters.cs b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/CertificateIssuerSetParameters.cs
index 5aa1293567e2d..8d60aaba15b99 100644
--- a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/CertificateIssuerSetParameters.cs
+++ b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/CertificateIssuerSetParameters.cs
@@ -1,20 +1,18 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-// 
-// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
 // Changes may cause incorrect behavior and will be lost if the code is
 // regenerated.
 
 namespace Microsoft.Azure.KeyVault.Models
 {
-    using System;
-    using System.Linq;
-    using System.Collections.Generic;
+    using Azure;
+    using KeyVault;
+    using Rest;
     using Newtonsoft.Json;
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Microsoft.Rest.Azure;
+    using System.Linq;
 
     /// <summary>
     /// The certificate issuer set parameters.
@@ -84,3 +82,4 @@ public virtual void Validate()
         }
     }
 }
+
diff --git a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/CertificateIssuerUpdateParameters.cs b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/CertificateIssuerUpdateParameters.cs
index c3c59b44a3e55..b391b4e562835 100644
--- a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/CertificateIssuerUpdateParameters.cs
+++ b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/CertificateIssuerUpdateParameters.cs
@@ -1,20 +1,17 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-// 
-// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
 // Changes may cause incorrect behavior and will be lost if the code is
 // regenerated.
 
 namespace Microsoft.Azure.KeyVault.Models
 {
-    using System;
-    using System.Linq;
-    using System.Collections.Generic;
+    using Azure;
+    using KeyVault;
     using Newtonsoft.Json;
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Microsoft.Rest.Azure;
+    using System.Linq;
 
     /// <summary>
     /// The certificate issuer update parameters.
@@ -22,14 +19,14 @@ namespace Microsoft.Azure.KeyVault.Models
     public partial class CertificateIssuerUpdateParameters
     {
         /// <summary>
-        /// Initializes a new instance of the
-        /// CertificateIssuerUpdateParameters class.
+        /// Initializes a new instance of the CertificateIssuerUpdateParameters
+        /// class.
         /// </summary>
         public CertificateIssuerUpdateParameters() { }
 
         /// <summary>
-        /// Initializes a new instance of the
-        /// CertificateIssuerUpdateParameters class.
+        /// Initializes a new instance of the CertificateIssuerUpdateParameters
+        /// class.
         /// </summary>
         /// <param name="provider">The issuer provider.</param>
         /// <param name="credentials">The credentials to be used for the
@@ -71,3 +68,4 @@ public CertificateIssuerUpdateParameters() { }
 
     }
 }
+
diff --git a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/CertificateItem.cs b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/CertificateItem.cs
index 6170c7e01f107..ebed0de045329 100644
--- a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/CertificateItem.cs
+++ b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/CertificateItem.cs
@@ -1,23 +1,24 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-// 
-// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
 // Changes may cause incorrect behavior and will be lost if the code is
 // regenerated.
 
 namespace Microsoft.Azure.KeyVault.Models
 {
-    using System;
-    using System.Linq;
-    using System.Collections.Generic;
+    using Azure;
+    using KeyVault;
+    using Rest;
+    using Rest.Serialization;
     using Newtonsoft.Json;
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Microsoft.Rest.Azure;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Linq;
 
     /// <summary>
-    /// The certificate item containing certificate metadata
+    /// The certificate item containing certificate metadata.
     /// </summary>
     public partial class CertificateItem
     {
@@ -29,11 +30,11 @@ public CertificateItem() { }
         /// <summary>
         /// Initializes a new instance of the CertificateItem class.
         /// </summary>
-        /// <param name="id">Certificate Identifier</param>
+        /// <param name="id">Certificate identifier.</param>
         /// <param name="attributes">The certificate management
-        /// attributes</param>
-        /// <param name="tags">Application-specific metadata in the form of
-        /// key-value pairs</param>
+        /// attributes.</param>
+        /// <param name="tags">Application specific metadata in the form of
+        /// key-value pairs.</param>
         /// <param name="x509Thumbprint">Thumbprint of the certificate.</param>
         public CertificateItem(string id = default(string), CertificateAttributes attributes = default(CertificateAttributes), IDictionary<string, string> tags = default(IDictionary<string, string>), byte[] x509Thumbprint = default(byte[]))
         {
@@ -44,20 +45,20 @@ public CertificateItem() { }
         }
 
         /// <summary>
-        /// Gets or sets certificate Identifier
+        /// Gets or sets certificate identifier.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public string Id { get; set; }
 
         /// <summary>
-        /// Gets or sets the certificate management attributes
+        /// Gets or sets the certificate management attributes.
         /// </summary>
         [JsonProperty(PropertyName = "attributes")]
         public CertificateAttributes Attributes { get; set; }
 
         /// <summary>
-        /// Gets or sets application-specific metadata in the form of
-        /// key-value pairs
+        /// Gets or sets application specific metadata in the form of key-value
+        /// pairs.
         /// </summary>
         [JsonProperty(PropertyName = "tags")]
         public IDictionary<string, string> Tags { get; set; }
@@ -71,3 +72,4 @@ public CertificateItem() { }
 
     }
 }
+
diff --git a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/CertificateMergeParameters.cs b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/CertificateMergeParameters.cs
index 42a5d91b99006..dc25348b41f65 100644
--- a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/CertificateMergeParameters.cs
+++ b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/CertificateMergeParameters.cs
@@ -1,20 +1,20 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-// 
-// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
 // Changes may cause incorrect behavior and will be lost if the code is
 // regenerated.
 
 namespace Microsoft.Azure.KeyVault.Models
 {
-    using System;
-    using System.Linq;
-    using System.Collections.Generic;
+    using Azure;
+    using KeyVault;
+    using Rest;
     using Newtonsoft.Json;
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Microsoft.Rest.Azure;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Linq;
 
     /// <summary>
     /// The certificate merge parameters
@@ -30,11 +30,11 @@ public CertificateMergeParameters() { }
         /// Initializes a new instance of the CertificateMergeParameters class.
         /// </summary>
         /// <param name="x509Certificates">The certificate or the certificate
-        /// chain to merge</param>
+        /// chain to merge.</param>
         /// <param name="certificateAttributes">The attributes of the
-        /// certificate (optional)</param>
-        /// <param name="tags">Application-specific metadata in the form of
-        /// key-value pairs</param>
+        /// certificate (optional).</param>
+        /// <param name="tags">Application specific metadata in the form of
+        /// key-value pairs.</param>
         public CertificateMergeParameters(IList<byte[]> x509Certificates, CertificateAttributes certificateAttributes = default(CertificateAttributes), IDictionary<string, string> tags = default(IDictionary<string, string>))
         {
             X509Certificates = x509Certificates;
@@ -43,20 +43,20 @@ public CertificateMergeParameters() { }
         }
 
         /// <summary>
-        /// Gets or sets the certificate or the certificate chain to merge
+        /// Gets or sets the certificate or the certificate chain to merge.
         /// </summary>
         [JsonProperty(PropertyName = "x5c")]
         public IList<byte[]> X509Certificates { get; set; }
 
         /// <summary>
-        /// Gets or sets the attributes of the certificate (optional)
+        /// Gets or sets the attributes of the certificate (optional).
         /// </summary>
         [JsonProperty(PropertyName = "attributes")]
         public CertificateAttributes CertificateAttributes { get; set; }
 
         /// <summary>
-        /// Gets or sets application-specific metadata in the form of
-        /// key-value pairs
+        /// Gets or sets application specific metadata in the form of key-value
+        /// pairs.
         /// </summary>
         [JsonProperty(PropertyName = "tags")]
         public IDictionary<string, string> Tags { get; set; }
@@ -76,3 +76,4 @@ public virtual void Validate()
         }
     }
 }
+
diff --git a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/CertificateOperation.cs b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/CertificateOperation.cs
index dcb8b9d355f63..1c7805705e0b7 100644
--- a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/CertificateOperation.cs
+++ b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/CertificateOperation.cs
@@ -1,23 +1,20 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-// 
-// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
 // Changes may cause incorrect behavior and will be lost if the code is
 // regenerated.
 
 namespace Microsoft.Azure.KeyVault.Models
 {
-    using System;
-    using System.Linq;
-    using System.Collections.Generic;
+    using Azure;
+    using KeyVault;
     using Newtonsoft.Json;
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Microsoft.Rest.Azure;
+    using System.Linq;
 
     /// <summary>
-    /// A certificate operation is returned in case of async requests.
+    /// A certificate operation is returned in case of asynchronous requests.
     /// </summary>
     public partial class CertificateOperation
     {
@@ -29,10 +26,10 @@ public CertificateOperation() { }
         /// <summary>
         /// Initializes a new instance of the CertificateOperation class.
         /// </summary>
-        /// <param name="id">The certificate id</param>
+        /// <param name="id">The certificate id.</param>
         /// <param name="issuerParameters">Parameters for the issuer of the
         /// X509 component of a certificate.</param>
-        /// <param name="csr">The Certificate Signing Request (CSR) that is
+        /// <param name="csr">The certificate signing request (CSR) that is
         /// being used in the certificate operation.</param>
         /// <param name="cancellationRequested">Indicates if cancellation was
         /// requested on the certificate operation.</param>
@@ -59,10 +56,10 @@ public CertificateOperation() { }
         }
 
         /// <summary>
-        /// Gets the certificate id
+        /// Gets the certificate id.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public string Id { get; private set; }
+        public string Id { get; protected set; }
 
         /// <summary>
         /// Gets or sets parameters for the issuer of the X509 component of a
@@ -72,7 +69,7 @@ public CertificateOperation() { }
         public IssuerParameters IssuerParameters { get; set; }
 
         /// <summary>
-        /// Gets or sets the Certificate Signing Request (CSR) that is being
+        /// Gets or sets the certificate signing request (CSR) that is being
         /// used in the certificate operation.
         /// </summary>
         [JsonProperty(PropertyName = "csr")]
@@ -119,3 +116,4 @@ public CertificateOperation() { }
 
     }
 }
+
diff --git a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/CertificateOperationUpdateParameter.cs b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/CertificateOperationUpdateParameter.cs
index 9cd2a98d65a47..cb3036fa99e7d 100644
--- a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/CertificateOperationUpdateParameter.cs
+++ b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/CertificateOperationUpdateParameter.cs
@@ -1,20 +1,17 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-// 
-// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
 // Changes may cause incorrect behavior and will be lost if the code is
 // regenerated.
 
 namespace Microsoft.Azure.KeyVault.Models
 {
-    using System;
-    using System.Linq;
-    using System.Collections.Generic;
+    using Azure;
+    using KeyVault;
     using Newtonsoft.Json;
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Microsoft.Rest.Azure;
+    using System.Linq;
 
     /// <summary>
     /// The certificate operation update parameters.
@@ -48,7 +45,7 @@ public CertificateOperationUpdateParameter(bool cancellationRequested)
         /// <summary>
         /// Validate the object.
         /// </summary>
-        /// <exception cref="ValidationException">
+        /// <exception cref="Rest.ValidationException">
         /// Thrown if validation fails
         /// </exception>
         public virtual void Validate()
@@ -57,3 +54,4 @@ public virtual void Validate()
         }
     }
 }
+
diff --git a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/CertificatePolicy.cs b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/CertificatePolicy.cs
index 1111e94819dcb..08f47efe92793 100644
--- a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/CertificatePolicy.cs
+++ b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/CertificatePolicy.cs
@@ -1,20 +1,19 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-// 
-// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
 // Changes may cause incorrect behavior and will be lost if the code is
 // regenerated.
 
 namespace Microsoft.Azure.KeyVault.Models
 {
-    using System;
-    using System.Linq;
-    using System.Collections.Generic;
+    using Azure;
+    using KeyVault;
     using Newtonsoft.Json;
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Microsoft.Rest.Azure;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Linq;
 
     /// <summary>
     /// Management policy for a certificate.
@@ -29,15 +28,15 @@ public CertificatePolicy() { }
         /// <summary>
         /// Initializes a new instance of the CertificatePolicy class.
         /// </summary>
-        /// <param name="id">The certificate id</param>
+        /// <param name="id">The certificate id.</param>
         /// <param name="keyProperties">Properties of the key backing a
         /// certificate.</param>
         /// <param name="secretProperties">Properties of the secret backing a
         /// certificate.</param>
         /// <param name="x509CertificateProperties">Properties of the X509
         /// component of a certificate.</param>
-        /// <param name="lifetimeActions">Actions that will be performed by
-        /// Key Vault over the lifetime of a certificate.</param>
+        /// <param name="lifetimeActions">Actions that will be performed by Key
+        /// Vault over the lifetime of a certificate.</param>
         /// <param name="issuerParameters">Parameters for the issuer of the
         /// X509 component of a certificate.</param>
         /// <param name="attributes">The certificate attributes.</param>
@@ -53,10 +52,10 @@ public CertificatePolicy() { }
         }
 
         /// <summary>
-        /// Gets the certificate id
+        /// Gets the certificate id.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public string Id { get; private set; }
+        public string Id { get; protected set; }
 
         /// <summary>
         /// Gets or sets properties of the key backing a certificate.
@@ -99,18 +98,18 @@ public CertificatePolicy() { }
         /// <summary>
         /// Validate the object.
         /// </summary>
-        /// <exception cref="ValidationException">
+        /// <exception cref="Rest.ValidationException">
         /// Thrown if validation fails
         /// </exception>
         public virtual void Validate()
         {
-            if (this.X509CertificateProperties != null)
+            if (X509CertificateProperties != null)
             {
-                this.X509CertificateProperties.Validate();
+                X509CertificateProperties.Validate();
             }
-            if (this.LifetimeActions != null)
+            if (LifetimeActions != null)
             {
-                foreach (var element in this.LifetimeActions)
+                foreach (var element in LifetimeActions)
                 {
                     if (element != null)
                     {
@@ -121,3 +120,4 @@ public virtual void Validate()
         }
     }
 }
+
diff --git a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/CertificateUpdateParameters.cs b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/CertificateUpdateParameters.cs
index adfc7df09234d..d2f18011f825a 100644
--- a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/CertificateUpdateParameters.cs
+++ b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/CertificateUpdateParameters.cs
@@ -1,23 +1,22 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-// 
-// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
 // Changes may cause incorrect behavior and will be lost if the code is
 // regenerated.
 
 namespace Microsoft.Azure.KeyVault.Models
 {
-    using System;
-    using System.Linq;
-    using System.Collections.Generic;
+    using Azure;
+    using KeyVault;
     using Newtonsoft.Json;
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Microsoft.Rest.Azure;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Linq;
 
     /// <summary>
-    /// The certificate update parameters
+    /// The certificate update parameters.
     /// </summary>
     public partial class CertificateUpdateParameters
     {
@@ -32,11 +31,11 @@ public CertificateUpdateParameters() { }
         /// class.
         /// </summary>
         /// <param name="certificatePolicy">The management policy for the
-        /// certificate</param>
+        /// certificate.</param>
         /// <param name="certificateAttributes">The attributes of the
-        /// certificate (optional)</param>
-        /// <param name="tags">Application-specific metadata in the form of
-        /// key-value pairs</param>
+        /// certificate (optional).</param>
+        /// <param name="tags">Application specific metadata in the form of
+        /// key-value pairs.</param>
         public CertificateUpdateParameters(CertificatePolicy certificatePolicy = default(CertificatePolicy), CertificateAttributes certificateAttributes = default(CertificateAttributes), IDictionary<string, string> tags = default(IDictionary<string, string>))
         {
             CertificatePolicy = certificatePolicy;
@@ -45,20 +44,20 @@ public CertificateUpdateParameters() { }
         }
 
         /// <summary>
-        /// Gets or sets the management policy for the certificate
+        /// Gets or sets the management policy for the certificate.
         /// </summary>
         [JsonProperty(PropertyName = "policy")]
         public CertificatePolicy CertificatePolicy { get; set; }
 
         /// <summary>
-        /// Gets or sets the attributes of the certificate (optional)
+        /// Gets or sets the attributes of the certificate (optional).
         /// </summary>
         [JsonProperty(PropertyName = "attributes")]
         public CertificateAttributes CertificateAttributes { get; set; }
 
         /// <summary>
-        /// Gets or sets application-specific metadata in the form of
-        /// key-value pairs
+        /// Gets or sets application specific metadata in the form of key-value
+        /// pairs.
         /// </summary>
         [JsonProperty(PropertyName = "tags")]
         public IDictionary<string, string> Tags { get; set; }
@@ -66,15 +65,16 @@ public CertificateUpdateParameters() { }
         /// <summary>
         /// Validate the object.
         /// </summary>
-        /// <exception cref="ValidationException">
+        /// <exception cref="Rest.ValidationException">
         /// Thrown if validation fails
         /// </exception>
         public virtual void Validate()
         {
-            if (this.CertificatePolicy != null)
+            if (CertificatePolicy != null)
             {
-                this.CertificatePolicy.Validate();
+                CertificatePolicy.Validate();
             }
         }
     }
 }
+
diff --git a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/Contact.cs b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/Contact.cs
index 99e52b75220ab..4fc9829141aca 100644
--- a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/Contact.cs
+++ b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/Contact.cs
@@ -1,20 +1,17 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-// 
-// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
 // Changes may cause incorrect behavior and will be lost if the code is
 // regenerated.
 
 namespace Microsoft.Azure.KeyVault.Models
 {
-    using System;
-    using System.Linq;
-    using System.Collections.Generic;
+    using Azure;
+    using KeyVault;
     using Newtonsoft.Json;
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Microsoft.Rest.Azure;
+    using System.Linq;
 
     /// <summary>
     /// The contact information for the vault certificates.
@@ -59,3 +56,4 @@ public Contact() { }
 
     }
 }
+
diff --git a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/Contacts.cs b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/Contacts.cs
index c62ad8e3efb5f..81e4eb44e4c6f 100644
--- a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/Contacts.cs
+++ b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/Contacts.cs
@@ -1,20 +1,19 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-// 
-// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
 // Changes may cause incorrect behavior and will be lost if the code is
 // regenerated.
 
 namespace Microsoft.Azure.KeyVault.Models
 {
-    using System;
-    using System.Linq;
-    using System.Collections.Generic;
+    using Azure;
+    using KeyVault;
     using Newtonsoft.Json;
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Microsoft.Rest.Azure;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Linq;
 
     /// <summary>
     /// The contacts for the vault certificates.
@@ -42,7 +41,7 @@ public Contacts() { }
         /// Gets identifier for the contacts collection.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public string Id { get; private set; }
+        public string Id { get; protected set; }
 
         /// <summary>
         /// Gets or sets the contact list for the vault certificates.
@@ -52,3 +51,4 @@ public Contacts() { }
 
     }
 }
+
diff --git a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/Error.cs b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/Error.cs
index be85bb73abb3c..c8c100ad496a1 100644
--- a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/Error.cs
+++ b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/Error.cs
@@ -1,23 +1,20 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-// 
-// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
 // Changes may cause incorrect behavior and will be lost if the code is
 // regenerated.
 
 namespace Microsoft.Azure.KeyVault.Models
 {
-    using System;
-    using System.Linq;
-    using System.Collections.Generic;
+    using Azure;
+    using KeyVault;
     using Newtonsoft.Json;
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Microsoft.Rest.Azure;
+    using System.Linq;
 
     /// <summary>
-    /// The key vault server error
+    /// The key vault server error.
     /// </summary>
     public partial class Error
     {
@@ -42,18 +39,19 @@ public Error() { }
         /// Gets the error code.
         /// </summary>
         [JsonProperty(PropertyName = "code")]
-        public string Code { get; private set; }
+        public string Code { get; protected set; }
 
         /// <summary>
         /// Gets the error message.
         /// </summary>
         [JsonProperty(PropertyName = "message")]
-        public string Message { get; private set; }
+        public string Message { get; protected set; }
 
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "innererror")]
-        public Error InnerError { get; private set; }
+        public Error InnerError { get; protected set; }
 
     }
 }
+
diff --git a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/IssuerAttributes.cs b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/IssuerAttributes.cs
index 128e2c9447fd6..a6acf51ec93d6 100644
--- a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/IssuerAttributes.cs
+++ b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/IssuerAttributes.cs
@@ -1,23 +1,22 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-// 
-// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
 // Changes may cause incorrect behavior and will be lost if the code is
 // regenerated.
 
 namespace Microsoft.Azure.KeyVault.Models
 {
-    using System;
-    using System.Linq;
-    using System.Collections.Generic;
+    using Azure;
+    using KeyVault;
+    using Rest;
+    using Rest.Serialization;
     using Newtonsoft.Json;
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Microsoft.Rest.Azure;
+    using System.Linq;
 
     /// <summary>
-    /// The attributes of an issuer managed by the KeyVault service
+    /// The attributes of an issuer managed by the Key Vault service.
     /// </summary>
     public partial class IssuerAttributes
     {
@@ -30,10 +29,10 @@ public IssuerAttributes() { }
         /// Initializes a new instance of the IssuerAttributes class.
         /// </summary>
         /// <param name="enabled">Determines whether the issuer is
-        /// enabled</param>
-        /// <param name="created">Creation time in UTC</param>
-        /// <param name="updated">Last updated time in UTC</param>
-        public IssuerAttributes(bool? enabled = default(bool?), DateTime? created = default(DateTime?), DateTime? updated = default(DateTime?))
+        /// enabled.</param>
+        /// <param name="created">Creation time in UTC.</param>
+        /// <param name="updated">Last updated time in UTC.</param>
+        public IssuerAttributes(bool? enabled = default(bool?), System.DateTime? created = default(System.DateTime?), System.DateTime? updated = default(System.DateTime?))
         {
             Enabled = enabled;
             Created = created;
@@ -41,24 +40,25 @@ public IssuerAttributes() { }
         }
 
         /// <summary>
-        /// Gets or sets determines whether the issuer is enabled
+        /// Gets or sets determines whether the issuer is enabled.
         /// </summary>
         [JsonProperty(PropertyName = "enabled")]
         public bool? Enabled { get; set; }
 
         /// <summary>
-        /// Gets creation time in UTC
+        /// Gets creation time in UTC.
         /// </summary>
         [JsonConverter(typeof(UnixTimeJsonConverter))]
         [JsonProperty(PropertyName = "created")]
-        public DateTime? Created { get; private set; }
+        public System.DateTime? Created { get; protected set; }
 
         /// <summary>
-        /// Gets last updated time in UTC
+        /// Gets last updated time in UTC.
         /// </summary>
         [JsonConverter(typeof(UnixTimeJsonConverter))]
         [JsonProperty(PropertyName = "updated")]
-        public DateTime? Updated { get; private set; }
+        public System.DateTime? Updated { get; protected set; }
 
     }
 }
+
diff --git a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/IssuerBundle.cs b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/IssuerBundle.cs
index 49a7d259f81a5..23ed8ab176e6c 100644
--- a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/IssuerBundle.cs
+++ b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/IssuerBundle.cs
@@ -1,23 +1,20 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-// 
-// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
 // Changes may cause incorrect behavior and will be lost if the code is
 // regenerated.
 
 namespace Microsoft.Azure.KeyVault.Models
 {
-    using System;
-    using System.Linq;
-    using System.Collections.Generic;
+    using Azure;
+    using KeyVault;
     using Newtonsoft.Json;
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Microsoft.Rest.Azure;
+    using System.Linq;
 
     /// <summary>
-    /// The issuer for Key Vault certificate
+    /// The issuer for Key Vault certificate.
     /// </summary>
     public partial class IssuerBundle
     {
@@ -49,7 +46,7 @@ public IssuerBundle() { }
         /// Gets identifier for the issuer object.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public string Id { get; private set; }
+        public string Id { get; protected set; }
 
         /// <summary>
         /// Gets or sets the issuer provider.
@@ -77,3 +74,4 @@ public IssuerBundle() { }
 
     }
 }
+
diff --git a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/IssuerCredentials.cs b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/IssuerCredentials.cs
index 8edf5ee508123..268981889ddb4 100644
--- a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/IssuerCredentials.cs
+++ b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/IssuerCredentials.cs
@@ -1,20 +1,17 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-// 
-// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
 // Changes may cause incorrect behavior and will be lost if the code is
 // regenerated.
 
 namespace Microsoft.Azure.KeyVault.Models
 {
-    using System;
-    using System.Linq;
-    using System.Collections.Generic;
+    using Azure;
+    using KeyVault;
     using Newtonsoft.Json;
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Microsoft.Rest.Azure;
+    using System.Linq;
 
     /// <summary>
     /// The credentials to be used for the certificate issuer.
@@ -52,3 +49,4 @@ public IssuerCredentials() { }
 
     }
 }
+
diff --git a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/IssuerParameters.cs b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/IssuerParameters.cs
index af182d8093dc4..e1d105ee3dade 100644
--- a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/IssuerParameters.cs
+++ b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/IssuerParameters.cs
@@ -1,20 +1,17 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-// 
-// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
 // Changes may cause incorrect behavior and will be lost if the code is
 // regenerated.
 
 namespace Microsoft.Azure.KeyVault.Models
 {
-    using System;
-    using System.Linq;
-    using System.Collections.Generic;
+    using Azure;
+    using KeyVault;
     using Newtonsoft.Json;
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Microsoft.Rest.Azure;
+    using System.Linq;
 
     /// <summary>
     /// Parameters for the issuer of the X509 component of a certificate.
@@ -29,8 +26,8 @@ public IssuerParameters() { }
         /// <summary>
         /// Initializes a new instance of the IssuerParameters class.
         /// </summary>
-        /// <param name="name">Name of the referenced issuer object or
-        /// reserved names e.g. 'Self', 'Unknown'.</param>
+        /// <param name="name">Name of the referenced issuer object or reserved
+        /// names; for example, 'Self' or 'Unknown'.</param>
         /// <param name="certificateType">Type of certificate to be requested
         /// from the issuer provider.</param>
         public IssuerParameters(string name = default(string), string certificateType = default(string))
@@ -41,7 +38,7 @@ public IssuerParameters() { }
 
         /// <summary>
         /// Gets or sets name of the referenced issuer object or reserved
-        /// names e.g. 'Self', 'Unknown'.
+        /// names; for example, 'Self' or 'Unknown'.
         /// </summary>
         [JsonProperty(PropertyName = "name")]
         public string Name { get; set; }
@@ -55,3 +52,4 @@ public IssuerParameters() { }
 
     }
 }
+
diff --git a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeyAttributes.cs b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeyAttributes.cs
index 9a2e023fbe6f0..8559dd8cdc193 100644
--- a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeyAttributes.cs
+++ b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeyAttributes.cs
@@ -1,23 +1,19 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-// 
-// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
 // Changes may cause incorrect behavior and will be lost if the code is
 // regenerated.
 
 namespace Microsoft.Azure.KeyVault.Models
 {
-    using System;
+    using Azure;
+    using KeyVault;
     using System.Linq;
-    using System.Collections.Generic;
-    using Newtonsoft.Json;
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Microsoft.Rest.Azure;
 
     /// <summary>
-    /// The attributes of a key managed by the KeyVault service
+    /// The attributes of a key managed by the key vault service.
     /// </summary>
     public partial class KeyAttributes : Attributes
     {
@@ -30,15 +26,16 @@ public KeyAttributes() { }
         /// Initializes a new instance of the KeyAttributes class.
         /// </summary>
         /// <param name="enabled">Determines whether the object is
-        /// enabled</param>
-        /// <param name="notBefore">Not before date in UTC</param>
-        /// <param name="expires">Expiry date in UTC</param>
-        /// <param name="created">Creation time in UTC</param>
-        /// <param name="updated">Last updated time in UTC</param>
-        public KeyAttributes(bool? enabled = default(bool?), DateTime? notBefore = default(DateTime?), DateTime? expires = default(DateTime?), DateTime? created = default(DateTime?), DateTime? updated = default(DateTime?))
+        /// enabled.</param>
+        /// <param name="notBefore">Not before date in UTC.</param>
+        /// <param name="expires">Expiry date in UTC.</param>
+        /// <param name="created">Creation time in UTC.</param>
+        /// <param name="updated">Last updated time in UTC.</param>
+        public KeyAttributes(bool? enabled = default(bool?), System.DateTime? notBefore = default(System.DateTime?), System.DateTime? expires = default(System.DateTime?), System.DateTime? created = default(System.DateTime?), System.DateTime? updated = default(System.DateTime?))
             : base(enabled, notBefore, expires, created, updated)
         {
         }
 
     }
 }
+
diff --git a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeyBundle.cs b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeyBundle.cs
index 30c72afed3845..15693d6ce6dcd 100644
--- a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeyBundle.cs
+++ b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeyBundle.cs
@@ -1,24 +1,23 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-// 
-// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
 // Changes may cause incorrect behavior and will be lost if the code is
 // regenerated.
 
 namespace Microsoft.Azure.KeyVault.Models
 {
-    using System;
-    using System.Linq;
-    using System.Collections.Generic;
+    using Azure;
+    using KeyVault;
     using Newtonsoft.Json;
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Microsoft.Rest.Azure;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Linq;
     using Microsoft.Azure.KeyVault.WebKey;
 
     /// <summary>
-    /// A KeyBundle consisting of a WebKey plus its Attributes
+    /// A KeyBundle consisting of a WebKey plus its attributes.
     /// </summary>
     public partial class KeyBundle
     {
@@ -30,13 +29,13 @@ public KeyBundle() { }
         /// <summary>
         /// Initializes a new instance of the KeyBundle class.
         /// </summary>
-        /// <param name="key">The Json web key</param>
-        /// <param name="attributes">The key management attributes</param>
-        /// <param name="tags">Application-specific metadata in the form of
-        /// key-value pairs</param>
+        /// <param name="key">The Json web key.</param>
+        /// <param name="attributes">The key management attributes.</param>
+        /// <param name="tags">Application specific metadata in the form of
+        /// key-value pairs.</param>
         /// <param name="managed">True if the key's lifetime is managed by key
-        /// vault i.e. if this is a key backing a certificate, then managed
-        /// will be true.</param>
+        /// vault. If this is a key backing a certificate, then managed will be
+        /// true.</param>
         public KeyBundle(JsonWebKey key = default(JsonWebKey), KeyAttributes attributes = default(KeyAttributes), IDictionary<string, string> tags = default(IDictionary<string, string>), bool? managed = default(bool?))
         {
             Key = key;
@@ -46,30 +45,31 @@ public KeyBundle() { }
         }
 
         /// <summary>
-        /// Gets or sets the Json web key
+        /// Gets or sets the Json web key.
         /// </summary>
         [JsonProperty(PropertyName = "key")]
         public JsonWebKey Key { get; set; }
 
         /// <summary>
-        /// Gets or sets the key management attributes
+        /// Gets or sets the key management attributes.
         /// </summary>
         [JsonProperty(PropertyName = "attributes")]
         public KeyAttributes Attributes { get; set; }
 
         /// <summary>
-        /// Gets or sets application-specific metadata in the form of
-        /// key-value pairs
+        /// Gets or sets application specific metadata in the form of key-value
+        /// pairs.
         /// </summary>
         [JsonProperty(PropertyName = "tags")]
         public IDictionary<string, string> Tags { get; set; }
 
         /// <summary>
-        /// Gets true if the key's lifetime is managed by key vault i.e. if
-        /// this is a key backing a certificate, then managed will be true.
+        /// Gets true if the key's lifetime is managed by key vault. If this is
+        /// a key backing a certificate, then managed will be true.
         /// </summary>
         [JsonProperty(PropertyName = "managed")]
-        public bool? Managed { get; private set; }
+        public bool? Managed { get; protected set; }
 
     }
 }
+
diff --git a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeyCreateParameters.cs b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeyCreateParameters.cs
index f9be3282020b3..3f4a1152cec6e 100644
--- a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeyCreateParameters.cs
+++ b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeyCreateParameters.cs
@@ -1,23 +1,23 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-// 
-// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
 // Changes may cause incorrect behavior and will be lost if the code is
 // regenerated.
 
 namespace Microsoft.Azure.KeyVault.Models
 {
-    using System;
-    using System.Linq;
-    using System.Collections.Generic;
+    using Azure;
+    using KeyVault;
+    using Rest;
     using Newtonsoft.Json;
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Microsoft.Rest.Azure;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Linq;
 
     /// <summary>
-    /// The key create parameters
+    /// The key create parameters.
     /// </summary>
     public partial class KeyCreateParameters
     {
@@ -29,14 +29,14 @@ public KeyCreateParameters() { }
         /// <summary>
         /// Initializes a new instance of the KeyCreateParameters class.
         /// </summary>
-        /// <param name="kty">The type of key to create. Valid key types, see
-        /// JsonWebKeyType. Supported JsonWebKey key types (kty) for Elliptic
-        /// Curve, RSA, HSM, Octet. Possible values include: 'EC', 'RSA',
-        /// 'RSA-HSM', 'oct'</param>
-        /// <param name="keySize">The key size in bytes. e.g. 1024 or
+        /// <param name="kty">The type of key to create. For valid key types,
+        /// see JsonWebKeyType. Supported JsonWebKey key types (kty) for
+        /// Elliptic Curve, RSA, HSM, Octet. Possible values include: 'EC',
+        /// 'RSA', 'RSA-HSM', 'oct'</param>
+        /// <param name="keySize">The key size in bytes. For example, 1024 or
         /// 2048.</param>
-        /// <param name="tags">Application-specific metadata in the form of
-        /// key-value pairs</param>
+        /// <param name="tags">Application specific metadata in the form of
+        /// key-value pairs.</param>
         public KeyCreateParameters(string kty, int? keySize = default(int?), IList<string> keyOps = default(IList<string>), KeyAttributes keyAttributes = default(KeyAttributes), IDictionary<string, string> tags = default(IDictionary<string, string>))
         {
             Kty = kty;
@@ -47,7 +47,7 @@ public KeyCreateParameters() { }
         }
 
         /// <summary>
-        /// Gets or sets the type of key to create. Valid key types, see
+        /// Gets or sets the type of key to create. For valid key types, see
         /// JsonWebKeyType. Supported JsonWebKey key types (kty) for Elliptic
         /// Curve, RSA, HSM, Octet. Possible values include: 'EC', 'RSA',
         /// 'RSA-HSM', 'oct'
@@ -56,7 +56,7 @@ public KeyCreateParameters() { }
         public string Kty { get; set; }
 
         /// <summary>
-        /// Gets or sets the key size in bytes. e.g. 1024 or 2048.
+        /// Gets or sets the key size in bytes. For example, 1024 or 2048.
         /// </summary>
         [JsonProperty(PropertyName = "key_size")]
         public int? KeySize { get; set; }
@@ -72,8 +72,8 @@ public KeyCreateParameters() { }
         public KeyAttributes KeyAttributes { get; set; }
 
         /// <summary>
-        /// Gets or sets application-specific metadata in the form of
-        /// key-value pairs
+        /// Gets or sets application specific metadata in the form of key-value
+        /// pairs.
         /// </summary>
         [JsonProperty(PropertyName = "tags")]
         public IDictionary<string, string> Tags { get; set; }
@@ -90,9 +90,9 @@ public virtual void Validate()
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "Kty");
             }
-            if (this.Kty != null)
+            if (Kty != null)
             {
-                if (this.Kty.Length < 1)
+                if (Kty.Length < 1)
                 {
                     throw new ValidationException(ValidationRules.MinLength, "Kty", 1);
                 }
@@ -100,3 +100,4 @@ public virtual void Validate()
         }
     }
 }
+
diff --git a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeyImportParameters.cs b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeyImportParameters.cs
index ef3b39ae8ccc2..76a306c569a48 100644
--- a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeyImportParameters.cs
+++ b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeyImportParameters.cs
@@ -1,24 +1,24 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-// 
-// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
 // Changes may cause incorrect behavior and will be lost if the code is
 // regenerated.
 
 namespace Microsoft.Azure.KeyVault.Models
 {
-    using System;
-    using System.Linq;
-    using System.Collections.Generic;
+    using Azure;
+    using KeyVault;
+    using Rest;
     using Newtonsoft.Json;
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Microsoft.Rest.Azure;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Linq;
     using Microsoft.Azure.KeyVault.WebKey;
 
     /// <summary>
-    /// The key import parameters
+    /// The key import parameters.
     /// </summary>
     public partial class KeyImportParameters
     {
@@ -32,10 +32,10 @@ public KeyImportParameters() { }
         /// </summary>
         /// <param name="key">The Json web key</param>
         /// <param name="hsm">Whether to import as a hardware key (HSM) or
-        /// software key</param>
-        /// <param name="keyAttributes">The key management attributes</param>
-        /// <param name="tags">Application-specific metadata in the form of
-        /// key-value pairs</param>
+        /// software key.</param>
+        /// <param name="keyAttributes">The key management attributes.</param>
+        /// <param name="tags">Application specific metadata in the form of
+        /// key-value pairs.</param>
         public KeyImportParameters(JsonWebKey key, bool? hsm = default(bool?), KeyAttributes keyAttributes = default(KeyAttributes), IDictionary<string, string> tags = default(IDictionary<string, string>))
         {
             Hsm = hsm;
@@ -46,7 +46,7 @@ public KeyImportParameters() { }
 
         /// <summary>
         /// Gets or sets whether to import as a hardware key (HSM) or software
-        /// key
+        /// key.
         /// </summary>
         [JsonProperty(PropertyName = "Hsm")]
         public bool? Hsm { get; set; }
@@ -58,14 +58,14 @@ public KeyImportParameters() { }
         public JsonWebKey Key { get; set; }
 
         /// <summary>
-        /// Gets or sets the key management attributes
+        /// Gets or sets the key management attributes.
         /// </summary>
         [JsonProperty(PropertyName = "attributes")]
         public KeyAttributes KeyAttributes { get; set; }
 
         /// <summary>
-        /// Gets or sets application-specific metadata in the form of
-        /// key-value pairs
+        /// Gets or sets application specific metadata in the form of key-value
+        /// pairs.
         /// </summary>
         [JsonProperty(PropertyName = "tags")]
         public IDictionary<string, string> Tags { get; set; }
@@ -85,3 +85,4 @@ public virtual void Validate()
         }
     }
 }
+
diff --git a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeyItem.cs b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeyItem.cs
index 8446869015045..3c84926da646a 100644
--- a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeyItem.cs
+++ b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeyItem.cs
@@ -1,23 +1,22 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-// 
-// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
 // Changes may cause incorrect behavior and will be lost if the code is
 // regenerated.
 
 namespace Microsoft.Azure.KeyVault.Models
 {
-    using System;
-    using System.Linq;
-    using System.Collections.Generic;
+    using Azure;
+    using KeyVault;
     using Newtonsoft.Json;
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Microsoft.Rest.Azure;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Linq;
 
     /// <summary>
-    /// The key item containing key metadata
+    /// The key item containing key metadata.
     /// </summary>
     public partial class KeyItem
     {
@@ -29,13 +28,13 @@ public KeyItem() { }
         /// <summary>
         /// Initializes a new instance of the KeyItem class.
         /// </summary>
-        /// <param name="kid">Key Identifier</param>
-        /// <param name="attributes">The key management attributes</param>
-        /// <param name="tags">Application-specific metadata in the form of
-        /// key-value pairs</param>
+        /// <param name="kid">Key identifier.</param>
+        /// <param name="attributes">The key management attributes.</param>
+        /// <param name="tags">Application specific metadata in the form of
+        /// key-value pairs.</param>
         /// <param name="managed">True if the key's lifetime is managed by key
-        /// vault i.e. if this is a key backing a certificate, then managed
-        /// will be true.</param>
+        /// vault. If this is a key backing a certificate, then managed will be
+        /// true.</param>
         public KeyItem(string kid = default(string), KeyAttributes attributes = default(KeyAttributes), IDictionary<string, string> tags = default(IDictionary<string, string>), bool? managed = default(bool?))
         {
             Kid = kid;
@@ -45,30 +44,31 @@ public KeyItem() { }
         }
 
         /// <summary>
-        /// Gets or sets key Identifier
+        /// Gets or sets key identifier.
         /// </summary>
         [JsonProperty(PropertyName = "kid")]
         public string Kid { get; set; }
 
         /// <summary>
-        /// Gets or sets the key management attributes
+        /// Gets or sets the key management attributes.
         /// </summary>
         [JsonProperty(PropertyName = "attributes")]
         public KeyAttributes Attributes { get; set; }
 
         /// <summary>
-        /// Gets or sets application-specific metadata in the form of
-        /// key-value pairs
+        /// Gets or sets application specific metadata in the form of key-value
+        /// pairs.
         /// </summary>
         [JsonProperty(PropertyName = "tags")]
         public IDictionary<string, string> Tags { get; set; }
 
         /// <summary>
-        /// Gets true if the key's lifetime is managed by key vault i.e. if
-        /// this is a key backing a certificate, then managed will be true.
+        /// Gets true if the key's lifetime is managed by key vault. If this is
+        /// a key backing a certificate, then managed will be true.
         /// </summary>
         [JsonProperty(PropertyName = "managed")]
-        public bool? Managed { get; private set; }
+        public bool? Managed { get; protected set; }
 
     }
 }
+
diff --git a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeyOperationResult.cs b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeyOperationResult.cs
index 39d8fc4abcb48..e6e9423950a09 100644
--- a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeyOperationResult.cs
+++ b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeyOperationResult.cs
@@ -1,23 +1,22 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-// 
-// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
 // Changes may cause incorrect behavior and will be lost if the code is
 // regenerated.
 
 namespace Microsoft.Azure.KeyVault.Models
 {
-    using System;
-    using System.Linq;
-    using System.Collections.Generic;
+    using Azure;
+    using KeyVault;
+    using Rest;
+    using Rest.Serialization;
     using Newtonsoft.Json;
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Microsoft.Rest.Azure;
+    using System.Linq;
 
     /// <summary>
-    /// The key operation result
+    /// The key operation result.
     /// </summary>
     public partial class KeyOperationResult
     {
@@ -40,13 +39,14 @@ public KeyOperationResult() { }
         /// Gets key identifier
         /// </summary>
         [JsonProperty(PropertyName = "kid")]
-        public string Kid { get; private set; }
+        public string Kid { get; protected set; }
 
         /// <summary>
         /// </summary>
         [JsonConverter(typeof(Base64UrlJsonConverter))]
         [JsonProperty(PropertyName = "value")]
-        public byte[] Result { get; private set; }
+        public byte[] Result { get; protected set; }
 
     }
 }
+
diff --git a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeyOperationsParameters.cs b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeyOperationsParameters.cs
index 44d81810fb051..e0f0f92a4e639 100644
--- a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeyOperationsParameters.cs
+++ b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeyOperationsParameters.cs
@@ -1,23 +1,22 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-// 
-// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
 // Changes may cause incorrect behavior and will be lost if the code is
 // regenerated.
 
 namespace Microsoft.Azure.KeyVault.Models
 {
-    using System;
-    using System.Linq;
-    using System.Collections.Generic;
+    using Azure;
+    using KeyVault;
+    using Rest;
+    using Rest.Serialization;
     using Newtonsoft.Json;
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Microsoft.Rest.Azure;
+    using System.Linq;
 
     /// <summary>
-    /// The key operations parameters
+    /// The key operations parameters.
     /// </summary>
     public partial class KeyOperationsParameters
     {
@@ -66,9 +65,9 @@ public virtual void Validate()
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "Value");
             }
-            if (this.Algorithm != null)
+            if (Algorithm != null)
             {
-                if (this.Algorithm.Length < 1)
+                if (Algorithm.Length < 1)
                 {
                     throw new ValidationException(ValidationRules.MinLength, "Algorithm", 1);
                 }
@@ -76,3 +75,4 @@ public virtual void Validate()
         }
     }
 }
+
diff --git a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeyProperties.cs b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeyProperties.cs
index ef8f17624e5b2..6902bf6da543b 100644
--- a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeyProperties.cs
+++ b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeyProperties.cs
@@ -1,20 +1,17 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-// 
-// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
 // Changes may cause incorrect behavior and will be lost if the code is
 // regenerated.
 
 namespace Microsoft.Azure.KeyVault.Models
 {
-    using System;
-    using System.Linq;
-    using System.Collections.Generic;
+    using Azure;
+    using KeyVault;
     using Newtonsoft.Json;
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Microsoft.Rest.Azure;
+    using System.Linq;
 
     /// <summary>
     /// Properties of the key pair backing a certificate.
@@ -32,7 +29,8 @@ public KeyProperties() { }
         /// <param name="exportable">Indicates if the private key can be
         /// exported.</param>
         /// <param name="keyType">The key type.</param>
-        /// <param name="keySize">The key size in bytes. e.g. 2048.</param>
+        /// <param name="keySize">The key size in bytes. For example;  1024 or
+        /// 2048.</param>
         /// <param name="reuseKey">Indicates if the same key pair will be used
         /// on certificate renewal.</param>
         public KeyProperties(bool? exportable = default(bool?), string keyType = default(string), int? keySize = default(int?), bool? reuseKey = default(bool?))
@@ -56,7 +54,7 @@ public KeyProperties() { }
         public string KeyType { get; set; }
 
         /// <summary>
-        /// Gets or sets the key size in bytes. e.g. 2048.
+        /// Gets or sets the key size in bytes. For example;  1024 or 2048.
         /// </summary>
         [JsonProperty(PropertyName = "key_size")]
         public int? KeySize { get; set; }
@@ -70,3 +68,4 @@ public KeyProperties() { }
 
     }
 }
+
diff --git a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeyRestoreParameters.cs b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeyRestoreParameters.cs
index 00a0830128d81..75be262d07436 100644
--- a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeyRestoreParameters.cs
+++ b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeyRestoreParameters.cs
@@ -1,23 +1,22 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-// 
-// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
 // Changes may cause incorrect behavior and will be lost if the code is
 // regenerated.
 
 namespace Microsoft.Azure.KeyVault.Models
 {
-    using System;
-    using System.Linq;
-    using System.Collections.Generic;
+    using Azure;
+    using KeyVault;
+    using Rest;
+    using Rest.Serialization;
     using Newtonsoft.Json;
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Microsoft.Rest.Azure;
+    using System.Linq;
 
     /// <summary>
-    /// The key restore parameters
+    /// The key restore parameters.
     /// </summary>
     public partial class KeyRestoreParameters
     {
@@ -29,15 +28,15 @@ public KeyRestoreParameters() { }
         /// <summary>
         /// Initializes a new instance of the KeyRestoreParameters class.
         /// </summary>
-        /// <param name="keyBundleBackup">the backup blob associated with a
-        /// key bundle</param>
+        /// <param name="keyBundleBackup">The backup blob associated with a key
+        /// bundle.</param>
         public KeyRestoreParameters(byte[] keyBundleBackup)
         {
             KeyBundleBackup = keyBundleBackup;
         }
 
         /// <summary>
-        /// Gets or sets the backup blob associated with a key bundle
+        /// Gets or sets the backup blob associated with a key bundle.
         /// </summary>
         [JsonConverter(typeof(Base64UrlJsonConverter))]
         [JsonProperty(PropertyName = "value")]
@@ -58,3 +57,4 @@ public virtual void Validate()
         }
     }
 }
+
diff --git a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeySignParameters.cs b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeySignParameters.cs
index 9375b8bcf8e3b..a1ae0fd35d202 100644
--- a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeySignParameters.cs
+++ b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeySignParameters.cs
@@ -1,23 +1,22 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-// 
-// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
 // Changes may cause incorrect behavior and will be lost if the code is
 // regenerated.
 
 namespace Microsoft.Azure.KeyVault.Models
 {
-    using System;
-    using System.Linq;
-    using System.Collections.Generic;
+    using Azure;
+    using KeyVault;
+    using Rest;
+    using Rest.Serialization;
     using Newtonsoft.Json;
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Microsoft.Rest.Azure;
+    using System.Linq;
 
     /// <summary>
-    /// The key operations parameters
+    /// The key operations parameters.
     /// </summary>
     public partial class KeySignParameters
     {
@@ -70,9 +69,9 @@ public virtual void Validate()
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "Value");
             }
-            if (this.Algorithm != null)
+            if (Algorithm != null)
             {
-                if (this.Algorithm.Length < 1)
+                if (Algorithm.Length < 1)
                 {
                     throw new ValidationException(ValidationRules.MinLength, "Algorithm", 1);
                 }
@@ -80,3 +79,4 @@ public virtual void Validate()
         }
     }
 }
+
diff --git a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeyUpdateParameters.cs b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeyUpdateParameters.cs
index 29a51ae3c4cdd..7974eb1bf3335 100644
--- a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeyUpdateParameters.cs
+++ b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeyUpdateParameters.cs
@@ -1,23 +1,22 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-// 
-// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
 // Changes may cause incorrect behavior and will be lost if the code is
 // regenerated.
 
 namespace Microsoft.Azure.KeyVault.Models
 {
-    using System;
-    using System.Linq;
-    using System.Collections.Generic;
+    using Azure;
+    using KeyVault;
     using Newtonsoft.Json;
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Microsoft.Rest.Azure;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Linq;
 
     /// <summary>
-    /// The key update parameters
+    /// The key update parameters.
     /// </summary>
     public partial class KeyUpdateParameters
     {
@@ -31,8 +30,8 @@ public KeyUpdateParameters() { }
         /// </summary>
         /// <param name="keyOps">Json web key operations. For more information
         /// on possible key operations, see JsonWebKeyOperation.</param>
-        /// <param name="tags">Application-specific metadata in the form of
-        /// key-value pairs</param>
+        /// <param name="tags">Application specific metadata in the form of
+        /// key-value pairs.</param>
         public KeyUpdateParameters(IList<string> keyOps = default(IList<string>), KeyAttributes keyAttributes = default(KeyAttributes), IDictionary<string, string> tags = default(IDictionary<string, string>))
         {
             KeyOps = keyOps;
@@ -53,11 +52,12 @@ public KeyUpdateParameters() { }
         public KeyAttributes KeyAttributes { get; set; }
 
         /// <summary>
-        /// Gets or sets application-specific metadata in the form of
-        /// key-value pairs
+        /// Gets or sets application specific metadata in the form of key-value
+        /// pairs.
         /// </summary>
         [JsonProperty(PropertyName = "tags")]
         public IDictionary<string, string> Tags { get; set; }
 
     }
 }
+
diff --git a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeyUsageType.cs b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeyUsageType.cs
index 092d01b8418af..3442736f6fd6e 100644
--- a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeyUsageType.cs
+++ b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeyUsageType.cs
@@ -1,16 +1,15 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-// 
-// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
 // Changes may cause incorrect behavior and will be lost if the code is
 // regenerated.
 
 namespace Microsoft.Azure.KeyVault.Models
 {
-    using Newtonsoft.Json;
-    using Newtonsoft.Json.Converters;
-    using System.Runtime.Serialization;
+    using Azure;
+    using KeyVault;
 
     /// <summary>
     /// Defines values for KeyUsageType.
@@ -28,3 +27,4 @@ public static class KeyUsageType
         public const string DecipherOnly = "decipherOnly";
     }
 }
+
diff --git a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeyVaultError.cs b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeyVaultError.cs
index ca0755559327e..b25cc49c11f57 100644
--- a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeyVaultError.cs
+++ b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeyVaultError.cs
@@ -1,23 +1,20 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-// 
-// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
 // Changes may cause incorrect behavior and will be lost if the code is
 // regenerated.
 
 namespace Microsoft.Azure.KeyVault.Models
 {
-    using System;
-    using System.Linq;
-    using System.Collections.Generic;
+    using Azure;
+    using KeyVault;
     using Newtonsoft.Json;
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Microsoft.Rest.Azure;
+    using System.Linq;
 
     /// <summary>
-    /// the key vault error exception
+    /// The key vault error exception.
     /// </summary>
     public partial class KeyVaultError
     {
@@ -37,7 +34,8 @@ public KeyVaultError() { }
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "error")]
-        public Error Error { get; private set; }
+        public Error Error { get; protected set; }
 
     }
 }
+
diff --git a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeyVaultErrorException.cs b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeyVaultErrorException.cs
index bd31cfa3c3704..cc9154d49976d 100644
--- a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeyVaultErrorException.cs
+++ b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeyVaultErrorException.cs
@@ -1,27 +1,26 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-// 
-// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
 // Changes may cause incorrect behavior and will be lost if the code is
 // regenerated.
 
 namespace Microsoft.Azure.KeyVault.Models
 {
-    using Microsoft.Rest;
-    using System;
-    using System.Net.Http;
+    using Azure;
+    using KeyVault;
+    using Rest;
+    using System.Runtime;
     using System.Runtime.Serialization;
-#if NET45 
-    using System.Security.Permissions;
-#endif
+    using System.Security;
 
     /// <summary>
     /// Exception thrown for an invalid response with KeyVaultError
     /// information.
     /// </summary>
-#if NET45 
-    [Serializable]
+#if NET45
+    [System.Serializable]
 #endif
     public class KeyVaultErrorException : RestException
     {
@@ -74,7 +73,7 @@ public KeyVaultErrorException(string message)
         /// </summary>
         /// <param name="message">The exception message.</param>
         /// <param name="innerException">Inner exception.</param>
-        public KeyVaultErrorException(string message, Exception innerException)
+        public KeyVaultErrorException(string message, System.Exception innerException)
             : base(message, innerException)
         {
         }
@@ -95,16 +94,16 @@ protected KeyVaultErrorException(SerializationInfo info, StreamingContext contex
         /// </summary>
         /// <param name="info">Serialization info.</param>
         /// <param name="context">Streaming context.</param>
-        /// <exception cref="ArgumentNullException">
+        /// <exception cref="System.ArgumentNullException">
         /// Thrown when a required parameter is null
         /// </exception>
-        [SecurityPermission(SecurityAction.Demand, SerializationFormatter = true)]
+        [System.Security.Permissions.SecurityPermission(System.Security.Permissions.SecurityAction.Demand, SerializationFormatter = true)]
         public override void GetObjectData(SerializationInfo info, StreamingContext context)
         {
             base.GetObjectData(info, context);
             if (info == null)
             {
-                throw new ArgumentNullException("info");
+                throw new System.ArgumentNullException("info");
             }
 
             info.AddValue("Request", Request);
@@ -114,3 +113,4 @@ public override void GetObjectData(SerializationInfo info, StreamingContext cont
 #endif
     }
 }
+
diff --git a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeyVerifyParameters.cs b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeyVerifyParameters.cs
index 4840b51853b87..5824ee499cc5c 100644
--- a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeyVerifyParameters.cs
+++ b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeyVerifyParameters.cs
@@ -1,23 +1,22 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-// 
-// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
 // Changes may cause incorrect behavior and will be lost if the code is
 // regenerated.
 
 namespace Microsoft.Azure.KeyVault.Models
 {
-    using System;
-    using System.Linq;
-    using System.Collections.Generic;
+    using Azure;
+    using KeyVault;
+    using Rest;
+    using Rest.Serialization;
     using Newtonsoft.Json;
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Microsoft.Rest.Azure;
+    using System.Linq;
 
     /// <summary>
-    /// The key verify parameters
+    /// The key verify parameters.
     /// </summary>
     public partial class KeyVerifyParameters
     {
@@ -33,8 +32,8 @@ public KeyVerifyParameters() { }
         /// more information on possible algorithm types, see
         /// JsonWebKeySignatureAlgorithm. Possible values include: 'RS256',
         /// 'RS384', 'RS512', 'RSNULL'</param>
-        /// <param name="digest">The digest used for signing</param>
-        /// <param name="signature">The signature to be verified</param>
+        /// <param name="digest">The digest used for signing.</param>
+        /// <param name="signature">The signature to be verified.</param>
         public KeyVerifyParameters(string algorithm, byte[] digest, byte[] signature)
         {
             Algorithm = algorithm;
@@ -52,14 +51,14 @@ public KeyVerifyParameters(string algorithm, byte[] digest, byte[] signature)
         public string Algorithm { get; set; }
 
         /// <summary>
-        /// Gets or sets the digest used for signing
+        /// Gets or sets the digest used for signing.
         /// </summary>
         [JsonConverter(typeof(Base64UrlJsonConverter))]
         [JsonProperty(PropertyName = "digest")]
         public byte[] Digest { get; set; }
 
         /// <summary>
-        /// Gets or sets the signature to be verified
+        /// Gets or sets the signature to be verified.
         /// </summary>
         [JsonConverter(typeof(Base64UrlJsonConverter))]
         [JsonProperty(PropertyName = "value")]
@@ -85,9 +84,9 @@ public virtual void Validate()
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "Signature");
             }
-            if (this.Algorithm != null)
+            if (Algorithm != null)
             {
-                if (this.Algorithm.Length < 1)
+                if (Algorithm.Length < 1)
                 {
                     throw new ValidationException(ValidationRules.MinLength, "Algorithm", 1);
                 }
@@ -95,3 +94,4 @@ public virtual void Validate()
         }
     }
 }
+
diff --git a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeyVerifyResult.cs b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeyVerifyResult.cs
index 01cbbf7c93724..5f13690bc2727 100644
--- a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeyVerifyResult.cs
+++ b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/KeyVerifyResult.cs
@@ -1,23 +1,20 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-// 
-// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
 // Changes may cause incorrect behavior and will be lost if the code is
 // regenerated.
 
 namespace Microsoft.Azure.KeyVault.Models
 {
-    using System;
-    using System.Linq;
-    using System.Collections.Generic;
+    using Azure;
+    using KeyVault;
     using Newtonsoft.Json;
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Microsoft.Rest.Azure;
+    using System.Linq;
 
     /// <summary>
-    /// The key verify result
+    /// The key verify result.
     /// </summary>
     public partial class KeyVerifyResult
     {
@@ -29,18 +26,19 @@ public KeyVerifyResult() { }
         /// <summary>
         /// Initializes a new instance of the KeyVerifyResult class.
         /// </summary>
-        /// <param name="value">true if the signature is verified, false
-        /// otherwise.</param>
+        /// <param name="value">True if the signature is verified, otherwise
+        /// false.</param>
         public KeyVerifyResult(bool? value = default(bool?))
         {
             Value = value;
         }
 
         /// <summary>
-        /// Gets true if the signature is verified, false otherwise.
+        /// Gets true if the signature is verified, otherwise false.
         /// </summary>
         [JsonProperty(PropertyName = "value")]
-        public bool? Value { get; private set; }
+        public bool? Value { get; protected set; }
 
     }
 }
+
diff --git a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/LifetimeAction.cs b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/LifetimeAction.cs
index cc5f45e180ec7..46b822c4040ec 100644
--- a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/LifetimeAction.cs
+++ b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/LifetimeAction.cs
@@ -1,20 +1,17 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-// 
-// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
 // Changes may cause incorrect behavior and will be lost if the code is
 // regenerated.
 
 namespace Microsoft.Azure.KeyVault.Models
 {
-    using System;
-    using System.Linq;
-    using System.Collections.Generic;
+    using Azure;
+    using KeyVault;
     using Newtonsoft.Json;
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Microsoft.Rest.Azure;
+    using System.Linq;
 
     /// <summary>
     /// Action and its trigger that will be performed by Key Vault over the
@@ -54,15 +51,16 @@ public LifetimeAction() { }
         /// <summary>
         /// Validate the object.
         /// </summary>
-        /// <exception cref="ValidationException">
+        /// <exception cref="Rest.ValidationException">
         /// Thrown if validation fails
         /// </exception>
         public virtual void Validate()
         {
-            if (this.Trigger != null)
+            if (Trigger != null)
             {
-                this.Trigger.Validate();
+                Trigger.Validate();
             }
         }
     }
 }
+
diff --git a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/OrganizationDetails.cs b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/OrganizationDetails.cs
index 992312914a3c9..b4910b4c1c069 100644
--- a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/OrganizationDetails.cs
+++ b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/OrganizationDetails.cs
@@ -1,20 +1,19 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-// 
-// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
 // Changes may cause incorrect behavior and will be lost if the code is
 // regenerated.
 
 namespace Microsoft.Azure.KeyVault.Models
 {
-    using System;
-    using System.Linq;
-    using System.Collections.Generic;
+    using Azure;
+    using KeyVault;
     using Newtonsoft.Json;
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Microsoft.Rest.Azure;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Linq;
 
     /// <summary>
     /// Details of the organization of the certificate issuer.
@@ -52,3 +51,4 @@ public OrganizationDetails() { }
 
     }
 }
+
diff --git a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/Page.cs b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/Page.cs
index 20a1c7f331bd3..4958035ce0312 100644
--- a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/Page.cs
+++ b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/Page.cs
@@ -1,17 +1,20 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-// 
-// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
 // Changes may cause incorrect behavior and will be lost if the code is
 // regenerated.
 
 namespace Microsoft.Azure.KeyVault.Models
 {
-    using System.Collections.Generic;
-    using System.Linq;
+    using Azure;
+    using KeyVault;
+    using Rest;
+    using Rest.Azure;
     using Newtonsoft.Json;
-    using Microsoft.Rest.Azure;
+    using System.Collections;
+    using System.Collections.Generic;
 
     /// <summary>
     /// Defines a page in Azure responses.
@@ -35,16 +38,17 @@ public class Page<T> : IPage<T>
          /// <returns>A an enumerator that can be used to iterate through the collection.</returns>
          public IEnumerator<T> GetEnumerator()
          {
-              return (Items == null) ? Enumerable.Empty<T>().GetEnumerator() : Items.GetEnumerator();
+              return Items == null ? System.Linq.Enumerable.Empty<T>().GetEnumerator() : Items.GetEnumerator();
          }
 
          /// <summary>
          /// Returns an enumerator that iterates through the collection.
          /// </summary>
          /// <returns>A an enumerator that can be used to iterate through the collection.</returns>
-         System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+         IEnumerator IEnumerable.GetEnumerator()
          {
              return GetEnumerator();
          }
     }
 }
+
diff --git a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/PendingCertificateSigningRequestResult.cs b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/PendingCertificateSigningRequestResult.cs
index 5622e11c02872..139d0226e463c 100644
--- a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/PendingCertificateSigningRequestResult.cs
+++ b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/PendingCertificateSigningRequestResult.cs
@@ -1,23 +1,20 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-// 
-// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
 // Changes may cause incorrect behavior and will be lost if the code is
 // regenerated.
 
 namespace Microsoft.Azure.KeyVault.Models
 {
-    using System;
-    using System.Linq;
-    using System.Collections.Generic;
+    using Azure;
+    using KeyVault;
     using Newtonsoft.Json;
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Microsoft.Rest.Azure;
+    using System.Linq;
 
     /// <summary>
-    /// The pending certificate signing request result
+    /// The pending certificate signing request result.
     /// </summary>
     public partial class PendingCertificateSigningRequestResult
     {
@@ -43,7 +40,8 @@ public PendingCertificateSigningRequestResult() { }
         /// string.
         /// </summary>
         [JsonProperty(PropertyName = "value")]
-        public string Value { get; private set; }
+        public string Value { get; protected set; }
 
     }
 }
+
diff --git a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/SecretAttributes.cs b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/SecretAttributes.cs
index 585c502c24038..0ba1831b35ccd 100644
--- a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/SecretAttributes.cs
+++ b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/SecretAttributes.cs
@@ -1,23 +1,19 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-// 
-// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
 // Changes may cause incorrect behavior and will be lost if the code is
 // regenerated.
 
 namespace Microsoft.Azure.KeyVault.Models
 {
-    using System;
+    using Azure;
+    using KeyVault;
     using System.Linq;
-    using System.Collections.Generic;
-    using Newtonsoft.Json;
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Microsoft.Rest.Azure;
 
     /// <summary>
-    /// The secret management attributes
+    /// The secret management attributes.
     /// </summary>
     public partial class SecretAttributes : Attributes
     {
@@ -30,15 +26,16 @@ public SecretAttributes() { }
         /// Initializes a new instance of the SecretAttributes class.
         /// </summary>
         /// <param name="enabled">Determines whether the object is
-        /// enabled</param>
-        /// <param name="notBefore">Not before date in UTC</param>
-        /// <param name="expires">Expiry date in UTC</param>
-        /// <param name="created">Creation time in UTC</param>
-        /// <param name="updated">Last updated time in UTC</param>
-        public SecretAttributes(bool? enabled = default(bool?), DateTime? notBefore = default(DateTime?), DateTime? expires = default(DateTime?), DateTime? created = default(DateTime?), DateTime? updated = default(DateTime?))
+        /// enabled.</param>
+        /// <param name="notBefore">Not before date in UTC.</param>
+        /// <param name="expires">Expiry date in UTC.</param>
+        /// <param name="created">Creation time in UTC.</param>
+        /// <param name="updated">Last updated time in UTC.</param>
+        public SecretAttributes(bool? enabled = default(bool?), System.DateTime? notBefore = default(System.DateTime?), System.DateTime? expires = default(System.DateTime?), System.DateTime? created = default(System.DateTime?), System.DateTime? updated = default(System.DateTime?))
             : base(enabled, notBefore, expires, created, updated)
         {
         }
 
     }
 }
+
diff --git a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/SecretBundle.cs b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/SecretBundle.cs
index 9f083e9943b39..8c59a2ccb500c 100644
--- a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/SecretBundle.cs
+++ b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/SecretBundle.cs
@@ -1,23 +1,22 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-// 
-// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
 // Changes may cause incorrect behavior and will be lost if the code is
 // regenerated.
 
 namespace Microsoft.Azure.KeyVault.Models
 {
-    using System;
-    using System.Linq;
-    using System.Collections.Generic;
+    using Azure;
+    using KeyVault;
     using Newtonsoft.Json;
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Microsoft.Rest.Azure;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Linq;
 
     /// <summary>
-    /// A Secret consisting of a value, id and its attributes.
+    /// A secret consisting of a value, id and its attributes.
     /// </summary>
     public partial class SecretBundle
     {
@@ -29,18 +28,18 @@ public SecretBundle() { }
         /// <summary>
         /// Initializes a new instance of the SecretBundle class.
         /// </summary>
-        /// <param name="value">The secret value </param>
-        /// <param name="id">The secret id</param>
-        /// <param name="contentType">The content type of the secret</param>
-        /// <param name="attributes">The secret management attributes</param>
-        /// <param name="tags">Application-specific metadata in the form of
-        /// key-value pairs</param>
+        /// <param name="value">The secret value.</param>
+        /// <param name="id">The secret id.</param>
+        /// <param name="contentType">The content type of the secret.</param>
+        /// <param name="attributes">The secret management attributes.</param>
+        /// <param name="tags">Application specific metadata in the form of
+        /// key-value pairs.</param>
         /// <param name="kid">If this is a secret backing a KV certificate,
         /// then this field specifies the corresponding key backing the KV
         /// certificate.</param>
         /// <param name="managed">True if the secret's lifetime is managed by
-        /// key vault i.e. if this is a secret backing a certificate, then
-        /// managed will be true.</param>
+        /// key vault. If this is a secret backing a certificate, then managed
+        /// will be true.</param>
         public SecretBundle(string value = default(string), string id = default(string), string contentType = default(string), SecretAttributes attributes = default(SecretAttributes), IDictionary<string, string> tags = default(IDictionary<string, string>), string kid = default(string), bool? managed = default(bool?))
         {
             Value = value;
@@ -53,32 +52,32 @@ public SecretBundle() { }
         }
 
         /// <summary>
-        /// Gets or sets the secret value
+        /// Gets or sets the secret value.
         /// </summary>
         [JsonProperty(PropertyName = "value")]
         public string Value { get; set; }
 
         /// <summary>
-        /// Gets or sets the secret id
+        /// Gets or sets the secret id.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public string Id { get; set; }
 
         /// <summary>
-        /// Gets or sets the content type of the secret
+        /// Gets or sets the content type of the secret.
         /// </summary>
         [JsonProperty(PropertyName = "contentType")]
         public string ContentType { get; set; }
 
         /// <summary>
-        /// Gets or sets the secret management attributes
+        /// Gets or sets the secret management attributes.
         /// </summary>
         [JsonProperty(PropertyName = "attributes")]
         public SecretAttributes Attributes { get; set; }
 
         /// <summary>
-        /// Gets or sets application-specific metadata in the form of
-        /// key-value pairs
+        /// Gets or sets application specific metadata in the form of key-value
+        /// pairs.
         /// </summary>
         [JsonProperty(PropertyName = "tags")]
         public IDictionary<string, string> Tags { get; set; }
@@ -88,14 +87,15 @@ public SecretBundle() { }
         /// specifies the corresponding key backing the KV certificate.
         /// </summary>
         [JsonProperty(PropertyName = "kid")]
-        public string Kid { get; private set; }
+        public string Kid { get; protected set; }
 
         /// <summary>
-        /// Gets true if the secret's lifetime is managed by key vault i.e. if
-        /// this is a secret backing a certificate, then managed will be true.
+        /// Gets true if the secret's lifetime is managed by key vault. If this
+        /// is a secret backing a certificate, then managed will be true.
         /// </summary>
         [JsonProperty(PropertyName = "managed")]
-        public bool? Managed { get; private set; }
+        public bool? Managed { get; protected set; }
 
     }
 }
+
diff --git a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/SecretItem.cs b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/SecretItem.cs
index d367e5167339b..d2434881711c8 100644
--- a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/SecretItem.cs
+++ b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/SecretItem.cs
@@ -1,23 +1,22 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-// 
-// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
 // Changes may cause incorrect behavior and will be lost if the code is
 // regenerated.
 
 namespace Microsoft.Azure.KeyVault.Models
 {
-    using System;
-    using System.Linq;
-    using System.Collections.Generic;
+    using Azure;
+    using KeyVault;
     using Newtonsoft.Json;
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Microsoft.Rest.Azure;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Linq;
 
     /// <summary>
-    /// The secret item containing secret metadata
+    /// The secret item containing secret metadata.
     /// </summary>
     public partial class SecretItem
     {
@@ -29,15 +28,15 @@ public SecretItem() { }
         /// <summary>
         /// Initializes a new instance of the SecretItem class.
         /// </summary>
-        /// <param name="id">Secret Identifier</param>
-        /// <param name="attributes">The secret management attributes</param>
-        /// <param name="tags">Application-specific metadata in the form of
-        /// key-value pairs</param>
+        /// <param name="id">Secret identifier.</param>
+        /// <param name="attributes">The secret management attributes.</param>
+        /// <param name="tags">Application specific metadata in the form of
+        /// key-value pairs.</param>
         /// <param name="contentType">Type of the secret value such as a
-        /// password</param>
+        /// password.</param>
         /// <param name="managed">True if the secret's lifetime is managed by
-        /// key vault i.e. if this is a key backing a certificate, then
-        /// managed will be true.</param>
+        /// key vault. If this is a key backing a certificate, then managed
+        /// will be true.</param>
         public SecretItem(string id = default(string), SecretAttributes attributes = default(SecretAttributes), IDictionary<string, string> tags = default(IDictionary<string, string>), string contentType = default(string), bool? managed = default(bool?))
         {
             Id = id;
@@ -48,36 +47,37 @@ public SecretItem() { }
         }
 
         /// <summary>
-        /// Gets or sets secret Identifier
+        /// Gets or sets secret identifier.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public string Id { get; set; }
 
         /// <summary>
-        /// Gets or sets the secret management attributes
+        /// Gets or sets the secret management attributes.
         /// </summary>
         [JsonProperty(PropertyName = "attributes")]
         public SecretAttributes Attributes { get; set; }
 
         /// <summary>
-        /// Gets or sets application-specific metadata in the form of
-        /// key-value pairs
+        /// Gets or sets application specific metadata in the form of key-value
+        /// pairs.
         /// </summary>
         [JsonProperty(PropertyName = "tags")]
         public IDictionary<string, string> Tags { get; set; }
 
         /// <summary>
-        /// Gets or sets type of the secret value such as a password
+        /// Gets or sets type of the secret value such as a password.
         /// </summary>
         [JsonProperty(PropertyName = "contentType")]
         public string ContentType { get; set; }
 
         /// <summary>
-        /// Gets true if the secret's lifetime is managed by key vault i.e. if
-        /// this is a key backing a certificate, then managed will be true.
+        /// Gets true if the secret's lifetime is managed by key vault. If this
+        /// is a key backing a certificate, then managed will be true.
         /// </summary>
         [JsonProperty(PropertyName = "managed")]
-        public bool? Managed { get; private set; }
+        public bool? Managed { get; protected set; }
 
     }
 }
+
diff --git a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/SecretProperties.cs b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/SecretProperties.cs
index e28c6157f1d07..da6f7a1a7f512 100644
--- a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/SecretProperties.cs
+++ b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/SecretProperties.cs
@@ -1,20 +1,17 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-// 
-// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
 // Changes may cause incorrect behavior and will be lost if the code is
 // regenerated.
 
 namespace Microsoft.Azure.KeyVault.Models
 {
-    using System;
-    using System.Linq;
-    using System.Collections.Generic;
+    using Azure;
+    using KeyVault;
     using Newtonsoft.Json;
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Microsoft.Rest.Azure;
+    using System.Linq;
 
     /// <summary>
     /// Properties of the key backing a certificate.
@@ -43,3 +40,4 @@ public SecretProperties() { }
 
     }
 }
+
diff --git a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/SecretSetParameters.cs b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/SecretSetParameters.cs
index 33fcfc03e3df2..3d4d0bdf00fd6 100644
--- a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/SecretSetParameters.cs
+++ b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/SecretSetParameters.cs
@@ -1,23 +1,23 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-// 
-// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
 // Changes may cause incorrect behavior and will be lost if the code is
 // regenerated.
 
 namespace Microsoft.Azure.KeyVault.Models
 {
-    using System;
-    using System.Linq;
-    using System.Collections.Generic;
+    using Azure;
+    using KeyVault;
+    using Rest;
     using Newtonsoft.Json;
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Microsoft.Rest.Azure;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Linq;
 
     /// <summary>
-    /// The secret set parameters
+    /// The secret set parameters.
     /// </summary>
     public partial class SecretSetParameters
     {
@@ -29,13 +29,13 @@ public SecretSetParameters() { }
         /// <summary>
         /// Initializes a new instance of the SecretSetParameters class.
         /// </summary>
-        /// <param name="value">The value of the secret</param>
-        /// <param name="tags">Application-specific metadata in the form of
-        /// key-value pairs</param>
+        /// <param name="value">The value of the secret.</param>
+        /// <param name="tags">Application specific metadata in the form of
+        /// key-value pairs.</param>
         /// <param name="contentType">Type of the secret value such as a
-        /// password</param>
+        /// password.</param>
         /// <param name="secretAttributes">The secret management
-        /// attributes</param>
+        /// attributes.</param>
         public SecretSetParameters(string value, IDictionary<string, string> tags = default(IDictionary<string, string>), string contentType = default(string), SecretAttributes secretAttributes = default(SecretAttributes))
         {
             Value = value;
@@ -45,26 +45,26 @@ public SecretSetParameters() { }
         }
 
         /// <summary>
-        /// Gets or sets the value of the secret
+        /// Gets or sets the value of the secret.
         /// </summary>
         [JsonProperty(PropertyName = "value")]
         public string Value { get; set; }
 
         /// <summary>
-        /// Gets or sets application-specific metadata in the form of
-        /// key-value pairs
+        /// Gets or sets application specific metadata in the form of key-value
+        /// pairs.
         /// </summary>
         [JsonProperty(PropertyName = "tags")]
         public IDictionary<string, string> Tags { get; set; }
 
         /// <summary>
-        /// Gets or sets type of the secret value such as a password
+        /// Gets or sets type of the secret value such as a password.
         /// </summary>
         [JsonProperty(PropertyName = "contentType")]
         public string ContentType { get; set; }
 
         /// <summary>
-        /// Gets or sets the secret management attributes
+        /// Gets or sets the secret management attributes.
         /// </summary>
         [JsonProperty(PropertyName = "attributes")]
         public SecretAttributes SecretAttributes { get; set; }
@@ -84,3 +84,4 @@ public virtual void Validate()
         }
     }
 }
+
diff --git a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/SecretUpdateParameters.cs b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/SecretUpdateParameters.cs
index ee897c2a641f2..b45bea5986dea 100644
--- a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/SecretUpdateParameters.cs
+++ b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/SecretUpdateParameters.cs
@@ -1,23 +1,22 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-// 
-// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
 // Changes may cause incorrect behavior and will be lost if the code is
 // regenerated.
 
 namespace Microsoft.Azure.KeyVault.Models
 {
-    using System;
-    using System.Linq;
-    using System.Collections.Generic;
+    using Azure;
+    using KeyVault;
     using Newtonsoft.Json;
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Microsoft.Rest.Azure;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Linq;
 
     /// <summary>
-    /// The secret update parameters
+    /// The secret update parameters.
     /// </summary>
     public partial class SecretUpdateParameters
     {
@@ -30,11 +29,11 @@ public SecretUpdateParameters() { }
         /// Initializes a new instance of the SecretUpdateParameters class.
         /// </summary>
         /// <param name="contentType">Type of the secret value such as a
-        /// password</param>
+        /// password.</param>
         /// <param name="secretAttributes">The secret management
-        /// attributes</param>
-        /// <param name="tags">Application-specific metadata in the form of
-        /// key-value pairs</param>
+        /// attributes.</param>
+        /// <param name="tags">Application specific metadata in the form of
+        /// key-value pairs.</param>
         public SecretUpdateParameters(string contentType = default(string), SecretAttributes secretAttributes = default(SecretAttributes), IDictionary<string, string> tags = default(IDictionary<string, string>))
         {
             ContentType = contentType;
@@ -43,23 +42,24 @@ public SecretUpdateParameters() { }
         }
 
         /// <summary>
-        /// Gets or sets type of the secret value such as a password
+        /// Gets or sets type of the secret value such as a password.
         /// </summary>
         [JsonProperty(PropertyName = "contentType")]
         public string ContentType { get; set; }
 
         /// <summary>
-        /// Gets or sets the secret management attributes
+        /// Gets or sets the secret management attributes.
         /// </summary>
         [JsonProperty(PropertyName = "attributes")]
         public SecretAttributes SecretAttributes { get; set; }
 
         /// <summary>
-        /// Gets or sets application-specific metadata in the form of
-        /// key-value pairs
+        /// Gets or sets application specific metadata in the form of key-value
+        /// pairs.
         /// </summary>
         [JsonProperty(PropertyName = "tags")]
         public IDictionary<string, string> Tags { get; set; }
 
     }
 }
+
diff --git a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/SubjectAlternativeNames.cs b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/SubjectAlternativeNames.cs
index 7329b455be734..55d0a6bdf9ebd 100644
--- a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/SubjectAlternativeNames.cs
+++ b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/SubjectAlternativeNames.cs
@@ -1,20 +1,19 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-// 
-// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
 // Changes may cause incorrect behavior and will be lost if the code is
 // regenerated.
 
 namespace Microsoft.Azure.KeyVault.Models
 {
-    using System;
-    using System.Linq;
-    using System.Collections.Generic;
+    using Azure;
+    using KeyVault;
     using Newtonsoft.Json;
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Microsoft.Rest.Azure;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Linq;
 
     /// <summary>
     /// The subject alternate names of a X509 object.
@@ -59,3 +58,4 @@ public SubjectAlternativeNames() { }
 
     }
 }
+
diff --git a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/Trigger.cs b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/Trigger.cs
index 47d8b18f6d287..a224cad0a81f9 100644
--- a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/Trigger.cs
+++ b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/Trigger.cs
@@ -1,20 +1,18 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-// 
-// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
 // Changes may cause incorrect behavior and will be lost if the code is
 // regenerated.
 
 namespace Microsoft.Azure.KeyVault.Models
 {
-    using System;
-    using System.Linq;
-    using System.Collections.Generic;
+    using Azure;
+    using KeyVault;
+    using Rest;
     using Newtonsoft.Json;
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Microsoft.Rest.Azure;
+    using System.Linq;
 
     /// <summary>
     /// A condition to be satisfied for an action to be executed.
@@ -29,8 +27,8 @@ public Trigger() { }
         /// <summary>
         /// Initializes a new instance of the Trigger class.
         /// </summary>
-        /// <param name="lifetimePercentage">Percentage of lifetime as which
-        /// to trigger. Value should be between 1 and 99.</param>
+        /// <param name="lifetimePercentage">Percentage of lifetime at which to
+        /// trigger. Value should be between 1 and 99.</param>
         /// <param name="daysBeforeExpiry">Days before expiry.</param>
         public Trigger(int? lifetimePercentage = default(int?), int? daysBeforeExpiry = default(int?))
         {
@@ -39,7 +37,7 @@ public Trigger() { }
         }
 
         /// <summary>
-        /// Gets or sets percentage of lifetime as which to trigger. Value
+        /// Gets or sets percentage of lifetime at which to trigger. Value
         /// should be between 1 and 99.
         /// </summary>
         [JsonProperty(PropertyName = "lifetime_percentage")]
@@ -59,14 +57,15 @@ public Trigger() { }
         /// </exception>
         public virtual void Validate()
         {
-            if (this.LifetimePercentage > 99)
+            if (LifetimePercentage > 99)
             {
                 throw new ValidationException(ValidationRules.InclusiveMaximum, "LifetimePercentage", 99);
             }
-            if (this.LifetimePercentage < 1)
+            if (LifetimePercentage < 1)
             {
                 throw new ValidationException(ValidationRules.InclusiveMinimum, "LifetimePercentage", 1);
             }
         }
     }
 }
+
diff --git a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/X509CertificateProperties.cs b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/X509CertificateProperties.cs
index 79b49512130cc..d33b320de7d19 100644
--- a/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/X509CertificateProperties.cs
+++ b/src/KeyVault/Microsoft.Azure.KeyVault/Generated/Models/X509CertificateProperties.cs
@@ -1,20 +1,20 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-// 
-// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
 // Changes may cause incorrect behavior and will be lost if the code is
 // regenerated.
 
 namespace Microsoft.Azure.KeyVault.Models
 {
-    using System;
-    using System.Linq;
-    using System.Collections.Generic;
+    using Azure;
+    using KeyVault;
+    using Rest;
     using Newtonsoft.Json;
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Microsoft.Rest.Azure;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Linq;
 
     /// <summary>
     /// Properties of the X509 component of a certificate.
@@ -30,13 +30,13 @@ public X509CertificateProperties() { }
         /// Initializes a new instance of the X509CertificateProperties class.
         /// </summary>
         /// <param name="subject">The subject name. Should be a valid X509
-        /// Distinguished Name.</param>
+        /// distinguished Name.</param>
         /// <param name="ekus">The enhanced key usage.</param>
         /// <param name="subjectAlternativeNames">The subject alternative
         /// names.</param>
         /// <param name="keyUsage">List of key usages.</param>
-        /// <param name="validityInMonths">The duration that the ceritifcate
-        /// is valid in months.</param>
+        /// <param name="validityInMonths">The duration that the ceritifcate is
+        /// valid in months.</param>
         public X509CertificateProperties(string subject = default(string), IList<string> ekus = default(IList<string>), SubjectAlternativeNames subjectAlternativeNames = default(SubjectAlternativeNames), IList<string> keyUsage = default(IList<string>), int? validityInMonths = default(int?))
         {
             Subject = subject;
@@ -47,8 +47,8 @@ public X509CertificateProperties() { }
         }
 
         /// <summary>
-        /// Gets or sets the subject name. Should be a valid X509
-        /// Distinguished Name.
+        /// Gets or sets the subject name. Should be a valid X509 distinguished
+        /// Name.
         /// </summary>
         [JsonProperty(PropertyName = "subject")]
         public string Subject { get; set; }
@@ -85,10 +85,11 @@ public X509CertificateProperties() { }
         /// </exception>
         public virtual void Validate()
         {
-            if (this.ValidityInMonths < 0)
+            if (ValidityInMonths < 0)
             {
                 throw new ValidationException(ValidationRules.InclusiveMinimum, "ValidityInMonths", 0);
             }
         }
     }
 }
+
diff --git a/src/KeyVault/Microsoft.Azure.KeyVault/generate.cmd b/src/KeyVault/Microsoft.Azure.KeyVault/generate.cmd
index 38a0251b7ce13..522784c9b569f 100644
--- a/src/KeyVault/Microsoft.Azure.KeyVault/generate.cmd
+++ b/src/KeyVault/Microsoft.Azure.KeyVault/generate.cmd
@@ -4,19 +4,20 @@
 ::
 
 @echo off
-set autoRestVersion=0.17.0-Nightly20160726
+setlocal
+set autoRestVersion=1.0.0-Nightly20170212
 
 if  "%1" == "" (
-	set specFile="https://raw.githubusercontent.com/Azure/azure-rest-api-specs/master/arm-keyvault/2015-06-01/swagger/keyvault.json"
+	set specFile="https://raw.githubusercontent.com/Azure/azure-rest-api-specs/master/keyvault/2016-10-01/swagger/keyvault.json"
 ) else (
     set specFile="%1"
 )
 
-set repoRoot=%~dp0..\..\..\..
+set repoRoot=%~dp0..\..\..
 set generateFolder=%~dp0Generated
 
 if exist %generateFolder% rd /S /Q  %generateFolder%
 
-call "%repoRoot%\tools\autorest.gen.cmd" %specFile%  Microsoft.Azure.KeyVault %autoRestVersion% %generateFolder% -SyncMethods None 
+call "%repoRoot%\tools\autorest.gen.cmd" %specFile%  Microsoft.Azure.KeyVault %autoRestVersion% %generateFolder% MICROSOFT_MIT "-SyncMethods None" 
 
 endlocal
\ No newline at end of file