diff --git a/sdk/mysql/mgmt-v2017_12_01/pom.xml b/sdk/mysql/mgmt-v2017_12_01/pom.xml
index 9d452e3be870..bea38be402e9 100644
--- a/sdk/mysql/mgmt-v2017_12_01/pom.xml
+++ b/sdk/mysql/mgmt-v2017_12_01/pom.xml
@@ -11,11 +11,11 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.2.0</version>
+        <version>1.1.0</version>
         <relativePath>../../../pom.management.xml</relativePath>
     </parent>
-    <artifactId>azure-mgmt-mysql</artifactId>
-    <version>1.0.0-beta-4</version>
+    <artifactId>azure-mgmt-dbformysql</artifactId>
+    <version>1.0.0-beta</version>
     <packaging>jar</packaging>
     <name>Microsoft Azure SDK for DBforMySQL Management</name>
     <description>This package contains Microsoft DBforMySQL Management SDK.</description>
@@ -71,6 +71,8 @@
             <artifactId>azure-arm-client-runtime</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
+            <!--Below version for test jar needs to be removed, this will be done as part of v1-runtime 1.6.7-->
+            <version>1.6.5</version>
         </dependency>
     </dependencies>
     <build>
diff --git a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/Configuration.java b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/Configuration.java
index 8ca078354e2d..a37b27ea080a 100644
--- a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/Configuration.java
+++ b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/Configuration.java
@@ -16,12 +16,12 @@
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.mysql.v2017_12_01.implementation.MySQLManager;
+import com.microsoft.azure.management.mysql.v2017_12_01.implementation.DBforMySQLManager;
 
 /**
  * Type representing Configuration.
  */
