diff --git a/sql/resource-manager/v2014_04_01/src/main/java/com/microsoft/azure/management/sql/v2014_04_01/DatabaseEdition.java b/sql/resource-manager/v2014_04_01/src/main/java/com/microsoft/azure/management/sql/v2014_04_01/DatabaseEdition.java
index 63a8ddfef7e6..79973ae0116b 100644
--- a/sql/resource-manager/v2014_04_01/src/main/java/com/microsoft/azure/management/sql/v2014_04_01/DatabaseEdition.java
+++ b/sql/resource-manager/v2014_04_01/src/main/java/com/microsoft/azure/management/sql/v2014_04_01/DatabaseEdition.java
@@ -49,6 +49,15 @@ public final class DatabaseEdition extends ExpandableStringEnum<DatabaseEdition>
     /** Static value System2 for DatabaseEdition. */
     public static final DatabaseEdition SYSTEM2 = fromString("System2");
 
+    /** Static value GeneralPurpose for DatabaseEdition. */
+    public static final DatabaseEdition GENERAL_PURPOSE = fromString("GeneralPurpose");
+
+    /** Static value BusinessCritical for DatabaseEdition. */
+    public static final DatabaseEdition BUSINESS_CRITICAL = fromString("BusinessCritical");
+
+    /** Static value Hyperscale for DatabaseEdition. */
+    public static final DatabaseEdition HYPERSCALE = fromString("Hyperscale");
+
     /**
      * Creates or finds a DatabaseEdition from its string representation.
      * @param name a name to look for
diff --git a/sql/resource-manager/v2014_04_01/src/main/java/com/microsoft/azure/management/sql/v2014_04_01/DatabaseUpdate.java b/sql/resource-manager/v2014_04_01/src/main/java/com/microsoft/azure/management/sql/v2014_04_01/DatabaseUpdate.java
index 260045924338..c1fb545cd92e 100644
--- a/sql/resource-manager/v2014_04_01/src/main/java/com/microsoft/azure/management/sql/v2014_04_01/DatabaseUpdate.java
+++ b/sql/resource-manager/v2014_04_01/src/main/java/com/microsoft/azure/management/sql/v2014_04_01/DatabaseUpdate.java
@@ -152,14 +152,23 @@ public class DatabaseUpdate extends ProxyResource {
     /**
      * The edition of the database. The DatabaseEditions enumeration contains
      * all the valid editions. If createMode is NonReadableSecondary or
-     * OnlineSecondary, this value is ignored. To see possible values, query
-     * the capabilities API
-     * (/subscriptions/{subscriptionId}/providers/Microsoft.Sql/locations/{locationID}/capabilities)
-     * referred to by operationId: "Capabilities_ListByLocation." or use the
-     * Azure CLI command `az sql db list-editions -l westus --query [].name`.
-     * Possible values include: 'Web', 'Business', 'Basic', 'Standard',
+     * OnlineSecondary, this value is ignored.
+     *
+     * The list of SKUs may vary by region and support offer. To determine the
+     * SKUs (including the SKU name, tier/edition, family, and capacity) that
+     * are available to your subscription in an Azure region, use the
+     * `Capabilities_ListByLocation` REST API or one of the following commands:
+     *
+     * ```azurecli
+     * az sql db list-editions -l &lt;location&gt; -o table
+     * ````
+     *
+     * ```powershell
+     * Get-AzSqlServerServiceObjective -Location &lt;location&gt;
+     * ````
+     * . Possible values include: 'Web', 'Business', 'Basic', 'Standard',
      * 'Premium', 'PremiumRS', 'Free', 'Stretch', 'DataWarehouse', 'System',
-     * 'System2'.
+     * 'System2', 'GeneralPurpose', 'BusinessCritical', 'Hyperscale'.
      */
     @JsonProperty(value = "properties.edition")
     private DatabaseEdition edition;
