diff --git a/sdk/datamigration/mgmt-v2017_11_15_preview/pom.xml b/sdk/datamigration/mgmt-v2017_11_15_preview/pom.xml
index 8b1f94e596930..8867e001fd8eb 100644
--- a/sdk/datamigration/mgmt-v2017_11_15_preview/pom.xml
+++ b/sdk/datamigration/mgmt-v2017_11_15_preview/pom.xml
@@ -11,7 +11,7 @@
     <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-datamigration</artifactId>
@@ -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/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/ConnectToSourceSqlServerTaskOutput.java b/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/ConnectToSourceSqlServerTaskOutput.java
index fd2b9245349db..cc603c8ee5613 100644
--- a/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/ConnectToSourceSqlServerTaskOutput.java
+++ b/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/ConnectToSourceSqlServerTaskOutput.java
@@ -17,7 +17,7 @@
  * Output for the task that validates connection to SQL Server and also
  * validates source server requirements.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = ConnectToSourceSqlServerTaskOutput.class)
 @JsonTypeName("ConnectToSourceSqlServerTaskOutput")
 @JsonSubTypes({
     @JsonSubTypes.Type(name = "DatabaseLevelOutput", value = ConnectToSourceSqlServerTaskOutputDatabaseLevel.class),
diff --git a/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/ConnectToSourceSqlServerTaskOutputDatabaseLevel.java b/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/ConnectToSourceSqlServerTaskOutputDatabaseLevel.java
index a37da6da96c8c..5a4460c50a2d5 100644
--- a/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/ConnectToSourceSqlServerTaskOutputDatabaseLevel.java
+++ b/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/ConnectToSourceSqlServerTaskOutputDatabaseLevel.java
@@ -17,7 +17,7 @@
  * Database level output for the task that validates connection to SQL Server
  * and also validates source server requirements.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = ConnectToSourceSqlServerTaskOutputDatabaseLevel.class)
 @JsonTypeName("DatabaseLevelOutput")
 public class ConnectToSourceSqlServerTaskOutputDatabaseLevel extends ConnectToSourceSqlServerTaskOutput {
     /**
diff --git a/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/ConnectToSourceSqlServerTaskOutputTaskLevel.java b/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/ConnectToSourceSqlServerTaskOutputTaskLevel.java
index 6309450957ff1..c731b9c6768fa 100644
--- a/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/ConnectToSourceSqlServerTaskOutputTaskLevel.java
+++ b/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/ConnectToSourceSqlServerTaskOutputTaskLevel.java
@@ -18,7 +18,7 @@
  * Task level output for the task that validates connection to SQL Server and
  * also validates source server requirements.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = ConnectToSourceSqlServerTaskOutputTaskLevel.class)
 @JsonTypeName("TaskLevelOutput")
 public class ConnectToSourceSqlServerTaskOutputTaskLevel extends ConnectToSourceSqlServerTaskOutput {
     /**
diff --git a/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/ConnectToSourceSqlServerTaskProperties.java b/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/ConnectToSourceSqlServerTaskProperties.java
index 6607c2934b496..385c431b95b37 100644
--- a/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/ConnectToSourceSqlServerTaskProperties.java
+++ b/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/ConnectToSourceSqlServerTaskProperties.java
@@ -17,7 +17,7 @@
  * Properties for the task that validates connection to SQL Server and also
  * validates source server requirements.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType", defaultImpl = ConnectToSourceSqlServerTaskProperties.class)
 @JsonTypeName("ConnectToSource.SqlServer")
 public class ConnectToSourceSqlServerTaskProperties extends ProjectTaskProperties {
     /**
diff --git a/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/ConnectToTargetSqlDbTaskProperties.java b/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/ConnectToTargetSqlDbTaskProperties.java
index 7b51199f6c05f..4f0f814009ee0 100644
--- a/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/ConnectToTargetSqlDbTaskProperties.java
+++ b/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/ConnectToTargetSqlDbTaskProperties.java
@@ -17,7 +17,7 @@
  * Properties for the task that validates connection to SQL DB and target
  * server requirements.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType", defaultImpl = ConnectToTargetSqlDbTaskProperties.class)
 @JsonTypeName("ConnectToTarget.SqlDb")
 public class ConnectToTargetSqlDbTaskProperties extends ProjectTaskProperties {
     /**
diff --git a/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/ConnectionInfo.java b/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/ConnectionInfo.java
index fbc96b07c525c..c84e121fa1aa7 100644
--- a/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/ConnectionInfo.java
+++ b/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/ConnectionInfo.java
@@ -16,14 +16,10 @@
 /**
  * Defines the connection properties of a server.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type")
-@JsonTypeName("Unknown")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type", defaultImpl = ConnectionInfo.class)
+@JsonTypeName("ConnectionInfo")
 @JsonSubTypes({
-    @JsonSubTypes.Type(name = "SqlConnectionInfo", value = SqlConnectionInfo.class),
-    @JsonSubTypes.Type(name = "Migrate.SqlServer.SqlDb", value = MigrateSqlServerSqlDbTaskProperties.class),
-    @JsonSubTypes.Type(name = "GetUserTables.Sql", value = GetUserTablesSqlTaskProperties.class),
-    @JsonSubTypes.Type(name = "ConnectToTarget.SqlDb", value = ConnectToTargetSqlDbTaskProperties.class),
-    @JsonSubTypes.Type(name = "ConnectToSource.SqlServer", value = ConnectToSourceSqlServerTaskProperties.class)
+    @JsonSubTypes.Type(name = "SqlConnectionInfo", value = SqlConnectionInfo.class)
 })
 public class ConnectionInfo {
     /**
diff --git a/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/GetUserTablesSqlTaskProperties.java b/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/GetUserTablesSqlTaskProperties.java
index 83510136d73b0..27a7826e16caa 100644
--- a/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/GetUserTablesSqlTaskProperties.java
+++ b/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/GetUserTablesSqlTaskProperties.java
@@ -17,7 +17,7 @@
  * Properties for the task that collects user tables for the given list of
  * databases.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType", defaultImpl = GetUserTablesSqlTaskProperties.class)
 @JsonTypeName("GetUserTables.Sql")
 public class GetUserTablesSqlTaskProperties extends ProjectTaskProperties {
     /**
diff --git a/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/MigrateSqlServerSqlDbTaskOutput.java b/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/MigrateSqlServerSqlDbTaskOutput.java
index 44aced85f982b..301e21a28562a 100644
--- a/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/MigrateSqlServerSqlDbTaskOutput.java
+++ b/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/MigrateSqlServerSqlDbTaskOutput.java
@@ -17,7 +17,7 @@
  * Output for the task that migrates on-prem SQL Server databases to Azure SQL
  * Database.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigrateSqlServerSqlDbTaskOutput.class)
 @JsonTypeName("MigrateSqlServerSqlDbTaskOutput")
 @JsonSubTypes({
     @JsonSubTypes.Type(name = "ErrorOutput", value = MigrateSqlServerSqlDbTaskOutputError.class),
diff --git a/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/MigrateSqlServerSqlDbTaskOutputDatabaseLevel.java b/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/MigrateSqlServerSqlDbTaskOutputDatabaseLevel.java
index 7ae0e9d0c92e1..3af61649a5ef5 100644
--- a/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/MigrateSqlServerSqlDbTaskOutputDatabaseLevel.java
+++ b/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/MigrateSqlServerSqlDbTaskOutputDatabaseLevel.java
@@ -18,7 +18,7 @@
 /**
  * Database level result for Sql Server to Azure Sql DB migration.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigrateSqlServerSqlDbTaskOutputDatabaseLevel.class)
 @JsonTypeName("DatabaseLevelOutput")
 public class MigrateSqlServerSqlDbTaskOutputDatabaseLevel extends MigrateSqlServerSqlDbTaskOutput {
     /**
diff --git a/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/MigrateSqlServerSqlDbTaskOutputError.java b/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/MigrateSqlServerSqlDbTaskOutputError.java
index e3173044e194a..d3b28c2397ef3 100644
--- a/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/MigrateSqlServerSqlDbTaskOutputError.java
+++ b/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/MigrateSqlServerSqlDbTaskOutputError.java
@@ -15,7 +15,7 @@
 /**
  * Task errors for Sql Server to Azure Sql DB migration.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigrateSqlServerSqlDbTaskOutputError.class)
 @JsonTypeName("ErrorOutput")
 public class MigrateSqlServerSqlDbTaskOutputError extends MigrateSqlServerSqlDbTaskOutput {
     /**
diff --git a/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/MigrateSqlServerSqlDbTaskOutputMigrationLevel.java b/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/MigrateSqlServerSqlDbTaskOutputMigrationLevel.java
index 6479cfaa47dee..4423613552029 100644
--- a/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/MigrateSqlServerSqlDbTaskOutputMigrationLevel.java
+++ b/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/MigrateSqlServerSqlDbTaskOutputMigrationLevel.java
@@ -18,7 +18,7 @@
 /**
  * Migration level result for Sql server to Azure Sql DB migration.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigrateSqlServerSqlDbTaskOutputMigrationLevel.class)
 @JsonTypeName("MigrationLevelOutput")
 public class MigrateSqlServerSqlDbTaskOutputMigrationLevel extends MigrateSqlServerSqlDbTaskOutput {
     /**
diff --git a/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/MigrateSqlServerSqlDbTaskOutputTableLevel.java b/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/MigrateSqlServerSqlDbTaskOutputTableLevel.java
index 8b17033bf6258..e62b557adeda2 100644
--- a/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/MigrateSqlServerSqlDbTaskOutputTableLevel.java
+++ b/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/MigrateSqlServerSqlDbTaskOutputTableLevel.java
@@ -16,7 +16,7 @@
 /**
  * Table level result for Sql Server to Azure Sql DB migration.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigrateSqlServerSqlDbTaskOutputTableLevel.class)
 @JsonTypeName("TableLevelOutput")
 public class MigrateSqlServerSqlDbTaskOutputTableLevel extends MigrateSqlServerSqlDbTaskOutput {
     /**
diff --git a/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/MigrateSqlServerSqlDbTaskProperties.java b/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/MigrateSqlServerSqlDbTaskProperties.java
index bf0eeae024b58..86131a64741b4 100644
--- a/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/MigrateSqlServerSqlDbTaskProperties.java
+++ b/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/MigrateSqlServerSqlDbTaskProperties.java
@@ -17,7 +17,7 @@
  * Properties for the task that migrates on-prem SQL Server databases to Azure
  * SQL Database.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType", defaultImpl = MigrateSqlServerSqlDbTaskProperties.class)
 @JsonTypeName("Migrate.SqlServer.SqlDb")
 public class MigrateSqlServerSqlDbTaskProperties extends ProjectTaskProperties {
     /**
diff --git a/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/ProjectTaskProperties.java b/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/ProjectTaskProperties.java
index 5197c350ec4c7..74033507420aa 100644
--- a/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/ProjectTaskProperties.java
+++ b/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/ProjectTaskProperties.java
@@ -18,10 +18,9 @@
  * Base class for all types of DMS task properties. If task is not supported by
  * current client, this object is returned.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType")
-@JsonTypeName("Unknown")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType", defaultImpl = ProjectTaskProperties.class)
+@JsonTypeName("ProjectTaskProperties")
 @JsonSubTypes({
-    @JsonSubTypes.Type(name = "SqlConnectionInfo", value = SqlConnectionInfo.class),
     @JsonSubTypes.Type(name = "Migrate.SqlServer.SqlDb", value = MigrateSqlServerSqlDbTaskProperties.class),
     @JsonSubTypes.Type(name = "GetUserTables.Sql", value = GetUserTablesSqlTaskProperties.class),
     @JsonSubTypes.Type(name = "ConnectToTarget.SqlDb", value = ConnectToTargetSqlDbTaskProperties.class),
diff --git a/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/SqlConnectionInfo.java b/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/SqlConnectionInfo.java
index 6e863fc7cee1a..58b9c4921770d 100644
--- a/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/SqlConnectionInfo.java
+++ b/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/SqlConnectionInfo.java
@@ -15,7 +15,7 @@
 /**
  * Information for connecting to SQL database server.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type", defaultImpl = SqlConnectionInfo.class)
 @JsonTypeName("SqlConnectionInfo")
 public class SqlConnectionInfo extends ConnectionInfo {
     /**
diff --git a/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/implementation/ProjectsImpl.java b/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/implementation/ProjectsImpl.java
index e41a93e3a5668..c038a0576b9b5 100644
--- a/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/implementation/ProjectsImpl.java
+++ b/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/implementation/ProjectsImpl.java
@@ -64,10 +64,14 @@ public Project call(ProjectInner inner) {
     public Observable<Project> getAsync(String groupName, String serviceName, String projectName) {
         ProjectsInner client = this.inner();
         return client.getAsync(groupName, serviceName, projectName)
-        .map(new Func1<ProjectInner, Project>() {
+        .flatMap(new Func1<ProjectInner, Observable<Project>>() {
             @Override
-            public Project call(ProjectInner inner) {
-                return wrapModel(inner);
+            public Observable<Project> call(ProjectInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((Project)wrapModel(inner));
+                }
             }
        });
     }
diff --git a/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/implementation/TasksImpl.java b/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/implementation/TasksImpl.java
index c3606cb117ef3..976cdfbf4291b 100644
--- a/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/implementation/TasksImpl.java
+++ b/sdk/datamigration/mgmt-v2017_11_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2017_11_15_preview/implementation/TasksImpl.java
@@ -76,10 +76,14 @@ public ProjectTask call(ProjectTaskInner inner) {
     public Observable<ProjectTask> getAsync(String groupName, String serviceName, String projectName, String taskName) {
         TasksInner client = this.inner();
         return client.getAsync(groupName, serviceName, projectName, taskName)
-        .map(new Func1<ProjectTaskInner, ProjectTask>() {
+        .flatMap(new Func1<ProjectTaskInner, Observable<ProjectTask>>() {
             @Override
-            public ProjectTask call(ProjectTaskInner inner) {
-                return wrapModel(inner);
+            public Observable<ProjectTask> call(ProjectTaskInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((ProjectTask)wrapModel(inner));
+                }
             }
        });
     }