-public interface Configuration extends HasInner<ConfigurationInner>, Indexable, Refreshable<Configuration>, Updatable<Configuration.Update>, HasManager<MySQLManager> {
+public interface Configuration extends HasInner<ConfigurationInner>, Indexable, Refreshable<Configuration>, Updatable<Configuration.Update>, HasManager<DBforMySQLManager> {
     /**
      * @return the allowedValues value.
      */
diff --git a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/Database.java b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/Database.java
index 3b468d3eca7d..a96b3b6a7dd1 100644
--- a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/Database.java
+++ b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/Database.java
@@ -16,12 +16,12 @@
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.mysql.v2017_12_01.implementation.MySQLManager;
+import com.microsoft.azure.management.mysql.v2017_12_01.implementation.DBforMySQLManager;
 
 /**
  * Type representing Database.
  */
-public interface Database extends HasInner<DatabaseInner>, Indexable, Refreshable<Database>, Updatable<Database.Update>, HasManager<MySQLManager> {
+public interface Database extends HasInner<DatabaseInner>, Indexable, Refreshable<Database>, Updatable<Database.Update>, HasManager<DBforMySQLManager> {
     /**
      * @return the charset value.
      */
diff --git a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/FirewallRule.java b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/FirewallRule.java
index 0a505c507a16..98254fa1d6ea 100644
--- a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/FirewallRule.java
+++ b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/FirewallRule.java
@@ -16,12 +16,12 @@
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.mysql.v2017_12_01.implementation.MySQLManager;
+import com.microsoft.azure.management.mysql.v2017_12_01.implementation.DBforMySQLManager;
 
 /**
  * Type representing FirewallRule.
  */
-public interface FirewallRule extends HasInner<FirewallRuleInner>, Indexable, Refreshable<FirewallRule>, Updatable<FirewallRule.Update>, HasManager<MySQLManager> {
+public interface FirewallRule extends HasInner<FirewallRuleInner>, Indexable, Refreshable<FirewallRule>, Updatable<FirewallRule.Update>, HasManager<DBforMySQLManager> {
     /**
      * @return the endIpAddress value.
      */
diff --git a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/LogFile.java b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/LogFile.java
index 2c5660a1f181..80bda1150c71 100644
--- a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/LogFile.java
+++ b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/LogFile.java
@@ -11,13 +11,13 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.mysql.v2017_12_01.implementation.LogFileInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.mysql.v2017_12_01.implementation.MySQLManager;
+import com.microsoft.azure.management.mysql.v2017_12_01.implementation.DBforMySQLManager;
 import org.joda.time.DateTime;
 
 /**
  * Type representing LogFile.
  */
-public interface LogFile extends HasInner<LogFileInner>, HasManager<MySQLManager> {
+public interface LogFile extends HasInner<LogFileInner>, HasManager<DBforMySQLManager> {
     /**
      * @return the createdTime value.
      */
diff --git a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/NameAvailability.java b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/NameAvailability.java
index 940e9b205ea1..da6405d218e7 100644
--- a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/NameAvailability.java
+++ b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/NameAvailability.java
@@ -10,13 +10,13 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.mysql.v2017_12_01.implementation.MySQLManager;
+import com.microsoft.azure.management.mysql.v2017_12_01.implementation.DBforMySQLManager;
 import com.microsoft.azure.management.mysql.v2017_12_01.implementation.NameAvailabilityInner;
 
 /**
  * Type representing NameAvailability.
  */
-public interface NameAvailability extends HasInner<NameAvailabilityInner>, HasManager<MySQLManager> {
+public interface NameAvailability extends HasInner<NameAvailabilityInner>, HasManager<DBforMySQLManager> {
     /**
      * @return the message value.
      */
diff --git a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/OperationListResult.java b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/OperationListResult.java
index 68a5fc6ed1eb..06136872812d 100644
--- a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/OperationListResult.java
+++ b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/OperationListResult.java
@@ -10,7 +10,7 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.mysql.v2017_12_01.implementation.MySQLManager;
+import com.microsoft.azure.management.mysql.v2017_12_01.implementation.DBforMySQLManager;
 import com.microsoft.azure.management.mysql.v2017_12_01.implementation.OperationListResultInner;
 import com.microsoft.azure.management.mysql.v2017_12_01.implementation.OperationInner;
 import java.util.List;
@@ -18,7 +18,7 @@
 /**
  * Type representing OperationListResult.
  */
-public interface OperationListResult extends HasInner<OperationListResultInner>, HasManager<MySQLManager> {
+public interface OperationListResult extends HasInner<OperationListResultInner>, HasManager<DBforMySQLManager> {
     /**
      * @return the value value.
      */
diff --git a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/PerformanceTierProperties.java b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/PerformanceTierProperties.java
index a2b0de5ba9e7..0b9c68c5bb29 100644
--- a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/PerformanceTierProperties.java
+++ b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/PerformanceTierProperties.java
@@ -11,13 +11,13 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.mysql.v2017_12_01.implementation.PerformanceTierPropertiesInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.mysql.v2017_12_01.implementation.MySQLManager;
+import com.microsoft.azure.management.mysql.v2017_12_01.implementation.DBforMySQLManager;
 import java.util.List;
 
 /**
  * Type representing PerformanceTierProperties.
  */
-public interface PerformanceTierProperties extends HasInner<PerformanceTierPropertiesInner>, HasManager<MySQLManager> {
+public interface PerformanceTierProperties extends HasInner<PerformanceTierPropertiesInner>, HasManager<DBforMySQLManager> {
     /**
      * @return the id value.
      */
diff --git a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/Server.java b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/Server.java
index b7948b8fc707..3111ed5ce3d9 100644
--- a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/Server.java
+++ b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/Server.java
@@ -17,14 +17,14 @@
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.mysql.v2017_12_01.implementation.MySQLManager;
+import com.microsoft.azure.management.mysql.v2017_12_01.implementation.DBforMySQLManager;
 import org.joda.time.DateTime;
 import com.microsoft.azure.management.mysql.v2017_12_01.implementation.ServerInner;
 
 /**
  * Type representing Server.
  */
-public interface Server extends HasInner<ServerInner>, Resource, GroupableResourceCore<MySQLManager, ServerInner>, HasResourceGroup, Refreshable<Server>, Updatable<Server.Update>, HasManager<MySQLManager> {
+public interface Server extends HasInner<ServerInner>, Resource, GroupableResourceCore<DBforMySQLManager, ServerInner>, HasResourceGroup, Refreshable<Server>, Updatable<Server.Update>, HasManager<DBforMySQLManager> {
     /**
      * @return the administratorLogin value.
      */
@@ -210,7 +210,7 @@ interface WithStorageProfile {
         interface WithVersion {
             /**
              * Specifies version.
-             * @param version The version of a server. Possible values include: '5.6', '5.7'
+             * @param version The version of a server. Possible values include: '5.6', '5.7', '8.0'
              * @return the next update stage
              */
             Update withVersion(ServerVersion version);
diff --git a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/ServerPropertiesForCreate.java b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/ServerPropertiesForCreate.java
index 79295faadaf3..7ada871b2502 100644
--- a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/ServerPropertiesForCreate.java
+++ b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/ServerPropertiesForCreate.java
@@ -16,7 +16,7 @@
 /**
  * The properties used to create a new server.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "createMode")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "createMode", defaultImpl = ServerPropertiesForCreate.class)
 @JsonTypeName("ServerPropertiesForCreate")
 @JsonSubTypes({
     @JsonSubTypes.Type(name = "Default", value = ServerPropertiesForDefaultCreate.class),
@@ -26,7 +26,7 @@
 })
 public class ServerPropertiesForCreate {
     /**
-     * Server version. Possible values include: '5.6', '5.7'.
+     * Server version. Possible values include: '5.6', '5.7', '8.0'.
      */
     @JsonProperty(value = "version")
     private ServerVersion version;
@@ -45,7 +45,7 @@ public class ServerPropertiesForCreate {
     private StorageProfile storageProfile;
 
     /**
-     * Get server version. Possible values include: '5.6', '5.7'.
+     * Get server version. Possible values include: '5.6', '5.7', '8.0'.
      *
      * @return the version value
      */
@@ -54,7 +54,7 @@ public ServerVersion version() {
     }
 
     /**
-     * Set server version. Possible values include: '5.6', '5.7'.
+     * Set server version. Possible values include: '5.6', '5.7', '8.0'.
      *
      * @param version the version value to set
      * @return the ServerPropertiesForCreate object itself.
diff --git a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/ServerPropertiesForDefaultCreate.java b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/ServerPropertiesForDefaultCreate.java
index 386249e8c535..e15e5a8992b4 100644
--- a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/ServerPropertiesForDefaultCreate.java
+++ b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/ServerPropertiesForDefaultCreate.java
@@ -15,7 +15,7 @@
 /**
  * The properties used to create a new server.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "createMode")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "createMode", defaultImpl = ServerPropertiesForDefaultCreate.class)
 @JsonTypeName("Default")
 public class ServerPropertiesForDefaultCreate extends ServerPropertiesForCreate {
     /**
diff --git a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/ServerPropertiesForGeoRestore.java b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/ServerPropertiesForGeoRestore.java
index a4025fcc0e0b..cc0a3e145716 100644
--- a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/ServerPropertiesForGeoRestore.java
+++ b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/ServerPropertiesForGeoRestore.java
@@ -16,7 +16,7 @@
  * The properties used to create a new server by restoring to a different
  * region from a geo replicated backup.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "createMode")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "createMode", defaultImpl = ServerPropertiesForGeoRestore.class)
 @JsonTypeName("GeoRestore")
 public class ServerPropertiesForGeoRestore extends ServerPropertiesForCreate {
     /**
diff --git a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/ServerPropertiesForReplica.java b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/ServerPropertiesForReplica.java
index a2c26825a8ee..574bafa43303 100644
--- a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/ServerPropertiesForReplica.java
+++ b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/ServerPropertiesForReplica.java
@@ -15,7 +15,7 @@
 /**
  * The properties to create a new replica.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "createMode")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "createMode", defaultImpl = ServerPropertiesForReplica.class)
 @JsonTypeName("Replica")
 public class ServerPropertiesForReplica extends ServerPropertiesForCreate {
     /**
diff --git a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/ServerPropertiesForRestore.java b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/ServerPropertiesForRestore.java
index 02e447b2bcff..481685bf54f6 100644
--- a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/ServerPropertiesForRestore.java
+++ b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/ServerPropertiesForRestore.java
@@ -16,7 +16,7 @@
 /**
  * The properties used to create a new server by restoring from a backup.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "createMode")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "createMode", defaultImpl = ServerPropertiesForRestore.class)
 @JsonTypeName("PointInTimeRestore")
 public class ServerPropertiesForRestore extends ServerPropertiesForCreate {
     /**
diff --git a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/ServerSecurityAlertPolicy.java b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/ServerSecurityAlertPolicy.java
index 965ae02ba842..6cad54dfef0a 100644
--- a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/ServerSecurityAlertPolicy.java
+++ b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/ServerSecurityAlertPolicy.java
@@ -16,13 +16,13 @@
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.mysql.v2017_12_01.implementation.MySQLManager;
+import com.microsoft.azure.management.mysql.v2017_12_01.implementation.DBforMySQLManager;
 import java.util.List;
 
 /**
  * Type representing ServerSecurityAlertPolicy.
  */
-public interface ServerSecurityAlertPolicy extends HasInner<ServerSecurityAlertPolicyInner>, Indexable, Refreshable<ServerSecurityAlertPolicy>, Updatable<ServerSecurityAlertPolicy.Update>, HasManager<MySQLManager> {
+public interface ServerSecurityAlertPolicy extends HasInner<ServerSecurityAlertPolicyInner>, Indexable, Refreshable<ServerSecurityAlertPolicy>, Updatable<ServerSecurityAlertPolicy.Update>, HasManager<DBforMySQLManager> {
     /**
      * @return the disabledAlerts value.
      */
diff --git a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/ServerServer.java b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/ServerServer.java
index c866e807c8fa..cffd4100b34a 100644
--- a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/ServerServer.java
+++ b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/ServerServer.java
@@ -11,14 +11,14 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.mysql.v2017_12_01.implementation.ServerInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.mysql.v2017_12_01.implementation.MySQLManager;
+import com.microsoft.azure.management.mysql.v2017_12_01.implementation.DBforMySQLManager;
 import org.joda.time.DateTime;
 import java.util.Map;
 
 /**
  * Type representing ServerServer.
  */
-public interface ServerServer extends HasInner<ServerInner>, HasManager<MySQLManager> {
+public interface ServerServer extends HasInner<ServerInner>, HasManager<DBforMySQLManager> {
     /**
      * @return the administratorLogin value.
      */
diff --git a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/ServerUpdateParameters.java b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/ServerUpdateParameters.java
index cd6117b39c3a..cfde33cd1052 100644
--- a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/ServerUpdateParameters.java
+++ b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/ServerUpdateParameters.java
@@ -36,7 +36,7 @@ public class ServerUpdateParameters {
     private String administratorLoginPassword;
 
     /**
-     * The version of a server. Possible values include: '5.6', '5.7'.
+     * The version of a server. Possible values include: '5.6', '5.7', '8.0'.
      */
     @JsonProperty(value = "properties.version")
     private ServerVersion version;
@@ -121,7 +121,7 @@ public ServerUpdateParameters withAdministratorLoginPassword(String administrato
     }
 
     /**
-     * Get the version of a server. Possible values include: '5.6', '5.7'.
+     * Get the version of a server. Possible values include: '5.6', '5.7', '8.0'.
      *
      * @return the version value
      */
@@ -130,7 +130,7 @@ public ServerVersion version() {
     }
 
     /**
-     * Set the version of a server. Possible values include: '5.6', '5.7'.
+     * Set the version of a server. Possible values include: '5.6', '5.7', '8.0'.
      *
      * @param version the version value to set
      * @return the ServerUpdateParameters object itself.
diff --git a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/ServerVersion.java b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/ServerVersion.java
index b56b64402011..63ed628c0e86 100644
--- a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/ServerVersion.java
+++ b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/ServerVersion.java
@@ -22,6 +22,9 @@ public final class ServerVersion extends ExpandableStringEnum<ServerVersion> {
     /** Static value 5.7 for ServerVersion. */
     public static final ServerVersion FIVE_FULL_STOP_SEVEN = fromString("5.7");
 
+    /** Static value 8.0 for ServerVersion. */
+    public static final ServerVersion EIGHT_FULL_STOP_ZERO = fromString("8.0");
+
     /**
      * Creates or finds a ServerVersion from its string representation.
      * @param name a name to look for
diff --git a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/VirtualNetworkRule.java b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/VirtualNetworkRule.java
index eaccd7b23b14..e64fa42aee92 100644
--- a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/VirtualNetworkRule.java
+++ b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/VirtualNetworkRule.java
@@ -16,12 +16,12 @@
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.mysql.v2017_12_01.implementation.MySQLManager;
+import com.microsoft.azure.management.mysql.v2017_12_01.implementation.DBforMySQLManager;
 
 /**
  * Type representing VirtualNetworkRule.
  */
-public interface VirtualNetworkRule extends HasInner<VirtualNetworkRuleInner>, Indexable, Refreshable<VirtualNetworkRule>, Updatable<VirtualNetworkRule.Update>, HasManager<MySQLManager> {
+public interface VirtualNetworkRule extends HasInner<VirtualNetworkRuleInner>, Indexable, Refreshable<VirtualNetworkRule>, Updatable<VirtualNetworkRule.Update>, HasManager<DBforMySQLManager> {
     /**
      * @return the id value.
      */
diff --git a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/CheckNameAvailabilitysImpl.java b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/CheckNameAvailabilitysImpl.java
index ee246d82bd1a..ddbe8bda6c29 100644
--- a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/CheckNameAvailabilitysImpl.java
+++ b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/CheckNameAvailabilitysImpl.java
@@ -17,14 +17,14 @@
 import com.microsoft.azure.management.mysql.v2017_12_01.NameAvailabilityRequest;
 
 class CheckNameAvailabilitysImpl extends WrapperImpl<CheckNameAvailabilitysInner> implements CheckNameAvailabilitys {
-    private final MySQLManager manager;
+    private final DBforMySQLManager manager;
 
-    CheckNameAvailabilitysImpl(MySQLManager manager) {
+    CheckNameAvailabilitysImpl(DBforMySQLManager manager) {
         super(manager.inner().checkNameAvailabilitys());
         this.manager = manager;
     }
 
-    public MySQLManager manager() {
+    public DBforMySQLManager manager() {
         return this.manager;
     }
 
diff --git a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/ConfigurationImpl.java b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/ConfigurationImpl.java
index d44117fbb3f5..99f95f4b4801 100644
--- a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/ConfigurationImpl.java
+++ b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/ConfigurationImpl.java
@@ -13,12 +13,12 @@
 import rx.Observable;
 
 class ConfigurationImpl extends CreatableUpdatableImpl<Configuration, ConfigurationInner, ConfigurationImpl> implements Configuration, Configuration.Definition, Configuration.Update {
-    private final MySQLManager manager;
+    private final DBforMySQLManager manager;
     private String resourceGroupName;
     private String serverName;
     private String configurationName;
 
-    ConfigurationImpl(String name, MySQLManager manager) {
+    ConfigurationImpl(String name, DBforMySQLManager manager) {
         super(name, new ConfigurationInner());
         this.manager = manager;
         // Set resource name
@@ -26,7 +26,7 @@ class ConfigurationImpl extends CreatableUpdatableImpl<Configuration, Configurat
         //
     }
 
-    ConfigurationImpl(ConfigurationInner inner, MySQLManager manager) {
+    ConfigurationImpl(ConfigurationInner inner, DBforMySQLManager manager) {
         super(inner.name(), inner);
         this.manager = manager;
         // Set resource name
@@ -39,7 +39,7 @@ class ConfigurationImpl extends CreatableUpdatableImpl<Configuration, Configurat
     }
 
     @Override
-    public MySQLManager manager() {
+    public DBforMySQLManager manager() {
         return this.manager;
     }
 
diff --git a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/ConfigurationsImpl.java b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/ConfigurationsImpl.java
index 53a3fe43fbbe..0f80dff7771c 100644
--- a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/ConfigurationsImpl.java
+++ b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/ConfigurationsImpl.java
@@ -17,14 +17,14 @@
 import com.microsoft.azure.management.mysql.v2017_12_01.Configuration;
 
 class ConfigurationsImpl extends WrapperImpl<ConfigurationsInner> implements Configurations {
-    private final MySQLManager manager;
+    private final DBforMySQLManager manager;
 
-    ConfigurationsImpl(MySQLManager manager) {
+    ConfigurationsImpl(DBforMySQLManager manager) {
         super(manager.inner().configurations());
         this.manager = manager;
     }
 
-    public MySQLManager manager() {
+    public DBforMySQLManager manager() {
         return this.manager;
     }
 
@@ -63,10 +63,14 @@ public Configuration call(ConfigurationInner inner) {
     public Observable<Configuration> getAsync(String resourceGroupName, String serverName, String configurationName) {
         ConfigurationsInner client = this.inner();
         return client.getAsync(resourceGroupName, serverName, configurationName)
-        .map(new Func1<ConfigurationInner, Configuration>() {
+        .flatMap(new Func1<ConfigurationInner, Observable<Configuration>>() {
             @Override
-            public Configuration call(ConfigurationInner inner) {
-                return wrapModel(inner);
+            public Observable<Configuration> call(ConfigurationInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((Configuration)wrapModel(inner));
+                }
             }
        });
     }
diff --git a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/DBforMySQLManager.java b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/DBforMySQLManager.java
new file mode 100644
index 000000000000..ce36c57cb506
--- /dev/null
+++ b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/DBforMySQLManager.java
@@ -0,0 +1,219 @@
+/**
+ * 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.
+ */
+
+package com.microsoft.azure.management.mysql.v2017_12_01.implementation;
+
+import com.microsoft.azure.AzureEnvironment;
+import com.microsoft.azure.AzureResponseBuilder;
+import com.microsoft.azure.credentials.AzureTokenCredentials;
+import com.microsoft.azure.management.apigeneration.Beta;
+import com.microsoft.azure.management.apigeneration.Beta.SinceVersion;
+import com.microsoft.azure.arm.resources.AzureConfigurable;
+import com.microsoft.azure.serializer.AzureJacksonAdapter;
+import com.microsoft.rest.RestClient;
+import com.microsoft.azure.management.mysql.v2017_12_01.Servers;
+import com.microsoft.azure.management.mysql.v2017_12_01.Replicas;
+import com.microsoft.azure.management.mysql.v2017_12_01.FirewallRules;
+import com.microsoft.azure.management.mysql.v2017_12_01.VirtualNetworkRules;
+import com.microsoft.azure.management.mysql.v2017_12_01.Databases;
+import com.microsoft.azure.management.mysql.v2017_12_01.Configurations;
+import com.microsoft.azure.management.mysql.v2017_12_01.LogFiles;
+import com.microsoft.azure.management.mysql.v2017_12_01.LocationBasedPerformanceTiers;
+import com.microsoft.azure.management.mysql.v2017_12_01.CheckNameAvailabilitys;
+import com.microsoft.azure.management.mysql.v2017_12_01.ServerSecurityAlertPolicies;
+import com.microsoft.azure.management.mysql.v2017_12_01.Operations;
+import com.microsoft.azure.arm.resources.implementation.AzureConfigurableCoreImpl;
+import com.microsoft.azure.arm.resources.implementation.ManagerCore;
+
+/**
+ * Entry point to Azure DBforMySQL resource management.
+ */
+public final class DBforMySQLManager extends ManagerCore<DBforMySQLManager, MySQLManagementClientImpl> {
+    private Servers servers;
+    private Replicas replicas;
+    private FirewallRules firewallRules;
+    private VirtualNetworkRules virtualNetworkRules;
+    private Databases databases;
+    private Configurations configurations;
+    private LogFiles logFiles;
+    private LocationBasedPerformanceTiers locationBasedPerformanceTiers;
+    private CheckNameAvailabilitys checkNameAvailabilitys;
+    private ServerSecurityAlertPolicies serverSecurityAlertPolicies;
+    private Operations operations;
+    /**
+    * Get a Configurable instance that can be used to create DBforMySQLManager with optional configuration.
+    *
+    * @return the instance allowing configurations
+    */
+    public static Configurable configure() {
+        return new DBforMySQLManager.ConfigurableImpl();
+    }
+    /**
+    * Creates an instance of DBforMySQLManager that exposes DBforMySQL resource management API entry points.
+    *
+    * @param credentials the credentials to use
+    * @param subscriptionId the subscription UUID
+    * @return the DBforMySQLManager
+    */
+    public static DBforMySQLManager authenticate(AzureTokenCredentials credentials, String subscriptionId) {
+        return new DBforMySQLManager(new RestClient.Builder()
+            .withBaseUrl(credentials.environment(), AzureEnvironment.Endpoint.RESOURCE_MANAGER)
+            .withCredentials(credentials)
+            .withSerializerAdapter(new AzureJacksonAdapter())
+            .withResponseBuilderFactory(new AzureResponseBuilder.Factory())
+            .build(), subscriptionId);
+    }
+    /**
+    * Creates an instance of DBforMySQLManager that exposes DBforMySQL resource management API entry points.
+    *
+    * @param restClient the RestClient to be used for API calls.
+    * @param subscriptionId the subscription UUID
+    * @return the DBforMySQLManager
+    */
+    public static DBforMySQLManager authenticate(RestClient restClient, String subscriptionId) {
+        return new DBforMySQLManager(restClient, subscriptionId);
+    }
+    /**
+    * The interface allowing configurations to be set.
+    */
+    public interface Configurable extends AzureConfigurable<Configurable> {
+        /**
+        * Creates an instance of DBforMySQLManager that exposes DBforMySQL management API entry points.
+        *
+        * @param credentials the credentials to use
+        * @param subscriptionId the subscription UUID
+        * @return the interface exposing DBforMySQL management API entry points that work across subscriptions
+        */
+        DBforMySQLManager authenticate(AzureTokenCredentials credentials, String subscriptionId);
+    }
+
+    /**
+     * @return Entry point to manage Servers.
+     */
+    public Servers servers() {
+        if (this.servers == null) {
+            this.servers = new ServersImpl(this);
+        }
+        return this.servers;
+    }
+
+    /**
+     * @return Entry point to manage Replicas.
+     */
+    public Replicas replicas() {
+        if (this.replicas == null) {
+            this.replicas = new ReplicasImpl(this);
+        }
+        return this.replicas;
+    }
+
+    /**
+     * @return Entry point to manage FirewallRules.
+     */
+    public FirewallRules firewallRules() {
+        if (this.firewallRules == null) {
+            this.firewallRules = new FirewallRulesImpl(this);
+        }
+        return this.firewallRules;
+    }
+
+    /**
+     * @return Entry point to manage VirtualNetworkRules.
+     */
+    public VirtualNetworkRules virtualNetworkRules() {
+        if (this.virtualNetworkRules == null) {
+            this.virtualNetworkRules = new VirtualNetworkRulesImpl(this);
+        }
+        return this.virtualNetworkRules;
+    }
+
+    /**
+     * @return Entry point to manage Databases.
+     */
+    public Databases databases() {
+        if (this.databases == null) {
+            this.databases = new DatabasesImpl(this);
+        }
+        return this.databases;
+    }
+
+    /**
+     * @return Entry point to manage Configurations.
+     */
+    public Configurations configurations() {
+        if (this.configurations == null) {
+            this.configurations = new ConfigurationsImpl(this);
+        }
+        return this.configurations;
+    }
+
+    /**
+     * @return Entry point to manage LogFiles.
+     */
+    public LogFiles logFiles() {
+        if (this.logFiles == null) {
+            this.logFiles = new LogFilesImpl(this);
+        }
+        return this.logFiles;
+    }
+
+    /**
+     * @return Entry point to manage LocationBasedPerformanceTiers.
+     */
+    public LocationBasedPerformanceTiers locationBasedPerformanceTiers() {
+        if (this.locationBasedPerformanceTiers == null) {
+            this.locationBasedPerformanceTiers = new LocationBasedPerformanceTiersImpl(this);
+        }
+        return this.locationBasedPerformanceTiers;
+    }
+
+    /**
+     * @return Entry point to manage CheckNameAvailabilitys.
+     */
+    public CheckNameAvailabilitys checkNameAvailabilitys() {
+        if (this.checkNameAvailabilitys == null) {
+            this.checkNameAvailabilitys = new CheckNameAvailabilitysImpl(this);
+        }
+        return this.checkNameAvailabilitys;
+    }
+
+    /**
+     * @return Entry point to manage ServerSecurityAlertPolicies.
+     */
+    public ServerSecurityAlertPolicies serverSecurityAlertPolicies() {
+        if (this.serverSecurityAlertPolicies == null) {
+            this.serverSecurityAlertPolicies = new ServerSecurityAlertPoliciesImpl(this);
+        }
+        return this.serverSecurityAlertPolicies;
+    }
+
+    /**
+     * @return Entry point to manage Operations.
+     */
+    public Operations operations() {
+        if (this.operations == null) {
+            this.operations = new OperationsImpl(this);
+        }
+        return this.operations;
+    }
+
+    /**
+    * The implementation for Configurable interface.
+    */
+    private static final class ConfigurableImpl extends AzureConfigurableCoreImpl<Configurable> implements Configurable {
+        public DBforMySQLManager authenticate(AzureTokenCredentials credentials, String subscriptionId) {
+           return DBforMySQLManager.authenticate(buildRestClient(credentials), subscriptionId);
+        }
+     }
+    private DBforMySQLManager(RestClient restClient, String subscriptionId) {
+        super(
+            restClient,
+            subscriptionId,
+            new MySQLManagementClientImpl(restClient).withSubscriptionId(subscriptionId));
+    }
+}
diff --git a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/DatabaseImpl.java b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/DatabaseImpl.java
index 976252d08ffb..b07a0c2c036f 100644
--- a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/DatabaseImpl.java
+++ b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/DatabaseImpl.java
@@ -13,12 +13,12 @@
 import rx.Observable;
 
 class DatabaseImpl extends CreatableUpdatableImpl<Database, DatabaseInner, DatabaseImpl> implements Database, Database.Definition, Database.Update {
-    private final MySQLManager manager;
+    private final DBforMySQLManager manager;
     private String resourceGroupName;
     private String serverName;
     private String databaseName;
 
-    DatabaseImpl(String name, MySQLManager manager) {
+    DatabaseImpl(String name, DBforMySQLManager manager) {
         super(name, new DatabaseInner());
         this.manager = manager;
         // Set resource name
@@ -26,7 +26,7 @@ class DatabaseImpl extends CreatableUpdatableImpl<Database, DatabaseInner, Datab
         //
     }
 
-    DatabaseImpl(DatabaseInner inner, MySQLManager manager) {
+    DatabaseImpl(DatabaseInner inner, DBforMySQLManager manager) {
         super(inner.name(), inner);
         this.manager = manager;
         // Set resource name
@@ -39,7 +39,7 @@ class DatabaseImpl extends CreatableUpdatableImpl<Database, DatabaseInner, Datab
     }
 
     @Override
-    public MySQLManager manager() {
+    public DBforMySQLManager manager() {
         return this.manager;
     }
 
diff --git a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/DatabasesImpl.java b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/DatabasesImpl.java
index 4d6f55049280..5bb7603fc3ce 100644
--- a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/DatabasesImpl.java
+++ b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/DatabasesImpl.java
@@ -18,14 +18,14 @@
 import com.microsoft.azure.management.mysql.v2017_12_01.Database;
 
 class DatabasesImpl extends WrapperImpl<DatabasesInner> implements Databases {
-    private final MySQLManager manager;
+    private final DBforMySQLManager manager;
 
-    DatabasesImpl(MySQLManager manager) {
+    DatabasesImpl(DBforMySQLManager manager) {
         super(manager.inner().databases());
         this.manager = manager;
     }
 
-    public MySQLManager manager() {
+    public DBforMySQLManager manager() {
         return this.manager;
     }
 
@@ -64,10 +64,14 @@ public Database call(DatabaseInner inner) {
     public Observable<Database> getAsync(String resourceGroupName, String serverName, String databaseName) {
         DatabasesInner client = this.inner();
         return client.getAsync(resourceGroupName, serverName, databaseName)
-        .map(new Func1<DatabaseInner, Database>() {
+        .flatMap(new Func1<DatabaseInner, Observable<Database>>() {
             @Override
-            public Database call(DatabaseInner inner) {
-                return wrapModel(inner);
+            public Observable<Database> call(DatabaseInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((Database)wrapModel(inner));
+                }
             }
        });
     }
diff --git a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/FirewallRuleImpl.java b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/FirewallRuleImpl.java
index dda539f2a842..0b858aa6b190 100644
--- a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/FirewallRuleImpl.java
+++ b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/FirewallRuleImpl.java
@@ -13,12 +13,12 @@
 import rx.Observable;
 
 class FirewallRuleImpl extends CreatableUpdatableImpl<FirewallRule, FirewallRuleInner, FirewallRuleImpl> implements FirewallRule, FirewallRule.Definition, FirewallRule.Update {
-    private final MySQLManager manager;
+    private final DBforMySQLManager manager;
     private String resourceGroupName;
     private String serverName;
     private String firewallRuleName;
 
-    FirewallRuleImpl(String name, MySQLManager manager) {
+    FirewallRuleImpl(String name, DBforMySQLManager manager) {
         super(name, new FirewallRuleInner());
         this.manager = manager;
         // Set resource name
@@ -26,7 +26,7 @@ class FirewallRuleImpl extends CreatableUpdatableImpl<FirewallRule, FirewallRule
         //
     }
 
-    FirewallRuleImpl(FirewallRuleInner inner, MySQLManager manager) {
+    FirewallRuleImpl(FirewallRuleInner inner, DBforMySQLManager manager) {
         super(inner.name(), inner);
         this.manager = manager;
         // Set resource name
@@ -39,7 +39,7 @@ class FirewallRuleImpl extends CreatableUpdatableImpl<FirewallRule, FirewallRule
     }
 
     @Override
-    public MySQLManager manager() {
+    public DBforMySQLManager manager() {
         return this.manager;
     }
 
diff --git a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/FirewallRulesImpl.java b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/FirewallRulesImpl.java
index 65395560eade..78746fc6f249 100644
--- a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/FirewallRulesImpl.java
+++ b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/FirewallRulesImpl.java
@@ -18,14 +18,14 @@
 import com.microsoft.azure.management.mysql.v2017_12_01.FirewallRule;
 
 class FirewallRulesImpl extends WrapperImpl<FirewallRulesInner> implements FirewallRules {
-    private final MySQLManager manager;
+    private final DBforMySQLManager manager;
 
-    FirewallRulesImpl(MySQLManager manager) {
+    FirewallRulesImpl(DBforMySQLManager manager) {
         super(manager.inner().firewallRules());
         this.manager = manager;
     }
 
-    public MySQLManager manager() {
+    public DBforMySQLManager manager() {
         return this.manager;
     }
 
@@ -64,10 +64,14 @@ public FirewallRule call(FirewallRuleInner inner) {
     public Observable<FirewallRule> getAsync(String resourceGroupName, String serverName, String firewallRuleName) {
         FirewallRulesInner client = this.inner();
         return client.getAsync(resourceGroupName, serverName, firewallRuleName)
-        .map(new Func1<FirewallRuleInner, FirewallRule>() {
+        .flatMap(new Func1<FirewallRuleInner, Observable<FirewallRule>>() {
             @Override
-            public FirewallRule call(FirewallRuleInner inner) {
-                return wrapModel(inner);
+            public Observable<FirewallRule> call(FirewallRuleInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((FirewallRule)wrapModel(inner));
+                }
             }
        });
     }
diff --git a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/LocationBasedPerformanceTiersImpl.java b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/LocationBasedPerformanceTiersImpl.java
index 0f0fbd7f0a39..819f546d0094 100644
--- a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/LocationBasedPerformanceTiersImpl.java
+++ b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/LocationBasedPerformanceTiersImpl.java
@@ -17,14 +17,14 @@
 import com.microsoft.azure.management.mysql.v2017_12_01.PerformanceTierProperties;
 
 class LocationBasedPerformanceTiersImpl extends WrapperImpl<LocationBasedPerformanceTiersInner> implements LocationBasedPerformanceTiers {
-    private final MySQLManager manager;
+    private final DBforMySQLManager manager;
 
-    LocationBasedPerformanceTiersImpl(MySQLManager manager) {
+    LocationBasedPerformanceTiersImpl(DBforMySQLManager manager) {
         super(manager.inner().locationBasedPerformanceTiers());
         this.manager = manager;
     }
 
-    public MySQLManager manager() {
+    public DBforMySQLManager manager() {
         return this.manager;
     }
 
diff --git a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/LogFileImpl.java b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/LogFileImpl.java
index dc549c092fa8..87012d3b5fa4 100644
--- a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/LogFileImpl.java
+++ b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/LogFileImpl.java
@@ -14,15 +14,15 @@
 import org.joda.time.DateTime;
 
 class LogFileImpl extends WrapperImpl<LogFileInner> implements LogFile {
-    private final MySQLManager manager;
+    private final DBforMySQLManager manager;
 
-    LogFileImpl(LogFileInner inner,  MySQLManager manager) {
+    LogFileImpl(LogFileInner inner,  DBforMySQLManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public MySQLManager manager() {
+    public DBforMySQLManager manager() {
         return this.manager;
     }
 
diff --git a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/LogFilesImpl.java b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/LogFilesImpl.java
index 75c9feab0f78..313911884539 100644
--- a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/LogFilesImpl.java
+++ b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/LogFilesImpl.java
@@ -17,14 +17,14 @@
 import com.microsoft.azure.management.mysql.v2017_12_01.LogFile;
 
 class LogFilesImpl extends WrapperImpl<LogFilesInner> implements LogFiles {
-    private final MySQLManager manager;
+    private final DBforMySQLManager manager;
 
-    LogFilesImpl(MySQLManager manager) {
+    LogFilesImpl(DBforMySQLManager manager) {
         super(manager.inner().logFiles());
         this.manager = manager;
     }
 
-    public MySQLManager manager() {
+    public DBforMySQLManager manager() {
         return this.manager;
     }
 
diff --git a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/NameAvailabilityImpl.java b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/NameAvailabilityImpl.java
index b2ff4f5f0f4c..976e715ffb3e 100644
--- a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/NameAvailabilityImpl.java
+++ b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/NameAvailabilityImpl.java
@@ -12,14 +12,14 @@
 import com.microsoft.azure.arm.model.implementation.WrapperImpl;
 
 class NameAvailabilityImpl extends WrapperImpl<NameAvailabilityInner> implements NameAvailability {
-    private final MySQLManager manager;
-    NameAvailabilityImpl(NameAvailabilityInner inner, MySQLManager manager) {
+    private final DBforMySQLManager manager;
+    NameAvailabilityImpl(NameAvailabilityInner inner, DBforMySQLManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public MySQLManager manager() {
+    public DBforMySQLManager manager() {
         return this.manager;
     }
 
diff --git a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/OperationListResultImpl.java b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/OperationListResultImpl.java
index 153dbb72e6e7..564ad1d27aa0 100644
--- a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/OperationListResultImpl.java
+++ b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/OperationListResultImpl.java
@@ -13,14 +13,14 @@
 import java.util.List;
 
 class OperationListResultImpl extends WrapperImpl<OperationListResultInner> implements OperationListResult {
-    private final MySQLManager manager;
-    OperationListResultImpl(OperationListResultInner inner, MySQLManager manager) {
+    private final DBforMySQLManager manager;
+    OperationListResultImpl(OperationListResultInner inner, DBforMySQLManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public MySQLManager manager() {
+    public DBforMySQLManager manager() {
         return this.manager;
     }
 
diff --git a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/OperationsImpl.java b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/OperationsImpl.java
index e90794fcd6f1..513d63f49845 100644
--- a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/OperationsImpl.java
+++ b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/OperationsImpl.java
@@ -16,14 +16,14 @@
 import com.microsoft.azure.management.mysql.v2017_12_01.OperationListResult;
 
 class OperationsImpl extends WrapperImpl<OperationsInner> implements Operations {
-    private final MySQLManager manager;
+    private final DBforMySQLManager manager;
 
-    OperationsImpl(MySQLManager manager) {
+    OperationsImpl(DBforMySQLManager manager) {
         super(manager.inner().operations());
         this.manager = manager;
     }
 
-    public MySQLManager manager() {
+    public DBforMySQLManager manager() {
         return this.manager;
     }
 
diff --git a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/PerformanceTierPropertiesImpl.java b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/PerformanceTierPropertiesImpl.java
index 1ad8d1758f7d..5be0833686ca 100644
--- a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/PerformanceTierPropertiesImpl.java
+++ b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/PerformanceTierPropertiesImpl.java
@@ -15,15 +15,15 @@
 import com.microsoft.azure.management.mysql.v2017_12_01.PerformanceTierServiceLevelObjectives;
 
 class PerformanceTierPropertiesImpl extends WrapperImpl<PerformanceTierPropertiesInner> implements PerformanceTierProperties {
-    private final MySQLManager manager;
+    private final DBforMySQLManager manager;
 
-    PerformanceTierPropertiesImpl(PerformanceTierPropertiesInner inner,  MySQLManager manager) {
+    PerformanceTierPropertiesImpl(PerformanceTierPropertiesInner inner,  DBforMySQLManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public MySQLManager manager() {
+    public DBforMySQLManager manager() {
         return this.manager;
     }
 
diff --git a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/ReplicasImpl.java b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/ReplicasImpl.java
index 08b755a6c4a3..c412a171dc09 100644
--- a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/ReplicasImpl.java
+++ b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/ReplicasImpl.java
@@ -17,14 +17,14 @@
 import com.microsoft.azure.management.mysql.v2017_12_01.ServerServer;
 
 class ReplicasImpl extends WrapperImpl<ReplicasInner> implements Replicas {
-    private final MySQLManager manager;
+    private final DBforMySQLManager manager;
 
-    ReplicasImpl(MySQLManager manager) {
+    ReplicasImpl(DBforMySQLManager manager) {
         super(manager.inner().replicas());
         this.manager = manager;
     }
 
-    public MySQLManager manager() {
+    public DBforMySQLManager manager() {
         return this.manager;
     }
 
diff --git a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/ServerImpl.java b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/ServerImpl.java
index f729094007cb..0f95fe442913 100644
--- a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/ServerImpl.java
+++ b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/ServerImpl.java
@@ -22,10 +22,10 @@
 import com.microsoft.azure.management.mysql.v2017_12_01.ServerPropertiesForCreate;
 import rx.functions.Func1;
 
-class ServerImpl extends GroupableResourceCoreImpl<Server, ServerInner, ServerImpl, MySQLManager> implements Server, Server.Definition, Server.Update {
+class ServerImpl extends GroupableResourceCoreImpl<Server, ServerInner, ServerImpl, DBforMySQLManager> implements Server, Server.Definition, Server.Update {
     private ServerForCreate createParameter;
     private ServerUpdateParameters updateParameter;
-    ServerImpl(String name, ServerInner inner, MySQLManager manager) {
+    ServerImpl(String name, ServerInner inner, DBforMySQLManager manager) {
         super(name, inner, manager);
         this.createParameter = new ServerForCreate();
         this.updateParameter = new ServerUpdateParameters();
diff --git a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/ServerInner.java b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/ServerInner.java
index b205bd622d97..951269b155c9 100644
--- a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/ServerInner.java
+++ b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/ServerInner.java
@@ -37,7 +37,7 @@ public class ServerInner extends Resource {
     private String administratorLogin;
 
     /**
-     * Server version. Possible values include: '5.6', '5.7'.
+     * Server version. Possible values include: '5.6', '5.7', '8.0'.
      */
     @JsonProperty(value = "properties.version")
     private ServerVersion version;
@@ -133,7 +133,7 @@ public ServerInner withAdministratorLogin(String administratorLogin) {
     }
 
     /**
-     * Get server version. Possible values include: '5.6', '5.7'.
+     * Get server version. Possible values include: '5.6', '5.7', '8.0'.
      *
      * @return the version value
      */
@@ -142,7 +142,7 @@ public ServerVersion version() {
     }
 
     /**
-     * Set server version. Possible values include: '5.6', '5.7'.
+     * Set server version. Possible values include: '5.6', '5.7', '8.0'.
      *
      * @param version the version value to set
      * @return the ServerInner object itself.
diff --git a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/ServerSecurityAlertPoliciesImpl.java b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/ServerSecurityAlertPoliciesImpl.java
index 2319d914b8f2..313ad02f72e7 100644
--- a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/ServerSecurityAlertPoliciesImpl.java
+++ b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/ServerSecurityAlertPoliciesImpl.java
@@ -16,14 +16,14 @@
 import com.microsoft.azure.management.mysql.v2017_12_01.ServerSecurityAlertPolicy;
 
 class ServerSecurityAlertPoliciesImpl extends WrapperImpl<ServerSecurityAlertPoliciesInner> implements ServerSecurityAlertPolicies {
-    private final MySQLManager manager;
+    private final DBforMySQLManager manager;
 
-    ServerSecurityAlertPoliciesImpl(MySQLManager manager) {
+    ServerSecurityAlertPoliciesImpl(DBforMySQLManager manager) {
         super(manager.inner().serverSecurityAlertPolicies());
         this.manager = manager;
     }
 
-    public MySQLManager manager() {
+    public DBforMySQLManager manager() {
         return this.manager;
     }
 
@@ -44,10 +44,14 @@ private ServerSecurityAlertPolicyImpl wrapModel(String name) {
     public Observable<ServerSecurityAlertPolicy> getAsync(String resourceGroupName, String serverName) {
         ServerSecurityAlertPoliciesInner client = this.inner();
         return client.getAsync(resourceGroupName, serverName)
-        .map(new Func1<ServerSecurityAlertPolicyInner, ServerSecurityAlertPolicy>() {
+        .flatMap(new Func1<ServerSecurityAlertPolicyInner, Observable<ServerSecurityAlertPolicy>>() {
             @Override
-            public ServerSecurityAlertPolicy call(ServerSecurityAlertPolicyInner inner) {
-                return wrapModel(inner);
+            public Observable<ServerSecurityAlertPolicy> call(ServerSecurityAlertPolicyInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((ServerSecurityAlertPolicy)wrapModel(inner));
+                }
             }
        });
     }
diff --git a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/ServerSecurityAlertPolicyImpl.java b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/ServerSecurityAlertPolicyImpl.java
index aebf40280f46..6c03d3e04305 100644
--- a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/ServerSecurityAlertPolicyImpl.java
+++ b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/ServerSecurityAlertPolicyImpl.java
@@ -15,11 +15,11 @@
 import java.util.List;
 
 class ServerSecurityAlertPolicyImpl extends CreatableUpdatableImpl<ServerSecurityAlertPolicy, ServerSecurityAlertPolicyInner, ServerSecurityAlertPolicyImpl> implements ServerSecurityAlertPolicy, ServerSecurityAlertPolicy.Definition, ServerSecurityAlertPolicy.Update {
-    private final MySQLManager manager;
+    private final DBforMySQLManager manager;
     private String resourceGroupName;
     private String serverName;
 
-    ServerSecurityAlertPolicyImpl(String name, MySQLManager manager) {
+    ServerSecurityAlertPolicyImpl(String name, DBforMySQLManager manager) {
         super(name, new ServerSecurityAlertPolicyInner());
         this.manager = manager;
         // Set resource name
@@ -27,7 +27,7 @@ class ServerSecurityAlertPolicyImpl extends CreatableUpdatableImpl<ServerSecurit
         //
     }
 
-    ServerSecurityAlertPolicyImpl(ServerSecurityAlertPolicyInner inner, MySQLManager manager) {
+    ServerSecurityAlertPolicyImpl(ServerSecurityAlertPolicyInner inner, DBforMySQLManager manager) {
         super(inner.name(), inner);
         this.manager = manager;
         // Set resource name
@@ -39,7 +39,7 @@ class ServerSecurityAlertPolicyImpl extends CreatableUpdatableImpl<ServerSecurit
     }
 
     @Override
-    public MySQLManager manager() {
+    public DBforMySQLManager manager() {
         return this.manager;
     }
 
diff --git a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/ServerServerImpl.java b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/ServerServerImpl.java
index 3d25a18cc7e9..4b55f578d750 100644
--- a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/ServerServerImpl.java
+++ b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/ServerServerImpl.java
@@ -20,15 +20,15 @@
 import com.microsoft.azure.management.mysql.v2017_12_01.ServerVersion;
 
 class ServerServerImpl extends WrapperImpl<ServerInner> implements ServerServer {
-    private final MySQLManager manager;
+    private final DBforMySQLManager manager;
 
-    ServerServerImpl(ServerInner inner,  MySQLManager manager) {
+    ServerServerImpl(ServerInner inner,  DBforMySQLManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public MySQLManager manager() {
+    public DBforMySQLManager manager() {
         return this.manager;
     }
 
diff --git a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/ServersImpl.java b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/ServersImpl.java
index 2dbb947aa35d..8b5a3b131226 100644
--- a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/ServersImpl.java
+++ b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/ServersImpl.java
@@ -23,8 +23,8 @@
 import com.microsoft.azure.PagedList;
 import com.microsoft.azure.Page;
 
-class ServersImpl extends GroupableResourcesCoreImpl<Server, ServerImpl, ServerInner, ServersInner, MySQLManager>  implements Servers {
-    protected ServersImpl(MySQLManager manager) {
+class ServersImpl extends GroupableResourcesCoreImpl<Server, ServerImpl, ServerInner, ServersInner, DBforMySQLManager>  implements Servers {
+    protected ServersImpl(DBforMySQLManager manager) {
         super(manager.inner().servers(), manager);
     }
 
diff --git a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/VirtualNetworkRuleImpl.java b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/VirtualNetworkRuleImpl.java
index 3d512d9d2439..c673b4dbae69 100644
--- a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/VirtualNetworkRuleImpl.java
+++ b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/VirtualNetworkRuleImpl.java
@@ -14,12 +14,12 @@
 import com.microsoft.azure.management.mysql.v2017_12_01.VirtualNetworkRuleState;
 
 class VirtualNetworkRuleImpl extends CreatableUpdatableImpl<VirtualNetworkRule, VirtualNetworkRuleInner, VirtualNetworkRuleImpl> implements VirtualNetworkRule, VirtualNetworkRule.Definition, VirtualNetworkRule.Update {
-    private final MySQLManager manager;
+    private final DBforMySQLManager manager;
     private String resourceGroupName;
     private String serverName;
     private String virtualNetworkRuleName;
 
-    VirtualNetworkRuleImpl(String name, MySQLManager manager) {
+    VirtualNetworkRuleImpl(String name, DBforMySQLManager manager) {
         super(name, new VirtualNetworkRuleInner());
         this.manager = manager;
         // Set resource name
@@ -27,7 +27,7 @@ class VirtualNetworkRuleImpl extends CreatableUpdatableImpl<VirtualNetworkRule,
         //
     }
 
-    VirtualNetworkRuleImpl(VirtualNetworkRuleInner inner, MySQLManager manager) {
+    VirtualNetworkRuleImpl(VirtualNetworkRuleInner inner, DBforMySQLManager manager) {
         super(inner.name(), inner);
         this.manager = manager;
         // Set resource name
@@ -40,7 +40,7 @@ class VirtualNetworkRuleImpl extends CreatableUpdatableImpl<VirtualNetworkRule,
     }
 
     @Override
-    public MySQLManager manager() {
+    public DBforMySQLManager manager() {
         return this.manager;
     }
 
diff --git a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/VirtualNetworkRulesImpl.java b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/VirtualNetworkRulesImpl.java
index d34504cdec44..661efeb40688 100644
--- a/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/VirtualNetworkRulesImpl.java
+++ b/sdk/mysql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/mysql/v2017_12_01/implementation/VirtualNetworkRulesImpl.java
@@ -18,14 +18,14 @@
 import com.microsoft.azure.management.mysql.v2017_12_01.VirtualNetworkRule;
 
 class VirtualNetworkRulesImpl extends WrapperImpl<VirtualNetworkRulesInner> implements VirtualNetworkRules {
-    private final MySQLManager manager;
+    private final DBforMySQLManager manager;
 
-    VirtualNetworkRulesImpl(MySQLManager manager) {
+    VirtualNetworkRulesImpl(DBforMySQLManager manager) {
         super(manager.inner().virtualNetworkRules());
         this.manager = manager;
     }
 
-    public MySQLManager manager() {
+    public DBforMySQLManager manager() {
         return this.manager;
     }
 
@@ -64,10 +64,14 @@ public VirtualNetworkRule call(VirtualNetworkRuleInner inner) {
     public Observable<VirtualNetworkRule> getAsync(String resourceGroupName, String serverName, String virtualNetworkRuleName) {
         VirtualNetworkRulesInner client = this.inner();
         return client.getAsync(resourceGroupName, serverName, virtualNetworkRuleName)
-        .map(new Func1<VirtualNetworkRuleInner, VirtualNetworkRule>() {
+        .flatMap(new Func1<VirtualNetworkRuleInner, Observable<VirtualNetworkRule>>() {
             @Override
-            public VirtualNetworkRule call(VirtualNetworkRuleInner inner) {
-                return wrapModel(inner);
+            public Observable<VirtualNetworkRule> call(VirtualNetworkRuleInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((VirtualNetworkRule)wrapModel(inner));
+                }
             }
        });
     }