@@ -181,12 +190,11 @@ public class DatabaseUpdate extends ProxyResource {
      * currentServiceObjectiveId property. If requestedServiceObjectiveId and
      * requestedServiceObjectiveName are both updated, the value of
      * requestedServiceObjectiveId overrides the value of
-     * requestedServiceObjectiveName. To see possible values, query the
-     * capabilities API
-     * (/subscriptions/{subscriptionId}/providers/Microsoft.Sql/locations/{locationID}/capabilities)
-     * referred to by operationId: "Capabilities_ListByLocation." or use the
-     * Azure CLI command `az sql db list-editions --location &lt;location&gt;
-     * --query [].supportedServiceLevelObjectives[].name` .
+     * requestedServiceObjectiveName.
+     *
+     * The list of SKUs may vary by region and support offer. To determine the
+     * service objective ids that are available to your subscription in an
+     * Azure region, use the `Capabilities_ListByLocation` REST API.
      */
     @JsonProperty(value = "properties.requestedServiceObjectiveId")
     private UUID requestedServiceObjectiveId;
@@ -195,21 +203,29 @@ public class DatabaseUpdate extends ProxyResource {
      * The name of the configured service level objective of the database. This
      * is the service level objective that is in the process of being applied
      * to the database. Once successfully updated, it will match the value of
-     * serviceLevelObjective property. To see possible values, query the
-     * capabilities API
-     * (/subscriptions/{subscriptionId}/providers/Microsoft.Sql/locations/{locationID}/capabilities)
-     * referred to by operationId: "Capabilities_ListByLocation." or use the
-     * Azure CLI command `az sql db list-editions --location &lt;location&gt;
-     * --query [].supportedServiceLevelObjectives[].name`. Possible values
-     * include: 'System', 'System0', 'System1', 'System2', 'System3',
-     * 'System4', 'System2L', 'System3L', 'System4L', 'Free', 'Basic', 'S0',
-     * 'S1', 'S2', 'S3', 'S4', 'S6', 'S7', 'S9', 'S12', 'P1', 'P2', 'P3', 'P4',
-     * 'P6', 'P11', 'P15', 'PRS1', 'PRS2', 'PRS4', 'PRS6', 'DW100', 'DW200',
-     * 'DW300', 'DW400', 'DW500', 'DW600', 'DW1000', 'DW1200', 'DW1000c',
-     * 'DW1500', 'DW1500c', 'DW2000', 'DW2000c', 'DW3000', 'DW2500c',
-     * 'DW3000c', 'DW6000', 'DW5000c', 'DW6000c', 'DW7500c', 'DW10000c',
-     * 'DW15000c', 'DW30000c', 'DS100', 'DS200', 'DS300', 'DS400', 'DS500',
-     * 'DS600', 'DS1000', 'DS1200', 'DS1500', 'DS2000', 'ElasticPool'.
+     * serviceLevelObjective property.
+     *
+     * The list of SKUs may vary by region and support offer. To determine the
+     * SKUs (including the SKU name, tier/edition, family, and capacity) that
+     * are available to your subscription in an Azure region, use the
+     * `Capabilities_ListByLocation` REST API or one of the following commands:
+     *
+     * ```azurecli
+     * az sql db list-editions -l &lt;location&gt; -o table
+     * ````
+     *
+     * ```powershell
+     * Get-AzSqlServerServiceObjective -Location &lt;location&gt;
+     * ````
+     * . Possible values include: 'System', 'System0', 'System1', 'System2',
+     * 'System3', 'System4', 'System2L', 'System3L', 'System4L', 'Free',
+     * 'Basic', 'S0', 'S1', 'S2', 'S3', 'S4', 'S6', 'S7', 'S9', 'S12', 'P1',
+     * 'P2', 'P3', 'P4', 'P6', 'P11', 'P15', 'PRS1', 'PRS2', 'PRS4', 'PRS6',
+     * 'DW100', 'DW200', 'DW300', 'DW400', 'DW500', 'DW600', 'DW1000',
+     * 'DW1200', 'DW1000c', 'DW1500', 'DW1500c', 'DW2000', 'DW2000c', 'DW3000',
+     * 'DW2500c', 'DW3000c', 'DW6000', 'DW5000c', 'DW6000c', 'DW7500c',
+     * 'DW10000c', 'DW15000c', 'DW30000c', 'DS100', 'DS200', 'DS300', 'DS400',
+     * 'DS500', 'DS600', 'DS1000', 'DS1200', 'DS1500', 'DS2000', 'ElasticPool'.
      */
     @JsonProperty(value = "properties.requestedServiceObjectiveName")
     private ServiceObjectiveName requestedServiceObjectiveName;
@@ -501,7 +517,15 @@ public DatabaseUpdate withRecoveryServicesRecoveryPointResourceId(String recover
     }
 
     /**
-     * Get the edition of the database. The DatabaseEditions enumeration contains all the valid editions. If createMode is NonReadableSecondary or OnlineSecondary, this value is ignored. To see possible values, query the capabilities API (/subscriptions/{subscriptionId}/providers/Microsoft.Sql/locations/{locationID}/capabilities) referred to by operationId: "Capabilities_ListByLocation." or use the Azure CLI command `az sql db list-editions -l westus --query [].name`. Possible values include: 'Web', 'Business', 'Basic', 'Standard', 'Premium', 'PremiumRS', 'Free', 'Stretch', 'DataWarehouse', 'System', 'System2'.
+     * Get the edition of the database. The DatabaseEditions enumeration contains all the valid editions. If createMode is NonReadableSecondary or OnlineSecondary, this value is ignored.
+     The list of SKUs may vary by region and support offer. To determine the SKUs (including the SKU name, tier/edition, family, and capacity) that are available to your subscription in an Azure region, use the `Capabilities_ListByLocation` REST API or one of the following commands:
+     ```azurecli
+     az sql db list-editions -l &lt;location&gt; -o table
+     ````
+     ```powershell
+     Get-AzSqlServerServiceObjective -Location &lt;location&gt;
+     ````
+     . Possible values include: 'Web', 'Business', 'Basic', 'Standard', 'Premium', 'PremiumRS', 'Free', 'Stretch', 'DataWarehouse', 'System', 'System2', 'GeneralPurpose', 'BusinessCritical', 'Hyperscale'.
      *
      * @return the edition value
      */
@@ -510,7 +534,15 @@ public DatabaseEdition edition() {
     }
 
     /**
-     * Set the edition of the database. The DatabaseEditions enumeration contains all the valid editions. If createMode is NonReadableSecondary or OnlineSecondary, this value is ignored. To see possible values, query the capabilities API (/subscriptions/{subscriptionId}/providers/Microsoft.Sql/locations/{locationID}/capabilities) referred to by operationId: "Capabilities_ListByLocation." or use the Azure CLI command `az sql db list-editions -l westus --query [].name`. Possible values include: 'Web', 'Business', 'Basic', 'Standard', 'Premium', 'PremiumRS', 'Free', 'Stretch', 'DataWarehouse', 'System', 'System2'.
+     * Set the edition of the database. The DatabaseEditions enumeration contains all the valid editions. If createMode is NonReadableSecondary or OnlineSecondary, this value is ignored.
+     The list of SKUs may vary by region and support offer. To determine the SKUs (including the SKU name, tier/edition, family, and capacity) that are available to your subscription in an Azure region, use the `Capabilities_ListByLocation` REST API or one of the following commands:
+     ```azurecli
+     az sql db list-editions -l &lt;location&gt; -o table
+     ````
+     ```powershell
+     Get-AzSqlServerServiceObjective -Location &lt;location&gt;
+     ````
+     . Possible values include: 'Web', 'Business', 'Basic', 'Standard', 'Premium', 'PremiumRS', 'Free', 'Stretch', 'DataWarehouse', 'System', 'System2', 'GeneralPurpose', 'BusinessCritical', 'Hyperscale'.
      *
      * @param edition the edition value to set
      * @return the DatabaseUpdate object itself.
@@ -541,7 +573,8 @@ public DatabaseUpdate withMaxSizeBytes(String maxSizeBytes) {
     }
 
     /**
-     * Get the configured service level objective ID of the database. This is the service level objective that is in the process of being applied to the database. Once successfully updated, it will match the value of currentServiceObjectiveId property. If requestedServiceObjectiveId and requestedServiceObjectiveName are both updated, the value of requestedServiceObjectiveId overrides the value of requestedServiceObjectiveName. To see possible values, query the capabilities API (/subscriptions/{subscriptionId}/providers/Microsoft.Sql/locations/{locationID}/capabilities) referred to by operationId: "Capabilities_ListByLocation." or use the Azure CLI command `az sql db list-editions --location &lt;location&gt; --query [].supportedServiceLevelObjectives[].name` .
+     * Get the configured service level objective ID of the database. This is the service level objective that is in the process of being applied to the database. Once successfully updated, it will match the value of currentServiceObjectiveId property. If requestedServiceObjectiveId and requestedServiceObjectiveName are both updated, the value of requestedServiceObjectiveId overrides the value of requestedServiceObjectiveName.
+     The list of SKUs may vary by region and support offer. To determine the service objective ids that are available to your subscription in an Azure region, use the `Capabilities_ListByLocation` REST API.
      *
      * @return the requestedServiceObjectiveId value
      */
@@ -550,7 +583,8 @@ public UUID requestedServiceObjectiveId() {
     }
 
     /**
-     * Set the configured service level objective ID of the database. This is the service level objective that is in the process of being applied to the database. Once successfully updated, it will match the value of currentServiceObjectiveId property. If requestedServiceObjectiveId and requestedServiceObjectiveName are both updated, the value of requestedServiceObjectiveId overrides the value of requestedServiceObjectiveName. To see possible values, query the capabilities API (/subscriptions/{subscriptionId}/providers/Microsoft.Sql/locations/{locationID}/capabilities) referred to by operationId: "Capabilities_ListByLocation." or use the Azure CLI command `az sql db list-editions --location &lt;location&gt; --query [].supportedServiceLevelObjectives[].name` .
+     * Set the configured service level objective ID of the database. This is the service level objective that is in the process of being applied to the database. Once successfully updated, it will match the value of currentServiceObjectiveId property. If requestedServiceObjectiveId and requestedServiceObjectiveName are both updated, the value of requestedServiceObjectiveId overrides the value of requestedServiceObjectiveName.
+     The list of SKUs may vary by region and support offer. To determine the service objective ids that are available to your subscription in an Azure region, use the `Capabilities_ListByLocation` REST API.
      *
      * @param requestedServiceObjectiveId the requestedServiceObjectiveId value to set
      * @return the DatabaseUpdate object itself.
@@ -561,7 +595,15 @@ public DatabaseUpdate withRequestedServiceObjectiveId(UUID requestedServiceObjec
     }
 
     /**
-     * Get the name of the configured service level objective of the database. This is the service level objective that is in the process of being applied to the database. Once successfully updated, it will match the value of serviceLevelObjective property. To see possible values, query the capabilities API (/subscriptions/{subscriptionId}/providers/Microsoft.Sql/locations/{locationID}/capabilities) referred to by operationId: "Capabilities_ListByLocation." or use the Azure CLI command `az sql db list-editions --location &lt;location&gt; --query [].supportedServiceLevelObjectives[].name`. Possible values include: 'System', 'System0', 'System1', 'System2', 'System3', 'System4', 'System2L', 'System3L', 'System4L', 'Free', 'Basic', 'S0', 'S1', 'S2', 'S3', 'S4', 'S6', 'S7', 'S9', 'S12', 'P1', 'P2', 'P3', 'P4', 'P6', 'P11', 'P15', 'PRS1', 'PRS2', 'PRS4', 'PRS6', 'DW100', 'DW200', 'DW300', 'DW400', 'DW500', 'DW600', 'DW1000', 'DW1200', 'DW1000c', 'DW1500', 'DW1500c', 'DW2000', 'DW2000c', 'DW3000', 'DW2500c', 'DW3000c', 'DW6000', 'DW5000c', 'DW6000c', 'DW7500c', 'DW10000c', 'DW15000c', 'DW30000c', 'DS100', 'DS200', 'DS300', 'DS400', 'DS500', 'DS600', 'DS1000', 'DS1200', 'DS1500', 'DS2000', 'ElasticPool'.
+     * Get the name of the configured service level objective of the database. This is the service level objective that is in the process of being applied to the database. Once successfully updated, it will match the value of serviceLevelObjective property.
+     The list of SKUs may vary by region and support offer. To determine the SKUs (including the SKU name, tier/edition, family, and capacity) that are available to your subscription in an Azure region, use the `Capabilities_ListByLocation` REST API or one of the following commands:
+     ```azurecli
+     az sql db list-editions -l &lt;location&gt; -o table
+     ````
+     ```powershell
+     Get-AzSqlServerServiceObjective -Location &lt;location&gt;
+     ````
+     . Possible values include: 'System', 'System0', 'System1', 'System2', 'System3', 'System4', 'System2L', 'System3L', 'System4L', 'Free', 'Basic', 'S0', 'S1', 'S2', 'S3', 'S4', 'S6', 'S7', 'S9', 'S12', 'P1', 'P2', 'P3', 'P4', 'P6', 'P11', 'P15', 'PRS1', 'PRS2', 'PRS4', 'PRS6', 'DW100', 'DW200', 'DW300', 'DW400', 'DW500', 'DW600', 'DW1000', 'DW1200', 'DW1000c', 'DW1500', 'DW1500c', 'DW2000', 'DW2000c', 'DW3000', 'DW2500c', 'DW3000c', 'DW6000', 'DW5000c', 'DW6000c', 'DW7500c', 'DW10000c', 'DW15000c', 'DW30000c', 'DS100', 'DS200', 'DS300', 'DS400', 'DS500', 'DS600', 'DS1000', 'DS1200', 'DS1500', 'DS2000', 'ElasticPool'.
      *
      * @return the requestedServiceObjectiveName value
      */
@@ -570,7 +612,15 @@ public ServiceObjectiveName requestedServiceObjectiveName() {
     }
 
     /**
-     * Set the name of the configured service level objective of the database. This is the service level objective that is in the process of being applied to the database. Once successfully updated, it will match the value of serviceLevelObjective property. To see possible values, query the capabilities API (/subscriptions/{subscriptionId}/providers/Microsoft.Sql/locations/{locationID}/capabilities) referred to by operationId: "Capabilities_ListByLocation." or use the Azure CLI command `az sql db list-editions --location &lt;location&gt; --query [].supportedServiceLevelObjectives[].name`. Possible values include: 'System', 'System0', 'System1', 'System2', 'System3', 'System4', 'System2L', 'System3L', 'System4L', 'Free', 'Basic', 'S0', 'S1', 'S2', 'S3', 'S4', 'S6', 'S7', 'S9', 'S12', 'P1', 'P2', 'P3', 'P4', 'P6', 'P11', 'P15', 'PRS1', 'PRS2', 'PRS4', 'PRS6', 'DW100', 'DW200', 'DW300', 'DW400', 'DW500', 'DW600', 'DW1000', 'DW1200', 'DW1000c', 'DW1500', 'DW1500c', 'DW2000', 'DW2000c', 'DW3000', 'DW2500c', 'DW3000c', 'DW6000', 'DW5000c', 'DW6000c', 'DW7500c', 'DW10000c', 'DW15000c', 'DW30000c', 'DS100', 'DS200', 'DS300', 'DS400', 'DS500', 'DS600', 'DS1000', 'DS1200', 'DS1500', 'DS2000', 'ElasticPool'.
+     * Set the name of the configured service level objective of the database. This is the service level objective that is in the process of being applied to the database. Once successfully updated, it will match the value of serviceLevelObjective property.
+     The list of SKUs may vary by region and support offer. To determine the SKUs (including the SKU name, tier/edition, family, and capacity) that are available to your subscription in an Azure region, use the `Capabilities_ListByLocation` REST API or one of the following commands:
+     ```azurecli
+     az sql db list-editions -l &lt;location&gt; -o table
+     ````
+     ```powershell
+     Get-AzSqlServerServiceObjective -Location &lt;location&gt;
+     ````
+     . Possible values include: 'System', 'System0', 'System1', 'System2', 'System3', 'System4', 'System2L', 'System3L', 'System4L', 'Free', 'Basic', 'S0', 'S1', 'S2', 'S3', 'S4', 'S6', 'S7', 'S9', 'S12', 'P1', 'P2', 'P3', 'P4', 'P6', 'P11', 'P15', 'PRS1', 'PRS2', 'PRS4', 'PRS6', 'DW100', 'DW200', 'DW300', 'DW400', 'DW500', 'DW600', 'DW1000', 'DW1200', 'DW1000c', 'DW1500', 'DW1500c', 'DW2000', 'DW2000c', 'DW3000', 'DW2500c', 'DW3000c', 'DW6000', 'DW5000c', 'DW6000c', 'DW7500c', 'DW10000c', 'DW15000c', 'DW30000c', 'DS100', 'DS200', 'DS300', 'DS400', 'DS500', 'DS600', 'DS1000', 'DS1200', 'DS1500', 'DS2000', 'ElasticPool'.
      *
      * @param requestedServiceObjectiveName the requestedServiceObjectiveName value to set
      * @return the DatabaseUpdate object itself.
diff --git a/sql/resource-manager/v2014_04_01/src/main/java/com/microsoft/azure/management/sql/v2014_04_01/ElasticPoolEdition.java b/sql/resource-manager/v2014_04_01/src/main/java/com/microsoft/azure/management/sql/v2014_04_01/ElasticPoolEdition.java
index 842f33fc9786..f5d47601dfbe 100644
--- a/sql/resource-manager/v2014_04_01/src/main/java/com/microsoft/azure/management/sql/v2014_04_01/ElasticPoolEdition.java
+++ b/sql/resource-manager/v2014_04_01/src/main/java/com/microsoft/azure/management/sql/v2014_04_01/ElasticPoolEdition.java
@@ -25,6 +25,12 @@ public final class ElasticPoolEdition extends ExpandableStringEnum<ElasticPoolEd
     /** Static value Premium for ElasticPoolEdition. */
     public static final ElasticPoolEdition PREMIUM = fromString("Premium");
 
+    /** Static value GeneralPurpose for ElasticPoolEdition. */
+    public static final ElasticPoolEdition GENERAL_PURPOSE = fromString("GeneralPurpose");
+
+    /** Static value BusinessCritical for ElasticPoolEdition. */
+    public static final ElasticPoolEdition BUSINESS_CRITICAL = fromString("BusinessCritical");
+
     /**
      * Creates or finds a ElasticPoolEdition from its string representation.
      * @param name a name to look for
diff --git a/sql/resource-manager/v2014_04_01/src/main/java/com/microsoft/azure/management/sql/v2014_04_01/ElasticPoolUpdate.java b/sql/resource-manager/v2014_04_01/src/main/java/com/microsoft/azure/management/sql/v2014_04_01/ElasticPoolUpdate.java
index ecefd193f0ec..a1a7d2bb9ea7 100644
--- a/sql/resource-manager/v2014_04_01/src/main/java/com/microsoft/azure/management/sql/v2014_04_01/ElasticPoolUpdate.java
+++ b/sql/resource-manager/v2014_04_01/src/main/java/com/microsoft/azure/management/sql/v2014_04_01/ElasticPoolUpdate.java
@@ -40,7 +40,7 @@ public class ElasticPoolUpdate extends ProxyResource {
 
     /**
      * The edition of the elastic pool. Possible values include: 'Basic',
-     * 'Standard', 'Premium'.
+     * 'Standard', 'Premium', 'GeneralPurpose', 'BusinessCritical'.
      */
     @JsonProperty(value = "properties.edition")
     private ElasticPoolEdition edition;
@@ -116,7 +116,7 @@ public ElasticPoolState state() {
     }
 
     /**
-     * Get the edition of the elastic pool. Possible values include: 'Basic', 'Standard', 'Premium'.
+     * Get the edition of the elastic pool. Possible values include: 'Basic', 'Standard', 'Premium', 'GeneralPurpose', 'BusinessCritical'.
      *
      * @return the edition value
      */
@@ -125,7 +125,7 @@ public ElasticPoolEdition edition() {
     }
 
     /**
-     * Set the edition of the elastic pool. Possible values include: 'Basic', 'Standard', 'Premium'.
+     * Set the edition of the elastic pool. Possible values include: 'Basic', 'Standard', 'Premium', 'GeneralPurpose', 'BusinessCritical'.
      *
      * @param edition the edition value to set
      * @return the ElasticPoolUpdate object itself.
diff --git a/sql/resource-manager/v2014_04_01/src/main/java/com/microsoft/azure/management/sql/v2014_04_01/ImportRequest.java b/sql/resource-manager/v2014_04_01/src/main/java/com/microsoft/azure/management/sql/v2014_04_01/ImportRequest.java
index f947a3473e50..c7955209ff71 100644
--- a/sql/resource-manager/v2014_04_01/src/main/java/com/microsoft/azure/management/sql/v2014_04_01/ImportRequest.java
+++ b/sql/resource-manager/v2014_04_01/src/main/java/com/microsoft/azure/management/sql/v2014_04_01/ImportRequest.java
@@ -21,9 +21,23 @@ public class ImportRequest extends ExportRequest {
     private String databaseName;
 
     /**
-     * The edition for the database being created. Possible values include:
-     * 'Web', 'Business', 'Basic', 'Standard', 'Premium', 'PremiumRS', 'Free',
-     * 'Stretch', 'DataWarehouse', 'System', 'System2'.
+     * The edition for the database being created.
+     *
+     * The list of SKUs may vary by region and support offer. To determine the
+     * SKUs (including the SKU name, tier/edition, family, and capacity) that
+     * are available to your subscription in an Azure region, use the
+     * `Capabilities_ListByLocation` REST API or one of the following commands:
+     *
+     * ```azurecli
+     * az sql db list-editions -l &lt;location&gt; -o table
+     * ````
+     *
+     * ```powershell
+     * Get-AzSqlServerServiceObjective -Location &lt;location&gt;
+     * ````
+     * . Possible values include: 'Web', 'Business', 'Basic', 'Standard',
+     * 'Premium', 'PremiumRS', 'Free', 'Stretch', 'DataWarehouse', 'System',
+     * 'System2', 'GeneralPurpose', 'BusinessCritical', 'Hyperscale'.
      */
     @JsonProperty(value = "edition", required = true)
     private DatabaseEdition edition;
@@ -70,7 +84,15 @@ public ImportRequest withDatabaseName(String databaseName) {
     }
 
     /**
-     * Get the edition for the database being created. Possible values include: 'Web', 'Business', 'Basic', 'Standard', 'Premium', 'PremiumRS', 'Free', 'Stretch', 'DataWarehouse', 'System', 'System2'.
+     * Get the edition for the database being created.
+     The list of SKUs may vary by region and support offer. To determine the SKUs (including the SKU name, tier/edition, family, and capacity) that are available to your subscription in an Azure region, use the `Capabilities_ListByLocation` REST API or one of the following commands:
+     ```azurecli
+     az sql db list-editions -l &lt;location&gt; -o table
+     ````
+     ```powershell
+     Get-AzSqlServerServiceObjective -Location &lt;location&gt;
+     ````
+     . Possible values include: 'Web', 'Business', 'Basic', 'Standard', 'Premium', 'PremiumRS', 'Free', 'Stretch', 'DataWarehouse', 'System', 'System2', 'GeneralPurpose', 'BusinessCritical', 'Hyperscale'.
      *
      * @return the edition value
      */
@@ -79,7 +101,15 @@ public DatabaseEdition edition() {
     }
 
     /**
-     * Set the edition for the database being created. Possible values include: 'Web', 'Business', 'Basic', 'Standard', 'Premium', 'PremiumRS', 'Free', 'Stretch', 'DataWarehouse', 'System', 'System2'.
+     * Set the edition for the database being created.
+     The list of SKUs may vary by region and support offer. To determine the SKUs (including the SKU name, tier/edition, family, and capacity) that are available to your subscription in an Azure region, use the `Capabilities_ListByLocation` REST API or one of the following commands:
+     ```azurecli
+     az sql db list-editions -l &lt;location&gt; -o table
+     ````
+     ```powershell
+     Get-AzSqlServerServiceObjective -Location &lt;location&gt;
+     ````
+     . Possible values include: 'Web', 'Business', 'Basic', 'Standard', 'Premium', 'PremiumRS', 'Free', 'Stretch', 'DataWarehouse', 'System', 'System2', 'GeneralPurpose', 'BusinessCritical', 'Hyperscale'.
      *
      * @param edition the edition value to set
      * @return the ImportRequest object itself.
diff --git a/sql/resource-manager/v2014_04_01/src/main/java/com/microsoft/azure/management/sql/v2014_04_01/implementation/DatabaseInner.java b/sql/resource-manager/v2014_04_01/src/main/java/com/microsoft/azure/management/sql/v2014_04_01/implementation/DatabaseInner.java
index 5cc5b1b54d28..ad94561971b7 100644
--- a/sql/resource-manager/v2014_04_01/src/main/java/com/microsoft/azure/management/sql/v2014_04_01/implementation/DatabaseInner.java
+++ b/sql/resource-manager/v2014_04_01/src/main/java/com/microsoft/azure/management/sql/v2014_04_01/implementation/DatabaseInner.java
@@ -156,14 +156,23 @@ public class DatabaseInner extends Resource {
     /**
      * The edition of the database. The DatabaseEditions enumeration contains
      * all the valid editions. If createMode is NonReadableSecondary or
-     * OnlineSecondary, this value is ignored. To see possible values, query
-     * the capabilities API
-     * (/subscriptions/{subscriptionId}/providers/Microsoft.Sql/locations/{locationID}/capabilities)
-     * referred to by operationId: "Capabilities_ListByLocation." or use the
-     * Azure CLI command `az sql db list-editions -l westus --query [].name`.
-     * Possible values include: 'Web', 'Business', 'Basic', 'Standard',
+     * OnlineSecondary, this value is ignored.
+     *
+     * The list of SKUs may vary by region and support offer. To determine the
+     * SKUs (including the SKU name, tier/edition, family, and capacity) that
+     * are available to your subscription in an Azure region, use the
+     * `Capabilities_ListByLocation` REST API or one of the following commands:
+     *
+     * ```azurecli
+     * az sql db list-editions -l &lt;location&gt; -o table
+     * ````
+     *
+     * ```powershell
+     * Get-AzSqlServerServiceObjective -Location &lt;location&gt;
+     * ````
+     * . Possible values include: 'Web', 'Business', 'Basic', 'Standard',
      * 'Premium', 'PremiumRS', 'Free', 'Stretch', 'DataWarehouse', 'System',
-     * 'System2'.
+     * 'System2', 'GeneralPurpose', 'BusinessCritical', 'Hyperscale'.
      */
     @JsonProperty(value = "properties.edition")
     private DatabaseEdition edition;
@@ -185,12 +194,11 @@ public class DatabaseInner extends Resource {
      * currentServiceObjectiveId property. If requestedServiceObjectiveId and
      * requestedServiceObjectiveName are both updated, the value of
      * requestedServiceObjectiveId overrides the value of
-     * requestedServiceObjectiveName. To see possible values, query the
-     * capabilities API
-     * (/subscriptions/{subscriptionId}/providers/Microsoft.Sql/locations/{locationID}/capabilities)
-     * referred to by operationId: "Capabilities_ListByLocation." or use the
-     * Azure CLI command `az sql db list-editions --location &lt;location&gt;
-     * --query [].supportedServiceLevelObjectives[].name` .
+     * requestedServiceObjectiveName.
+     *
+     * The list of SKUs may vary by region and support offer. To determine the
+     * service objective ids that are available to your subscription in an
+     * Azure region, use the `Capabilities_ListByLocation` REST API.
      */
     @JsonProperty(value = "properties.requestedServiceObjectiveId")
     private UUID requestedServiceObjectiveId;
@@ -199,21 +207,29 @@ public class DatabaseInner extends Resource {
      * The name of the configured service level objective of the database. This
      * is the service level objective that is in the process of being applied
      * to the database. Once successfully updated, it will match the value of
-     * serviceLevelObjective property. To see possible values, query the
-     * capabilities API
-     * (/subscriptions/{subscriptionId}/providers/Microsoft.Sql/locations/{locationID}/capabilities)
-     * referred to by operationId: "Capabilities_ListByLocation." or use the
-     * Azure CLI command `az sql db list-editions --location &lt;location&gt;
-     * --query [].supportedServiceLevelObjectives[].name`. Possible values
-     * include: 'System', 'System0', 'System1', 'System2', 'System3',
-     * 'System4', 'System2L', 'System3L', 'System4L', 'Free', 'Basic', 'S0',
-     * 'S1', 'S2', 'S3', 'S4', 'S6', 'S7', 'S9', 'S12', 'P1', 'P2', 'P3', 'P4',
-     * 'P6', 'P11', 'P15', 'PRS1', 'PRS2', 'PRS4', 'PRS6', 'DW100', 'DW200',
-     * 'DW300', 'DW400', 'DW500', 'DW600', 'DW1000', 'DW1200', 'DW1000c',
-     * 'DW1500', 'DW1500c', 'DW2000', 'DW2000c', 'DW3000', 'DW2500c',
-     * 'DW3000c', 'DW6000', 'DW5000c', 'DW6000c', 'DW7500c', 'DW10000c',
-     * 'DW15000c', 'DW30000c', 'DS100', 'DS200', 'DS300', 'DS400', 'DS500',
-     * 'DS600', 'DS1000', 'DS1200', 'DS1500', 'DS2000', 'ElasticPool'.
+     * serviceLevelObjective property.
+     *
+     * The list of SKUs may vary by region and support offer. To determine the
+     * SKUs (including the SKU name, tier/edition, family, and capacity) that
+     * are available to your subscription in an Azure region, use the
+     * `Capabilities_ListByLocation` REST API or one of the following commands:
+     *
+     * ```azurecli
+     * az sql db list-editions -l &lt;location&gt; -o table
+     * ````
+     *
+     * ```powershell
+     * Get-AzSqlServerServiceObjective -Location &lt;location&gt;
+     * ````
+     * . Possible values include: 'System', 'System0', 'System1', 'System2',
+     * 'System3', 'System4', 'System2L', 'System3L', 'System4L', 'Free',
+     * 'Basic', 'S0', 'S1', 'S2', 'S3', 'S4', 'S6', 'S7', 'S9', 'S12', 'P1',
+     * 'P2', 'P3', 'P4', 'P6', 'P11', 'P15', 'PRS1', 'PRS2', 'PRS4', 'PRS6',
+     * 'DW100', 'DW200', 'DW300', 'DW400', 'DW500', 'DW600', 'DW1000',
+     * 'DW1200', 'DW1000c', 'DW1500', 'DW1500c', 'DW2000', 'DW2000c', 'DW3000',
+     * 'DW2500c', 'DW3000c', 'DW6000', 'DW5000c', 'DW6000c', 'DW7500c',
+     * 'DW10000c', 'DW15000c', 'DW30000c', 'DS100', 'DS200', 'DS300', 'DS400',
+     * 'DS500', 'DS600', 'DS1000', 'DS1200', 'DS1500', 'DS2000', 'ElasticPool'.
      */
     @JsonProperty(value = "properties.requestedServiceObjectiveName")
     private ServiceObjectiveName requestedServiceObjectiveName;
@@ -494,7 +510,15 @@ public DatabaseInner withRecoveryServicesRecoveryPointResourceId(String recovery
     }
 
     /**
-     * Get the edition of the database. The DatabaseEditions enumeration contains all the valid editions. If createMode is NonReadableSecondary or OnlineSecondary, this value is ignored. To see possible values, query the capabilities API (/subscriptions/{subscriptionId}/providers/Microsoft.Sql/locations/{locationID}/capabilities) referred to by operationId: "Capabilities_ListByLocation." or use the Azure CLI command `az sql db list-editions -l westus --query [].name`. Possible values include: 'Web', 'Business', 'Basic', 'Standard', 'Premium', 'PremiumRS', 'Free', 'Stretch', 'DataWarehouse', 'System', 'System2'.
+     * Get the edition of the database. The DatabaseEditions enumeration contains all the valid editions. If createMode is NonReadableSecondary or OnlineSecondary, this value is ignored.
+     The list of SKUs may vary by region and support offer. To determine the SKUs (including the SKU name, tier/edition, family, and capacity) that are available to your subscription in an Azure region, use the `Capabilities_ListByLocation` REST API or one of the following commands:
+     ```azurecli
+     az sql db list-editions -l &lt;location&gt; -o table
+     ````
+     ```powershell
+     Get-AzSqlServerServiceObjective -Location &lt;location&gt;
+     ````
+     . Possible values include: 'Web', 'Business', 'Basic', 'Standard', 'Premium', 'PremiumRS', 'Free', 'Stretch', 'DataWarehouse', 'System', 'System2', 'GeneralPurpose', 'BusinessCritical', 'Hyperscale'.
      *
      * @return the edition value
      */
@@ -503,7 +527,15 @@ public DatabaseEdition edition() {
     }
 
     /**
-     * Set the edition of the database. The DatabaseEditions enumeration contains all the valid editions. If createMode is NonReadableSecondary or OnlineSecondary, this value is ignored. To see possible values, query the capabilities API (/subscriptions/{subscriptionId}/providers/Microsoft.Sql/locations/{locationID}/capabilities) referred to by operationId: "Capabilities_ListByLocation." or use the Azure CLI command `az sql db list-editions -l westus --query [].name`. Possible values include: 'Web', 'Business', 'Basic', 'Standard', 'Premium', 'PremiumRS', 'Free', 'Stretch', 'DataWarehouse', 'System', 'System2'.
+     * Set the edition of the database. The DatabaseEditions enumeration contains all the valid editions. If createMode is NonReadableSecondary or OnlineSecondary, this value is ignored.
+     The list of SKUs may vary by region and support offer. To determine the SKUs (including the SKU name, tier/edition, family, and capacity) that are available to your subscription in an Azure region, use the `Capabilities_ListByLocation` REST API or one of the following commands:
+     ```azurecli
+     az sql db list-editions -l &lt;location&gt; -o table
+     ````
+     ```powershell
+     Get-AzSqlServerServiceObjective -Location &lt;location&gt;
+     ````
+     . Possible values include: 'Web', 'Business', 'Basic', 'Standard', 'Premium', 'PremiumRS', 'Free', 'Stretch', 'DataWarehouse', 'System', 'System2', 'GeneralPurpose', 'BusinessCritical', 'Hyperscale'.
      *
      * @param edition the edition value to set
      * @return the DatabaseInner object itself.
@@ -534,7 +566,8 @@ public DatabaseInner withMaxSizeBytes(String maxSizeBytes) {
     }
 
     /**
-     * Get the configured service level objective ID of the database. This is the service level objective that is in the process of being applied to the database. Once successfully updated, it will match the value of currentServiceObjectiveId property. If requestedServiceObjectiveId and requestedServiceObjectiveName are both updated, the value of requestedServiceObjectiveId overrides the value of requestedServiceObjectiveName. To see possible values, query the capabilities API (/subscriptions/{subscriptionId}/providers/Microsoft.Sql/locations/{locationID}/capabilities) referred to by operationId: "Capabilities_ListByLocation." or use the Azure CLI command `az sql db list-editions --location &lt;location&gt; --query [].supportedServiceLevelObjectives[].name` .
+     * Get the configured service level objective ID of the database. This is the service level objective that is in the process of being applied to the database. Once successfully updated, it will match the value of currentServiceObjectiveId property. If requestedServiceObjectiveId and requestedServiceObjectiveName are both updated, the value of requestedServiceObjectiveId overrides the value of requestedServiceObjectiveName.
+     The list of SKUs may vary by region and support offer. To determine the service objective ids that are available to your subscription in an Azure region, use the `Capabilities_ListByLocation` REST API.
      *
      * @return the requestedServiceObjectiveId value
      */
@@ -543,7 +576,8 @@ public UUID requestedServiceObjectiveId() {
     }
 
     /**
-     * Set the configured service level objective ID of the database. This is the service level objective that is in the process of being applied to the database. Once successfully updated, it will match the value of currentServiceObjectiveId property. If requestedServiceObjectiveId and requestedServiceObjectiveName are both updated, the value of requestedServiceObjectiveId overrides the value of requestedServiceObjectiveName. To see possible values, query the capabilities API (/subscriptions/{subscriptionId}/providers/Microsoft.Sql/locations/{locationID}/capabilities) referred to by operationId: "Capabilities_ListByLocation." or use the Azure CLI command `az sql db list-editions --location &lt;location&gt; --query [].supportedServiceLevelObjectives[].name` .
+     * Set the configured service level objective ID of the database. This is the service level objective that is in the process of being applied to the database. Once successfully updated, it will match the value of currentServiceObjectiveId property. If requestedServiceObjectiveId and requestedServiceObjectiveName are both updated, the value of requestedServiceObjectiveId overrides the value of requestedServiceObjectiveName.
+     The list of SKUs may vary by region and support offer. To determine the service objective ids that are available to your subscription in an Azure region, use the `Capabilities_ListByLocation` REST API.
      *
      * @param requestedServiceObjectiveId the requestedServiceObjectiveId value to set
      * @return the DatabaseInner object itself.
@@ -554,7 +588,15 @@ public DatabaseInner withRequestedServiceObjectiveId(UUID requestedServiceObject
     }
 
     /**
-     * Get the name of the configured service level objective of the database. This is the service level objective that is in the process of being applied to the database. Once successfully updated, it will match the value of serviceLevelObjective property. To see possible values, query the capabilities API (/subscriptions/{subscriptionId}/providers/Microsoft.Sql/locations/{locationID}/capabilities) referred to by operationId: "Capabilities_ListByLocation." or use the Azure CLI command `az sql db list-editions --location &lt;location&gt; --query [].supportedServiceLevelObjectives[].name`. Possible values include: 'System', 'System0', 'System1', 'System2', 'System3', 'System4', 'System2L', 'System3L', 'System4L', 'Free', 'Basic', 'S0', 'S1', 'S2', 'S3', 'S4', 'S6', 'S7', 'S9', 'S12', 'P1', 'P2', 'P3', 'P4', 'P6', 'P11', 'P15', 'PRS1', 'PRS2', 'PRS4', 'PRS6', 'DW100', 'DW200', 'DW300', 'DW400', 'DW500', 'DW600', 'DW1000', 'DW1200', 'DW1000c', 'DW1500', 'DW1500c', 'DW2000', 'DW2000c', 'DW3000', 'DW2500c', 'DW3000c', 'DW6000', 'DW5000c', 'DW6000c', 'DW7500c', 'DW10000c', 'DW15000c', 'DW30000c', 'DS100', 'DS200', 'DS300', 'DS400', 'DS500', 'DS600', 'DS1000', 'DS1200', 'DS1500', 'DS2000', 'ElasticPool'.
+     * Get the name of the configured service level objective of the database. This is the service level objective that is in the process of being applied to the database. Once successfully updated, it will match the value of serviceLevelObjective property.
+     The list of SKUs may vary by region and support offer. To determine the SKUs (including the SKU name, tier/edition, family, and capacity) that are available to your subscription in an Azure region, use the `Capabilities_ListByLocation` REST API or one of the following commands:
+     ```azurecli
+     az sql db list-editions -l &lt;location&gt; -o table
+     ````
+     ```powershell
+     Get-AzSqlServerServiceObjective -Location &lt;location&gt;
+     ````
+     . Possible values include: 'System', 'System0', 'System1', 'System2', 'System3', 'System4', 'System2L', 'System3L', 'System4L', 'Free', 'Basic', 'S0', 'S1', 'S2', 'S3', 'S4', 'S6', 'S7', 'S9', 'S12', 'P1', 'P2', 'P3', 'P4', 'P6', 'P11', 'P15', 'PRS1', 'PRS2', 'PRS4', 'PRS6', 'DW100', 'DW200', 'DW300', 'DW400', 'DW500', 'DW600', 'DW1000', 'DW1200', 'DW1000c', 'DW1500', 'DW1500c', 'DW2000', 'DW2000c', 'DW3000', 'DW2500c', 'DW3000c', 'DW6000', 'DW5000c', 'DW6000c', 'DW7500c', 'DW10000c', 'DW15000c', 'DW30000c', 'DS100', 'DS200', 'DS300', 'DS400', 'DS500', 'DS600', 'DS1000', 'DS1200', 'DS1500', 'DS2000', 'ElasticPool'.
      *
      * @return the requestedServiceObjectiveName value
      */
@@ -563,7 +605,15 @@ public ServiceObjectiveName requestedServiceObjectiveName() {
     }
 
     /**
-     * Set the name of the configured service level objective of the database. This is the service level objective that is in the process of being applied to the database. Once successfully updated, it will match the value of serviceLevelObjective property. To see possible values, query the capabilities API (/subscriptions/{subscriptionId}/providers/Microsoft.Sql/locations/{locationID}/capabilities) referred to by operationId: "Capabilities_ListByLocation." or use the Azure CLI command `az sql db list-editions --location &lt;location&gt; --query [].supportedServiceLevelObjectives[].name`. Possible values include: 'System', 'System0', 'System1', 'System2', 'System3', 'System4', 'System2L', 'System3L', 'System4L', 'Free', 'Basic', 'S0', 'S1', 'S2', 'S3', 'S4', 'S6', 'S7', 'S9', 'S12', 'P1', 'P2', 'P3', 'P4', 'P6', 'P11', 'P15', 'PRS1', 'PRS2', 'PRS4', 'PRS6', 'DW100', 'DW200', 'DW300', 'DW400', 'DW500', 'DW600', 'DW1000', 'DW1200', 'DW1000c', 'DW1500', 'DW1500c', 'DW2000', 'DW2000c', 'DW3000', 'DW2500c', 'DW3000c', 'DW6000', 'DW5000c', 'DW6000c', 'DW7500c', 'DW10000c', 'DW15000c', 'DW30000c', 'DS100', 'DS200', 'DS300', 'DS400', 'DS500', 'DS600', 'DS1000', 'DS1200', 'DS1500', 'DS2000', 'ElasticPool'.
+     * Set the name of the configured service level objective of the database. This is the service level objective that is in the process of being applied to the database. Once successfully updated, it will match the value of serviceLevelObjective property.
+     The list of SKUs may vary by region and support offer. To determine the SKUs (including the SKU name, tier/edition, family, and capacity) that are available to your subscription in an Azure region, use the `Capabilities_ListByLocation` REST API or one of the following commands:
+     ```azurecli
+     az sql db list-editions -l &lt;location&gt; -o table
+     ````
+     ```powershell
+     Get-AzSqlServerServiceObjective -Location &lt;location&gt;
+     ````
+     . Possible values include: 'System', 'System0', 'System1', 'System2', 'System3', 'System4', 'System2L', 'System3L', 'System4L', 'Free', 'Basic', 'S0', 'S1', 'S2', 'S3', 'S4', 'S6', 'S7', 'S9', 'S12', 'P1', 'P2', 'P3', 'P4', 'P6', 'P11', 'P15', 'PRS1', 'PRS2', 'PRS4', 'PRS6', 'DW100', 'DW200', 'DW300', 'DW400', 'DW500', 'DW600', 'DW1000', 'DW1200', 'DW1000c', 'DW1500', 'DW1500c', 'DW2000', 'DW2000c', 'DW3000', 'DW2500c', 'DW3000c', 'DW6000', 'DW5000c', 'DW6000c', 'DW7500c', 'DW10000c', 'DW15000c', 'DW30000c', 'DS100', 'DS200', 'DS300', 'DS400', 'DS500', 'DS600', 'DS1000', 'DS1200', 'DS1500', 'DS2000', 'ElasticPool'.
      *
      * @param requestedServiceObjectiveName the requestedServiceObjectiveName value to set
      * @return the DatabaseInner object itself.
diff --git a/sql/resource-manager/v2014_04_01/src/main/java/com/microsoft/azure/management/sql/v2014_04_01/implementation/ElasticPoolInner.java b/sql/resource-manager/v2014_04_01/src/main/java/com/microsoft/azure/management/sql/v2014_04_01/implementation/ElasticPoolInner.java
index a07689e4ff81..3d4dcdabb77e 100644
--- a/sql/resource-manager/v2014_04_01/src/main/java/com/microsoft/azure/management/sql/v2014_04_01/implementation/ElasticPoolInner.java
+++ b/sql/resource-manager/v2014_04_01/src/main/java/com/microsoft/azure/management/sql/v2014_04_01/implementation/ElasticPoolInner.java
@@ -35,7 +35,7 @@ public class ElasticPoolInner extends Resource {
 
     /**
      * The edition of the elastic pool. Possible values include: 'Basic',
-     * 'Standard', 'Premium'.
+     * 'Standard', 'Premium', 'GeneralPurpose', 'BusinessCritical'.
      */
     @JsonProperty(value = "properties.edition")
     private ElasticPoolEdition edition;
@@ -98,7 +98,7 @@ public ElasticPoolState state() {
     }
 
     /**
-     * Get the edition of the elastic pool. Possible values include: 'Basic', 'Standard', 'Premium'.
+     * Get the edition of the elastic pool. Possible values include: 'Basic', 'Standard', 'Premium', 'GeneralPurpose', 'BusinessCritical'.
      *
      * @return the edition value
      */
@@ -107,7 +107,7 @@ public ElasticPoolEdition edition() {
     }
 
     /**
-     * Set the edition of the elastic pool. Possible values include: 'Basic', 'Standard', 'Premium'.
+     * Set the edition of the elastic pool. Possible values include: 'Basic', 'Standard', 'Premium', 'GeneralPurpose', 'BusinessCritical'.
      *
      * @param edition the edition value to set
      * @return the ElasticPoolInner object itself.
diff --git a/sql/resource-manager/v2014_04_01/src/main/java/com/microsoft/azure/management/sql/v2014_04_01/implementation/RecommendedElasticPoolInner.java b/sql/resource-manager/v2014_04_01/src/main/java/com/microsoft/azure/management/sql/v2014_04_01/implementation/RecommendedElasticPoolInner.java
index d1325b66bb07..7340928fb1b5 100644
--- a/sql/resource-manager/v2014_04_01/src/main/java/com/microsoft/azure/management/sql/v2014_04_01/implementation/RecommendedElasticPoolInner.java
+++ b/sql/resource-manager/v2014_04_01/src/main/java/com/microsoft/azure/management/sql/v2014_04_01/implementation/RecommendedElasticPoolInner.java
@@ -23,7 +23,7 @@ public class RecommendedElasticPoolInner extends ProxyResource {
     /**
      * The edition of the recommended elastic pool. The ElasticPoolEdition
      * enumeration contains all the valid editions. Possible values include:
-     * 'Basic', 'Standard', 'Premium'.
+     * 'Basic', 'Standard', 'Premium', 'GeneralPurpose', 'BusinessCritical'.
      */
     @JsonProperty(value = "properties.databaseEdition", access = JsonProperty.Access.WRITE_ONLY)
     private ElasticPoolEdition databaseEdition;
@@ -89,7 +89,7 @@ public class RecommendedElasticPoolInner extends ProxyResource {
     private List<RecommendedElasticPoolMetricInner> metrics;
 
     /**
-     * Get the edition of the recommended elastic pool. The ElasticPoolEdition enumeration contains all the valid editions. Possible values include: 'Basic', 'Standard', 'Premium'.
+     * Get the edition of the recommended elastic pool. The ElasticPoolEdition enumeration contains all the valid editions. Possible values include: 'Basic', 'Standard', 'Premium', 'GeneralPurpose', 'BusinessCritical'.
      *
      * @return the databaseEdition value
      */
diff --git a/sql/resource-manager/v2015_05_01_preview/src/main/java/com/microsoft/azure/management/sql/v2015_05_01_preview/ManagedInstance.java b/sql/resource-manager/v2015_05_01_preview/src/main/java/com/microsoft/azure/management/sql/v2015_05_01_preview/ManagedInstance.java
index 8b3fc1069f25..6076d497ae63 100644
--- a/sql/resource-manager/v2015_05_01_preview/src/main/java/com/microsoft/azure/management/sql/v2015_05_01_preview/ManagedInstance.java
+++ b/sql/resource-manager/v2015_05_01_preview/src/main/java/com/microsoft/azure/management/sql/v2015_05_01_preview/ManagedInstance.java
@@ -78,7 +78,7 @@ public interface ManagedInstance extends HasInner<ManagedInstanceInner>, Resourc
     /**
      * @return the proxyOverride value.
      */
-    String proxyOverride();
+    ManagedInstanceProxyOverride proxyOverride();
 
     /**
      * @return the publicDataEndpointEnabled value.
@@ -234,7 +234,7 @@ interface WithProxyOverride {
             /**
              * Specifies proxyOverride.
              */
-            WithCreate withProxyOverride(String proxyOverride);
+            WithCreate withProxyOverride(ManagedInstanceProxyOverride proxyOverride);
         }
 
         /**
@@ -412,7 +412,7 @@ interface WithProxyOverride {
             /**
              * Specifies proxyOverride.
              */
-            Update withProxyOverride(String proxyOverride);
+            Update withProxyOverride(ManagedInstanceProxyOverride proxyOverride);
         }
 
         /**
diff --git a/sql/resource-manager/v2015_05_01_preview/src/main/java/com/microsoft/azure/management/sql/v2015_05_01_preview/ManagedInstanceUpdate.java b/sql/resource-manager/v2015_05_01_preview/src/main/java/com/microsoft/azure/management/sql/v2015_05_01_preview/ManagedInstanceUpdate.java
index aaa37bbb455b..5ce66ed3f1a5 100644
--- a/sql/resource-manager/v2015_05_01_preview/src/main/java/com/microsoft/azure/management/sql/v2015_05_01_preview/ManagedInstanceUpdate.java
+++ b/sql/resource-manager/v2015_05_01_preview/src/main/java/com/microsoft/azure/management/sql/v2015_05_01_preview/ManagedInstanceUpdate.java
@@ -131,10 +131,11 @@ public class ManagedInstanceUpdate {
     private DateTime restorePointInTime;
 
     /**
-     * Proxy override of the managed instance.
+     * Connection type used for connecting to the instance. Possible values
+     * include: 'Proxy', 'Redirect', 'Default'.
      */
     @JsonProperty(value = "properties.proxyOverride")
-    private String proxyOverride;
+    private ManagedInstanceProxyOverride proxyOverride;
 
     /**
      * Id of the timezone. Allowed values are timezones supported by Windows.
@@ -456,21 +457,21 @@ public ManagedInstanceUpdate withRestorePointInTime(DateTime restorePointInTime)
     }
 
     /**
-     * Get proxy override of the managed instance.
+     * Get connection type used for connecting to the instance. Possible values include: 'Proxy', 'Redirect', 'Default'.
      *
      * @return the proxyOverride value
      */
-    public String proxyOverride() {
+    public ManagedInstanceProxyOverride proxyOverride() {
         return this.proxyOverride;
     }
 
     /**
-     * Set proxy override of the managed instance.
+     * Set connection type used for connecting to the instance. Possible values include: 'Proxy', 'Redirect', 'Default'.
      *
      * @param proxyOverride the proxyOverride value to set
      * @return the ManagedInstanceUpdate object itself.
      */
-    public ManagedInstanceUpdate withProxyOverride(String proxyOverride) {
+    public ManagedInstanceUpdate withProxyOverride(ManagedInstanceProxyOverride proxyOverride) {
         this.proxyOverride = proxyOverride;
         return this;
     }
diff --git a/sql/resource-manager/v2015_05_01_preview/src/main/java/com/microsoft/azure/management/sql/v2015_05_01_preview/implementation/ManagedInstanceImpl.java b/sql/resource-manager/v2015_05_01_preview/src/main/java/com/microsoft/azure/management/sql/v2015_05_01_preview/implementation/ManagedInstanceImpl.java
index 097dca49914c..a8518ba8dfc7 100644
--- a/sql/resource-manager/v2015_05_01_preview/src/main/java/com/microsoft/azure/management/sql/v2015_05_01_preview/implementation/ManagedInstanceImpl.java
+++ b/sql/resource-manager/v2015_05_01_preview/src/main/java/com/microsoft/azure/management/sql/v2015_05_01_preview/implementation/ManagedInstanceImpl.java
@@ -17,6 +17,7 @@
 import com.microsoft.azure.management.sql.v2015_05_01_preview.Sku;
 import com.microsoft.azure.management.sql.v2015_05_01_preview.ManagedServerCreateMode;
 import com.microsoft.azure.management.sql.v2015_05_01_preview.ManagedInstanceLicenseType;
+import com.microsoft.azure.management.sql.v2015_05_01_preview.ManagedInstanceProxyOverride;
 import rx.functions.Func1;
 
 class ManagedInstanceImpl extends GroupableResourceCoreImpl<ManagedInstance, ManagedInstanceInner, ManagedInstanceImpl, SqlManager> implements ManagedInstance, ManagedInstance.Definition, ManagedInstance.Update {
@@ -120,7 +121,7 @@ public ManagedServerCreateMode managedInstanceCreateMode() {
     }
 
     @Override
-    public String proxyOverride() {
+    public ManagedInstanceProxyOverride proxyOverride() {
         return this.inner().proxyOverride();
     }
 
@@ -246,7 +247,7 @@ public ManagedInstanceImpl withManagedInstanceCreateMode(ManagedServerCreateMode
     }
 
     @Override
-    public ManagedInstanceImpl withProxyOverride(String proxyOverride) {
+    public ManagedInstanceImpl withProxyOverride(ManagedInstanceProxyOverride proxyOverride) {
         if (isInCreateMode()) {
             this.inner().withProxyOverride(proxyOverride);
         } else {
diff --git a/sql/resource-manager/v2015_05_01_preview/src/main/java/com/microsoft/azure/management/sql/v2015_05_01_preview/implementation/ManagedInstanceInner.java b/sql/resource-manager/v2015_05_01_preview/src/main/java/com/microsoft/azure/management/sql/v2015_05_01_preview/implementation/ManagedInstanceInner.java
index 70e98f46fb6b..c1ce6158e575 100644
--- a/sql/resource-manager/v2015_05_01_preview/src/main/java/com/microsoft/azure/management/sql/v2015_05_01_preview/implementation/ManagedInstanceInner.java
+++ b/sql/resource-manager/v2015_05_01_preview/src/main/java/com/microsoft/azure/management/sql/v2015_05_01_preview/implementation/ManagedInstanceInner.java
@@ -13,6 +13,7 @@
 import com.microsoft.azure.management.sql.v2015_05_01_preview.ManagedServerCreateMode;
 import com.microsoft.azure.management.sql.v2015_05_01_preview.ManagedInstanceLicenseType;
 import org.joda.time.DateTime;
+import com.microsoft.azure.management.sql.v2015_05_01_preview.ManagedInstanceProxyOverride;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.microsoft.rest.serializer.JsonFlatten;
 import com.microsoft.azure.Resource;
@@ -142,10 +143,11 @@ public class ManagedInstanceInner extends Resource {
     private DateTime restorePointInTime;
 
     /**
-     * Proxy override of the managed instance.
+     * Connection type used for connecting to the instance. Possible values
+     * include: 'Proxy', 'Redirect', 'Default'.
      */
     @JsonProperty(value = "properties.proxyOverride")
-    private String proxyOverride;
+    private ManagedInstanceProxyOverride proxyOverride;
 
     /**
      * Id of the timezone. Allowed values are timezones supported by Windows.
@@ -481,21 +483,21 @@ public ManagedInstanceInner withRestorePointInTime(DateTime restorePointInTime)
     }
 
     /**
-     * Get proxy override of the managed instance.
+     * Get connection type used for connecting to the instance. Possible values include: 'Proxy', 'Redirect', 'Default'.
      *
      * @return the proxyOverride value
      */
-    public String proxyOverride() {
+    public ManagedInstanceProxyOverride proxyOverride() {
         return this.proxyOverride;
     }
 
     /**
-     * Set proxy override of the managed instance.
+     * Set connection type used for connecting to the instance. Possible values include: 'Proxy', 'Redirect', 'Default'.
      *
      * @param proxyOverride the proxyOverride value to set
      * @return the ManagedInstanceInner object itself.
      */
-    public ManagedInstanceInner withProxyOverride(String proxyOverride) {
+    public ManagedInstanceInner withProxyOverride(ManagedInstanceProxyOverride proxyOverride) {
         this.proxyOverride = proxyOverride;
         return this;
     }
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/Database.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/Database.java
index 67c6cc9fd40b..9fcff5e88a16 100644
--- a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/Database.java
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/Database.java
@@ -25,6 +25,11 @@
  * Type representing Database.
  */
 public interface Database extends HasInner<DatabaseInner>, Indexable, Refreshable<Database>, Updatable<Database.Update>, HasManager<SqlManager> {
+    /**
+     * @return the autoPauseDelay value.
+     */
+    Integer autoPauseDelay();
+
     /**
      * @return the catalogCollation value.
      */
@@ -120,6 +125,11 @@ public interface Database extends HasInner<DatabaseInner>, Indexable, Refreshabl
      */
     Long maxSizeBytes();
 
+    /**
+     * @return the minCapacity value.
+     */
+    Double minCapacity();
+
     /**
      * @return the name value.
      */
@@ -231,6 +241,16 @@ interface WithLocation {
             WithCreate withLocation(String location);
         }
 
+        /**
+         * The stage of the database definition allowing to specify AutoPauseDelay.
+         */
+        interface WithAutoPauseDelay {
+            /**
+             * Specifies autoPauseDelay.
+             */
+            WithCreate withAutoPauseDelay(Integer autoPauseDelay);
+        }
+
         /**
          * The stage of the database definition allowing to specify CatalogCollation.
          */
@@ -301,6 +321,16 @@ interface WithMaxSizeBytes {
             WithCreate withMaxSizeBytes(Long maxSizeBytes);
         }
 
+        /**
+         * The stage of the database definition allowing to specify MinCapacity.
+         */
+        interface WithMinCapacity {
+            /**
+             * Specifies minCapacity.
+             */
+            WithCreate withMinCapacity(Double minCapacity);
+        }
+
         /**
          * The stage of the database definition allowing to specify ReadScale.
          */
@@ -416,19 +446,29 @@ interface WithZoneRedundant {
          * the resource to be created (via {@link WithCreate#create()}), but also allows
          * for any other optional settings to be specified.
          */
-        interface WithCreate extends Creatable<Database>, DefinitionStages.WithCatalogCollation, DefinitionStages.WithCollation, DefinitionStages.WithCreateMode, DefinitionStages.WithElasticPoolId, DefinitionStages.WithLicenseType, DefinitionStages.WithLongTermRetentionBackupResourceId, DefinitionStages.WithMaxSizeBytes, DefinitionStages.WithReadScale, DefinitionStages.WithRecoverableDatabaseId, DefinitionStages.WithRecoveryServicesRecoveryPointId, DefinitionStages.WithRestorableDroppedDatabaseId, DefinitionStages.WithRestorePointInTime, DefinitionStages.WithSampleName, DefinitionStages.WithSku, DefinitionStages.WithSourceDatabaseDeletionDate, DefinitionStages.WithSourceDatabaseId, DefinitionStages.WithTags, DefinitionStages.WithZoneRedundant {
+        interface WithCreate extends Creatable<Database>, DefinitionStages.WithAutoPauseDelay, DefinitionStages.WithCatalogCollation, DefinitionStages.WithCollation, DefinitionStages.WithCreateMode, DefinitionStages.WithElasticPoolId, DefinitionStages.WithLicenseType, DefinitionStages.WithLongTermRetentionBackupResourceId, DefinitionStages.WithMaxSizeBytes, DefinitionStages.WithMinCapacity, DefinitionStages.WithReadScale, DefinitionStages.WithRecoverableDatabaseId, DefinitionStages.WithRecoveryServicesRecoveryPointId, DefinitionStages.WithRestorableDroppedDatabaseId, DefinitionStages.WithRestorePointInTime, DefinitionStages.WithSampleName, DefinitionStages.WithSku, DefinitionStages.WithSourceDatabaseDeletionDate, DefinitionStages.WithSourceDatabaseId, DefinitionStages.WithTags, DefinitionStages.WithZoneRedundant {
         }
     }
     /**
      * The template for a Database update operation, containing all the settings that can be modified.
      */
-    interface Update extends Appliable<Database>, UpdateStages.WithCatalogCollation, UpdateStages.WithCollation, UpdateStages.WithCreateMode, UpdateStages.WithElasticPoolId, UpdateStages.WithLicenseType, UpdateStages.WithLongTermRetentionBackupResourceId, UpdateStages.WithMaxSizeBytes, UpdateStages.WithReadScale, UpdateStages.WithRecoverableDatabaseId, UpdateStages.WithRecoveryServicesRecoveryPointId, UpdateStages.WithRestorableDroppedDatabaseId, UpdateStages.WithRestorePointInTime, UpdateStages.WithSampleName, UpdateStages.WithSku, UpdateStages.WithSourceDatabaseDeletionDate, UpdateStages.WithSourceDatabaseId, UpdateStages.WithTags, UpdateStages.WithZoneRedundant {
+    interface Update extends Appliable<Database>, UpdateStages.WithAutoPauseDelay, UpdateStages.WithCatalogCollation, UpdateStages.WithCollation, UpdateStages.WithCreateMode, UpdateStages.WithElasticPoolId, UpdateStages.WithLicenseType, UpdateStages.WithLongTermRetentionBackupResourceId, UpdateStages.WithMaxSizeBytes, UpdateStages.WithMinCapacity, UpdateStages.WithReadScale, UpdateStages.WithRecoverableDatabaseId, UpdateStages.WithRecoveryServicesRecoveryPointId, UpdateStages.WithRestorableDroppedDatabaseId, UpdateStages.WithRestorePointInTime, UpdateStages.WithSampleName, UpdateStages.WithSku, UpdateStages.WithSourceDatabaseDeletionDate, UpdateStages.WithSourceDatabaseId, UpdateStages.WithTags, UpdateStages.WithZoneRedundant {
     }
 
     /**
      * Grouping of Database update stages.
      */
     interface UpdateStages {
+        /**
+         * The stage of the database update allowing to specify AutoPauseDelay.
+         */
+        interface WithAutoPauseDelay {
+            /**
+             * Specifies autoPauseDelay.
+             */
+            Update withAutoPauseDelay(Integer autoPauseDelay);
+        }
+
         /**
          * The stage of the database update allowing to specify CatalogCollation.
          */
@@ -499,6 +539,16 @@ interface WithMaxSizeBytes {
             Update withMaxSizeBytes(Long maxSizeBytes);
         }
 
+        /**
+         * The stage of the database update allowing to specify MinCapacity.
+         */
+        interface WithMinCapacity {
+            /**
+             * Specifies minCapacity.
+             */
+            Update withMinCapacity(Double minCapacity);
+        }
+
         /**
          * The stage of the database update allowing to specify ReadScale.
          */
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/DatabaseStatus.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/DatabaseStatus.java
index 9f978f320c7d..3fb2f98287b2 100644
--- a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/DatabaseStatus.java
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/DatabaseStatus.java
@@ -70,6 +70,12 @@ public final class DatabaseStatus extends ExpandableStringEnum<DatabaseStatus> {
     /** Static value Scaling for DatabaseStatus. */
     public static final DatabaseStatus SCALING = fromString("Scaling");
 
+    /** Static value OfflineChangingDwPerformanceTiers for DatabaseStatus. */
+    public static final DatabaseStatus OFFLINE_CHANGING_DW_PERFORMANCE_TIERS = fromString("OfflineChangingDwPerformanceTiers");
+
+    /** Static value OnlineChangingDwPerformanceTiers for DatabaseStatus. */
+    public static final DatabaseStatus ONLINE_CHANGING_DW_PERFORMANCE_TIERS = fromString("OnlineChangingDwPerformanceTiers");
+
     /**
      * Creates or finds a DatabaseStatus from its string representation.
      * @param name a name to look for
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/DatabaseUpdate.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/DatabaseUpdate.java
index eafe8ef45060..ac090462a514 100644
--- a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/DatabaseUpdate.java
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/DatabaseUpdate.java
@@ -106,7 +106,8 @@ public class DatabaseUpdate {
      * 'Restoring', 'RecoveryPending', 'Recovering', 'Suspect', 'Offline',
      * 'Standby', 'Shutdown', 'EmergencyMode', 'AutoClosed', 'Copying',
      * 'Creating', 'Inaccessible', 'OfflineSecondary', 'Pausing', 'Paused',
-     * 'Resuming', 'Scaling'.
+     * 'Resuming', 'Scaling', 'OfflineChangingDwPerformanceTiers',
+     * 'OnlineChangingDwPerformanceTiers'.
      */
     @JsonProperty(value = "properties.status", access = JsonProperty.Access.WRITE_ONLY)
     private DatabaseStatus status;
@@ -237,6 +238,20 @@ public class DatabaseUpdate {
     @JsonProperty(value = "properties.currentSku", access = JsonProperty.Access.WRITE_ONLY)
     private Sku currentSku;
 
+    /**
+     * Time in minutes after which database is automatically paused. A value of
+     * -1 means that automatic pause is disabled.
+     */
+    @JsonProperty(value = "properties.autoPauseDelay")
+    private Integer autoPauseDelay;
+
+    /**
+     * Minimal capacity that database will always have allocated, if not
+     * paused.
+     */
+    @JsonProperty(value = "properties.minCapacity")
+    private Double minCapacity;
+
     /**
      * Resource tags.
      */
@@ -400,7 +415,7 @@ public DatabaseUpdate withSourceDatabaseId(String sourceDatabaseId) {
     }
 
     /**
-     * Get the status of the database. Possible values include: 'Online', 'Restoring', 'RecoveryPending', 'Recovering', 'Suspect', 'Offline', 'Standby', 'Shutdown', 'EmergencyMode', 'AutoClosed', 'Copying', 'Creating', 'Inaccessible', 'OfflineSecondary', 'Pausing', 'Paused', 'Resuming', 'Scaling'.
+     * Get the status of the database. Possible values include: 'Online', 'Restoring', 'RecoveryPending', 'Recovering', 'Suspect', 'Offline', 'Standby', 'Shutdown', 'EmergencyMode', 'AutoClosed', 'Copying', 'Creating', 'Inaccessible', 'OfflineSecondary', 'Pausing', 'Paused', 'Resuming', 'Scaling', 'OfflineChangingDwPerformanceTiers', 'OnlineChangingDwPerformanceTiers'.
      *
      * @return the status value
      */
@@ -689,6 +704,46 @@ public Sku currentSku() {
         return this.currentSku;
     }
 
+    /**
+     * Get time in minutes after which database is automatically paused. A value of -1 means that automatic pause is disabled.
+     *
+     * @return the autoPauseDelay value
+     */
+    public Integer autoPauseDelay() {
+        return this.autoPauseDelay;
+    }
+
+    /**
+     * Set time in minutes after which database is automatically paused. A value of -1 means that automatic pause is disabled.
+     *
+     * @param autoPauseDelay the autoPauseDelay value to set
+     * @return the DatabaseUpdate object itself.
+     */
+    public DatabaseUpdate withAutoPauseDelay(Integer autoPauseDelay) {
+        this.autoPauseDelay = autoPauseDelay;
+        return this;
+    }
+
+    /**
+     * Get minimal capacity that database will always have allocated, if not paused.
+     *
+     * @return the minCapacity value
+     */
+    public Double minCapacity() {
+        return this.minCapacity;
+    }
+
+    /**
+     * Set minimal capacity that database will always have allocated, if not paused.
+     *
+     * @param minCapacity the minCapacity value to set
+     * @return the DatabaseUpdate object itself.
+     */
+    public DatabaseUpdate withMinCapacity(Double minCapacity) {
+        this.minCapacity = minCapacity;
+        return this;
+    }
+
     /**
      * Get resource tags.
      *
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/DatabaseImpl.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/DatabaseImpl.java
index 90eac77d4eb1..119a955b1401 100644
--- a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/DatabaseImpl.java
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/DatabaseImpl.java
@@ -101,6 +101,11 @@ private void resetCreateUpdateParameters() {
         this.updateParameter = new DatabaseUpdate();
     }
 
+    @Override
+    public Integer autoPauseDelay() {
+        return this.inner().autoPauseDelay();
+    }
+
     @Override
     public CatalogCollationType catalogCollation() {
         return this.inner().catalogCollation();
@@ -196,6 +201,11 @@ public Long maxSizeBytes() {
         return this.inner().maxSizeBytes();
     }
 
+    @Override
+    public Double minCapacity() {
+        return this.inner().minCapacity();
+    }
+
     @Override
     public String name() {
         return this.inner().name();
@@ -284,6 +294,16 @@ public DatabaseImpl withLocation(String location) {
         return this;
     }
 
+    @Override
+    public DatabaseImpl withAutoPauseDelay(Integer autoPauseDelay) {
+        if (isInCreateMode()) {
+            this.inner().withAutoPauseDelay(autoPauseDelay);
+        } else {
+            this.updateParameter.withAutoPauseDelay(autoPauseDelay);
+        }
+        return this;
+    }
+
     @Override
     public DatabaseImpl withCatalogCollation(CatalogCollationType catalogCollation) {
         if (isInCreateMode()) {
@@ -354,6 +374,16 @@ public DatabaseImpl withMaxSizeBytes(Long maxSizeBytes) {
         return this;
     }
 
+    @Override
+    public DatabaseImpl withMinCapacity(Double minCapacity) {
+        if (isInCreateMode()) {
+            this.inner().withMinCapacity(minCapacity);
+        } else {
+            this.updateParameter.withMinCapacity(minCapacity);
+        }
+        return this;
+    }
+
     @Override
     public DatabaseImpl withReadScale(DatabaseReadScale readScale) {
         if (isInCreateMode()) {
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/DatabaseInner.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/DatabaseInner.java
index 9c0e11f49b7f..d9598a583582 100644
--- a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/DatabaseInner.java
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/DatabaseInner.java
@@ -27,7 +27,20 @@
 @JsonFlatten
 public class DatabaseInner extends Resource {
     /**
-     * The name and tier of the SKU.
+     * The database SKU.
+     *
+     * The list of SKUs may vary by region and support offer. To determine the
+     * SKUs (including the SKU name, tier/edition, family, and capacity) that
+     * are available to your subscription in an Azure region, use the
+     * `Capabilities_ListByLocation` REST API or one of the following commands:
+     *
+     * ```azurecli
+     * az sql db list-editions -l &lt;location&gt; -o table
+     * ````
+     *
+     * ```powershell
+     * Get-AzSqlServerServiceObjective -Location &lt;location&gt;
+     * ````.
      */
     @JsonProperty(value = "sku")
     private Sku sku;
@@ -125,7 +138,8 @@ public class DatabaseInner extends Resource {
      * 'Restoring', 'RecoveryPending', 'Recovering', 'Suspect', 'Offline',
      * 'Standby', 'Shutdown', 'EmergencyMode', 'AutoClosed', 'Copying',
      * 'Creating', 'Inaccessible', 'OfflineSecondary', 'Pausing', 'Paused',
-     * 'Resuming', 'Scaling'.
+     * 'Resuming', 'Scaling', 'OfflineChangingDwPerformanceTiers',
+     * 'OnlineChangingDwPerformanceTiers'.
      */
     @JsonProperty(value = "properties.status", access = JsonProperty.Access.WRITE_ONLY)
     private DatabaseStatus status;
@@ -257,7 +271,28 @@ public class DatabaseInner extends Resource {
     private Sku currentSku;
 
     /**
-     * Get the name and tier of the SKU.
+     * Time in minutes after which database is automatically paused. A value of
+     * -1 means that automatic pause is disabled.
+     */
+    @JsonProperty(value = "properties.autoPauseDelay")
+    private Integer autoPauseDelay;
+
+    /**
+     * Minimal capacity that database will always have allocated, if not
+     * paused.
+     */
+    @JsonProperty(value = "properties.minCapacity")
+    private Double minCapacity;
+
+    /**
+     * Get the database SKU.
+     The list of SKUs may vary by region and support offer. To determine the SKUs (including the SKU name, tier/edition, family, and capacity) that are available to your subscription in an Azure region, use the `Capabilities_ListByLocation` REST API or one of the following commands:
+     ```azurecli
+     az sql db list-editions -l &lt;location&gt; -o table
+     ````
+     ```powershell
+     Get-AzSqlServerServiceObjective -Location &lt;location&gt;
+     ````.
      *
      * @return the sku value
      */
@@ -266,7 +301,14 @@ public Sku sku() {
     }
 
     /**
-     * Set the name and tier of the SKU.
+     * Set the database SKU.
+     The list of SKUs may vary by region and support offer. To determine the SKUs (including the SKU name, tier/edition, family, and capacity) that are available to your subscription in an Azure region, use the `Capabilities_ListByLocation` REST API or one of the following commands:
+     ```azurecli
+     az sql db list-editions -l &lt;location&gt; -o table
+     ````
+     ```powershell
+     Get-AzSqlServerServiceObjective -Location &lt;location&gt;
+     ````.
      *
      * @param sku the sku value to set
      * @return the DatabaseInner object itself.
@@ -431,7 +473,7 @@ public DatabaseInner withSourceDatabaseId(String sourceDatabaseId) {
     }
 
     /**
-     * Get the status of the database. Possible values include: 'Online', 'Restoring', 'RecoveryPending', 'Recovering', 'Suspect', 'Offline', 'Standby', 'Shutdown', 'EmergencyMode', 'AutoClosed', 'Copying', 'Creating', 'Inaccessible', 'OfflineSecondary', 'Pausing', 'Paused', 'Resuming', 'Scaling'.
+     * Get the status of the database. Possible values include: 'Online', 'Restoring', 'RecoveryPending', 'Recovering', 'Suspect', 'Offline', 'Standby', 'Shutdown', 'EmergencyMode', 'AutoClosed', 'Copying', 'Creating', 'Inaccessible', 'OfflineSecondary', 'Pausing', 'Paused', 'Resuming', 'Scaling', 'OfflineChangingDwPerformanceTiers', 'OnlineChangingDwPerformanceTiers'.
      *
      * @return the status value
      */
@@ -720,4 +762,44 @@ public Sku currentSku() {
         return this.currentSku;
     }
 
+    /**
+     * Get time in minutes after which database is automatically paused. A value of -1 means that automatic pause is disabled.
+     *
+     * @return the autoPauseDelay value
+     */
+    public Integer autoPauseDelay() {
+        return this.autoPauseDelay;
+    }
+
+    /**
+     * Set time in minutes after which database is automatically paused. A value of -1 means that automatic pause is disabled.
+     *
+     * @param autoPauseDelay the autoPauseDelay value to set
+     * @return the DatabaseInner object itself.
+     */
+    public DatabaseInner withAutoPauseDelay(Integer autoPauseDelay) {
+        this.autoPauseDelay = autoPauseDelay;
+        return this;
+    }
+
+    /**
+     * Get minimal capacity that database will always have allocated, if not paused.
+     *
+     * @return the minCapacity value
+     */
+    public Double minCapacity() {
+        return this.minCapacity;
+    }
+
+    /**
+     * Set minimal capacity that database will always have allocated, if not paused.
+     *
+     * @param minCapacity the minCapacity value to set
+     * @return the DatabaseInner object itself.
+     */
+    public DatabaseInner withMinCapacity(Double minCapacity) {
+        this.minCapacity = minCapacity;
+        return this;
+    }
+
 }
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ElasticPoolInner.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ElasticPoolInner.java
index e7e1135945e9..d5a449ff60bd 100644
--- a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ElasticPoolInner.java
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ElasticPoolInner.java
@@ -23,7 +23,16 @@
 @JsonFlatten
 public class ElasticPoolInner extends Resource {
     /**
-     * The sku property.
+     * The elastic pool SKU.
+     *
+     * The list of SKUs may vary by region and support offer. To determine the
+     * SKUs (including the SKU name, tier/edition, family, and capacity) that
+     * are available to your subscription in an Azure region, use the
+     * `Capabilities_ListByLocation` REST API or the following command:
+     *
+     * ```azurecli
+     * az sql elastic-pool list-editions -l &lt;location&gt; -o table
+     * ````.
      */
     @JsonProperty(value = "sku")
     private Sku sku;
@@ -76,7 +85,11 @@ public class ElasticPoolInner extends Resource {
     private ElasticPoolLicenseType licenseType;
 
     /**
-     * Get the sku value.
+     * Get the elastic pool SKU.
+     The list of SKUs may vary by region and support offer. To determine the SKUs (including the SKU name, tier/edition, family, and capacity) that are available to your subscription in an Azure region, use the `Capabilities_ListByLocation` REST API or the following command:
+     ```azurecli
+     az sql elastic-pool list-editions -l &lt;location&gt; -o table
+     ````.
      *
      * @return the sku value
      */
@@ -85,7 +98,11 @@ public Sku sku() {
     }
 
     /**
-     * Set the sku value.
+     * Set the elastic pool SKU.
+     The list of SKUs may vary by region and support offer. To determine the SKUs (including the SKU name, tier/edition, family, and capacity) that are available to your subscription in an Azure region, use the `Capabilities_ListByLocation` REST API or the following command:
+     ```azurecli
+     az sql elastic-pool list-editions -l &lt;location&gt; -o table
+     ````.
      *
      * @param sku the sku value to set
      * @return the ElasticPoolInner object itself.