diff --git a/sdk/mariadb/mgmt-v2018_06_01/pom.xml b/sdk/mariadb/mgmt-v2018_06_01/pom.xml
index 740ca60c95ff..bdd75e9fd37c 100644
--- a/sdk/mariadb/mgmt-v2018_06_01/pom.xml
+++ b/sdk/mariadb/mgmt-v2018_06_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-mariadb</artifactId>
-    <version>1.0.0-beta-1</version>
+    <version>1.0.0-beta</version>
     <packaging>jar</packaging>
     <name>Microsoft Azure SDK for MariaDB Management</name>
     <description>This package contains Microsoft MariaDB 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/mariadb/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/mariadb/v2018_06_01/ServerPropertiesForCreate.java b/sdk/mariadb/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/mariadb/v2018_06_01/ServerPropertiesForCreate.java
index ac0b6a154a77..91f4612029a3 100644
--- a/sdk/mariadb/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/mariadb/v2018_06_01/ServerPropertiesForCreate.java
+++ b/sdk/mariadb/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/mariadb/v2018_06_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),
diff --git a/sdk/mariadb/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/mariadb/v2018_06_01/ServerPropertiesForDefaultCreate.java b/sdk/mariadb/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/mariadb/v2018_06_01/ServerPropertiesForDefaultCreate.java
index 06c98e671474..1e7a56aa14f8 100644
--- a/sdk/mariadb/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/mariadb/v2018_06_01/ServerPropertiesForDefaultCreate.java
+++ b/sdk/mariadb/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/mariadb/v2018_06_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/mariadb/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/mariadb/v2018_06_01/ServerPropertiesForGeoRestore.java b/sdk/mariadb/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/mariadb/v2018_06_01/ServerPropertiesForGeoRestore.java
index 841db628f501..40389070b768 100644
--- a/sdk/mariadb/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/mariadb/v2018_06_01/ServerPropertiesForGeoRestore.java
+++ b/sdk/mariadb/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/mariadb/v2018_06_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/mariadb/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/mariadb/v2018_06_01/ServerPropertiesForReplica.java b/sdk/mariadb/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/mariadb/v2018_06_01/ServerPropertiesForReplica.java
index 2cc3741ea975..64109362dca3 100644
--- a/sdk/mariadb/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/mariadb/v2018_06_01/ServerPropertiesForReplica.java
+++ b/sdk/mariadb/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/mariadb/v2018_06_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/mariadb/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/mariadb/v2018_06_01/ServerPropertiesForRestore.java b/sdk/mariadb/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/mariadb/v2018_06_01/ServerPropertiesForRestore.java
index 6235e5bc2dba..a8e958e5d3c9 100644
--- a/sdk/mariadb/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/mariadb/v2018_06_01/ServerPropertiesForRestore.java
+++ b/sdk/mariadb/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/mariadb/v2018_06_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/mariadb/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/mariadb/v2018_06_01/implementation/ConfigurationsImpl.java b/sdk/mariadb/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/mariadb/v2018_06_01/implementation/ConfigurationsImpl.java
index 5f908d30377c..a23cbbac9f8b 100644
--- a/sdk/mariadb/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/mariadb/v2018_06_01/implementation/ConfigurationsImpl.java
+++ b/sdk/mariadb/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/mariadb/v2018_06_01/implementation/ConfigurationsImpl.java
@@ -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/mariadb/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/mariadb/v2018_06_01/implementation/DatabasesImpl.java b/sdk/mariadb/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/mariadb/v2018_06_01/implementation/DatabasesImpl.java
index 8127e77e7e37..60e25117c900 100644
--- a/sdk/mariadb/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/mariadb/v2018_06_01/implementation/DatabasesImpl.java
+++ b/sdk/mariadb/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/mariadb/v2018_06_01/implementation/DatabasesImpl.java
@@ -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/mariadb/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/mariadb/v2018_06_01/implementation/FirewallRulesImpl.java b/sdk/mariadb/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/mariadb/v2018_06_01/implementation/FirewallRulesImpl.java
index e7eff8d9b5ac..69d301af4490 100644
--- a/sdk/mariadb/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/mariadb/v2018_06_01/implementation/FirewallRulesImpl.java
+++ b/sdk/mariadb/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/mariadb/v2018_06_01/implementation/FirewallRulesImpl.java
@@ -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/mariadb/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/mariadb/v2018_06_01/implementation/ServerSecurityAlertPoliciesImpl.java b/sdk/mariadb/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/mariadb/v2018_06_01/implementation/ServerSecurityAlertPoliciesImpl.java
index bfe040904dcc..fcc967ac9384 100644
--- a/sdk/mariadb/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/mariadb/v2018_06_01/implementation/ServerSecurityAlertPoliciesImpl.java
+++ b/sdk/mariadb/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/mariadb/v2018_06_01/implementation/ServerSecurityAlertPoliciesImpl.java
@@ -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/mariadb/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/mariadb/v2018_06_01/implementation/VirtualNetworkRulesImpl.java b/sdk/mariadb/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/mariadb/v2018_06_01/implementation/VirtualNetworkRulesImpl.java
index c5aab5c6677e..cde1f000bf1b 100644
--- a/sdk/mariadb/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/mariadb/v2018_06_01/implementation/VirtualNetworkRulesImpl.java
+++ b/sdk/mariadb/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/mariadb/v2018_06_01/implementation/VirtualNetworkRulesImpl.java
@@ -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));
+                }
             }
        });
     }