diff --git a/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/Activity.java b/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/Activity.java
index 0dcd32729ec8..4e4c670ade62 100644
--- a/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/Activity.java
+++ b/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/Activity.java
@@ -8,7 +8,6 @@
 
 package com.microsoft.azure.management.datafactoryv2.v2018_06_01;
 
-import java.util.Map;
 import java.util.List;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
@@ -25,12 +24,6 @@
     @JsonSubTypes.Type(name = "Container", value = ControlActivity.class)
 })
 public class Activity {
-    /**
-     * Unmatched properties from the message are deserialized this collection.
-     */
-    @JsonProperty(value = "")
-    private Map<String, Object> additionalProperties;
-
     /**
      * Activity name.
      */
@@ -53,27 +46,7 @@ public class Activity {
      * Activity user properties.
      */
     @JsonProperty(value = "userProperties")
-    private Map<String, String> userProperties;
-
-    /**
-     * Get unmatched properties from the message are deserialized this collection.
-     *
-     * @return the additionalProperties value
-     */
-    public Map<String, Object> additionalProperties() {
-        return this.additionalProperties;
-    }
-
-    /**
-     * Set unmatched properties from the message are deserialized this collection.
-     *
-     * @param additionalProperties the additionalProperties value to set
-     * @return the Activity object itself.
-     */
-    public Activity withAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-        return this;
-    }
+    private List<UserProperty> userProperties;
 
     /**
      * Get activity name.
@@ -140,7 +113,7 @@ public Activity withDependsOn(List<ActivityDependency> dependsOn) {
      *
      * @return the userProperties value
      */
-    public Map<String, String> userProperties() {
+    public List<UserProperty> userProperties() {
         return this.userProperties;
     }
 
@@ -150,7 +123,7 @@ public Map<String, String> userProperties() {
      * @param userProperties the userProperties value to set
      * @return the Activity object itself.
      */
-    public Activity withUserProperties(Map<String, String> userProperties) {
+    public Activity withUserProperties(List<UserProperty> userProperties) {
         this.userProperties = userProperties;
         return this;
     }
diff --git a/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/UserProperty.java b/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/UserProperty.java
new file mode 100644
index 000000000000..e0a808ee9ee3
--- /dev/null
+++ b/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/UserProperty.java
@@ -0,0 +1,70 @@
+/**
+ * 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.datafactoryv2.v2018_06_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * User property.
+ */
+public class UserProperty {
+    /**
+     * User proprety name.
+     */
+    @JsonProperty(value = "name", required = true)
+    private String name;
+
+    /**
+     * User proprety value. Type: string (or Expression with resultType
+     * string).
+     */
+    @JsonProperty(value = "value", required = true)
+    private Object value;
+
+    /**
+     * Get user proprety name.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set user proprety name.
+     *
+     * @param name the name value to set
+     * @return the UserProperty object itself.
+     */
+    public UserProperty withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get user proprety value. Type: string (or Expression with resultType string).
+     *
+     * @return the value value
+     */
+    public Object value() {
+        return this.value;
+    }
+
+    /**
+     * Set user proprety value. Type: string (or Expression with resultType string).
+     *
+     * @param value the value value to set
+     * @return the UserProperty object itself.
+     */
+    public UserProperty withValue(Object value) {
+        this.value = value;
+        return this;
+    }
+
+}