diff --git a/eventgrid/resource-manager/v2019_01_01/pom.xml b/eventgrid/resource-manager/v2019_01_01/pom.xml
index 3d1cdd0a8fa34..c3d9a9c4b3910 100644
--- a/eventgrid/resource-manager/v2019_01_01/pom.xml
+++ b/eventgrid/resource-manager/v2019_01_01/pom.xml
@@ -15,7 +15,7 @@
         <relativePath>../../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-eventgrid</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.0-beta</version>
     <packaging>jar</packaging>
     <name>Microsoft Azure SDK for EventGrid Management</name>
     <description>This package contains Microsoft EventGrid 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/eventgrid/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_01_01/DeadLetterDestination.java b/eventgrid/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_01_01/DeadLetterDestination.java
index c71e8daa37ab1..89161f5f5b544 100644
--- a/eventgrid/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_01_01/DeadLetterDestination.java
+++ b/eventgrid/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_01_01/DeadLetterDestination.java
@@ -19,7 +19,7 @@
  * StorageBlobDeadLetterDestination is the only class that derives from this
  * class.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "endpointType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "endpointType", defaultImpl = DeadLetterDestination.class)
 @JsonTypeName("DeadLetterDestination")
 @JsonSubTypes({
     @JsonSubTypes.Type(name = "StorageBlob", value = StorageBlobDeadLetterDestination.class)
diff --git a/eventgrid/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_01_01/EventHubEventSubscriptionDestination.java b/eventgrid/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_01_01/EventHubEventSubscriptionDestination.java
index c17ff8bdfcaaf..5f3080188f801 100644
--- a/eventgrid/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_01_01/EventHubEventSubscriptionDestination.java
+++ b/eventgrid/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_01_01/EventHubEventSubscriptionDestination.java
@@ -16,7 +16,7 @@
 /**
  * Information about the event hub destination for an event subscription.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "endpointType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "endpointType", defaultImpl = EventHubEventSubscriptionDestination.class)
 @JsonTypeName("EventHub")
 @JsonFlatten
 public class EventHubEventSubscriptionDestination extends EventSubscriptionDestination {
diff --git a/eventgrid/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_01_01/EventSubscriptionDestination.java b/eventgrid/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_01_01/EventSubscriptionDestination.java
index 2e3df95ced99b..03a4682e06d2d 100644
--- a/eventgrid/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_01_01/EventSubscriptionDestination.java
+++ b/eventgrid/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_01_01/EventSubscriptionDestination.java
@@ -15,7 +15,7 @@
 /**
  * Information about the destination for an event subscription.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "endpointType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "endpointType", defaultImpl = EventSubscriptionDestination.class)
 @JsonTypeName("EventSubscriptionDestination")
 @JsonSubTypes({
     @JsonSubTypes.Type(name = "WebHook", value = WebHookEventSubscriptionDestination.class),
diff --git a/eventgrid/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_01_01/HybridConnectionEventSubscriptionDestination.java b/eventgrid/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_01_01/HybridConnectionEventSubscriptionDestination.java
index fce1a977a2865..9a376ac1d9f91 100644
--- a/eventgrid/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_01_01/HybridConnectionEventSubscriptionDestination.java
+++ b/eventgrid/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_01_01/HybridConnectionEventSubscriptionDestination.java
@@ -17,7 +17,7 @@
  * Information about the HybridConnection destination for an event
  * subscription.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "endpointType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "endpointType", defaultImpl = HybridConnectionEventSubscriptionDestination.class)
 @JsonTypeName("HybridConnection")
 @JsonFlatten
 public class HybridConnectionEventSubscriptionDestination extends EventSubscriptionDestination {
diff --git a/eventgrid/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_01_01/StorageBlobDeadLetterDestination.java b/eventgrid/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_01_01/StorageBlobDeadLetterDestination.java
index ad78db352eebd..687f6b621354f 100644
--- a/eventgrid/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_01_01/StorageBlobDeadLetterDestination.java
+++ b/eventgrid/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_01_01/StorageBlobDeadLetterDestination.java
@@ -16,13 +16,13 @@
 /**
  * Information about the storage blob based dead letter destination.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "endpointType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "endpointType", defaultImpl = StorageBlobDeadLetterDestination.class)
 @JsonTypeName("StorageBlob")
 @JsonFlatten
 public class StorageBlobDeadLetterDestination extends DeadLetterDestination {
     /**
-     * The Azure Resource ID of the storage blob container that is the
-     * destination of the deadletter events. For example:
+     * The Azure Resource ID of the storage account that is the destination of
+     * the deadletter events. For example:
      * /subscriptions/{AzureSubscriptionId}/resourceGroups/{ResourceGroupName}/providers/microsoft.Storage/storageAccounts/{StorageAccountName}.
      */
     @JsonProperty(value = "properties.resourceId")
@@ -36,7 +36,7 @@ public class StorageBlobDeadLetterDestination extends DeadLetterDestination {
     private String blobContainerName;
 
     /**
-     * Get the Azure Resource ID of the storage blob container that is the destination of the deadletter events. For example: /subscriptions/{AzureSubscriptionId}/resourceGroups/{ResourceGroupName}/providers/microsoft.Storage/storageAccounts/{StorageAccountName}.
+     * Get the Azure Resource ID of the storage account that is the destination of the deadletter events. For example: /subscriptions/{AzureSubscriptionId}/resourceGroups/{ResourceGroupName}/providers/microsoft.Storage/storageAccounts/{StorageAccountName}.
      *
      * @return the resourceId value
      */
@@ -45,7 +45,7 @@ public String resourceId() {
     }
 
     /**
-     * Set the Azure Resource ID of the storage blob container that is the destination of the deadletter events. For example: /subscriptions/{AzureSubscriptionId}/resourceGroups/{ResourceGroupName}/providers/microsoft.Storage/storageAccounts/{StorageAccountName}.
+     * Set the Azure Resource ID of the storage account that is the destination of the deadletter events. For example: /subscriptions/{AzureSubscriptionId}/resourceGroups/{ResourceGroupName}/providers/microsoft.Storage/storageAccounts/{StorageAccountName}.
      *
      * @param resourceId the resourceId value to set
      * @return the StorageBlobDeadLetterDestination object itself.
diff --git a/eventgrid/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_01_01/StorageQueueEventSubscriptionDestination.java b/eventgrid/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_01_01/StorageQueueEventSubscriptionDestination.java
index 6ba84f19322c6..aec1740f5b8fa 100644
--- a/eventgrid/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_01_01/StorageQueueEventSubscriptionDestination.java
+++ b/eventgrid/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_01_01/StorageQueueEventSubscriptionDestination.java
@@ -16,7 +16,7 @@
 /**
  * Information about the storage queue destination for an event subscription.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "endpointType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "endpointType", defaultImpl = StorageQueueEventSubscriptionDestination.class)
 @JsonTypeName("StorageQueue")
 @JsonFlatten
 public class StorageQueueEventSubscriptionDestination extends EventSubscriptionDestination {
diff --git a/eventgrid/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_01_01/WebHookEventSubscriptionDestination.java b/eventgrid/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_01_01/WebHookEventSubscriptionDestination.java
index c47c80abd191b..9637ff054e034 100644
--- a/eventgrid/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_01_01/WebHookEventSubscriptionDestination.java
+++ b/eventgrid/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_01_01/WebHookEventSubscriptionDestination.java
@@ -16,7 +16,7 @@
 /**
  * Information about the webhook destination for an event subscription.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "endpointType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "endpointType", defaultImpl = WebHookEventSubscriptionDestination.class)
 @JsonTypeName("WebHook")
 @JsonFlatten
 public class WebHookEventSubscriptionDestination extends EventSubscriptionDestination {
diff --git a/swagger_to_sdk_config.json b/swagger_to_sdk_config.json
index afc88f9313de5..143b2e76ed7b5 100644
--- a/swagger_to_sdk_config.json
+++ b/swagger_to_sdk_config.json
@@ -6,7 +6,8 @@
       "verbose": "",
       "sdkrel:azure-libraries-for-java-folder": ".",
       "multiapi": "",
-      "use": "@microsoft.azure/autorest.java@preview"
+      "use": "@microsoft.azure/autorest.java@preview",
+      "java.clear-output-folder": ""
     },
     "version": "0.2.0",
     "advanced_options": {