diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Body.java b/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Body.java
index 55eb798518d7..359d45a7e4df 100644
--- a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Body.java
+++ b/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Body.java
@@ -8,6 +8,7 @@
 
 package com.microsoft.azure.cognitiveservices.vision.contentmoderator.models;
 
+import java.util.Map;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
@@ -30,7 +31,7 @@ public class Body {
      * Metadata of the list.
      */
     @JsonProperty(value = "Metadata")
-    private BodyMetadata metadata;
+    private Map<String, String> metadata;
 
     /**
      * Get name of the list.
@@ -77,7 +78,7 @@ public Body withDescription(String description) {
      *
      * @return the metadata value
      */
-    public BodyMetadata metadata() {
+    public Map<String, String> metadata() {
         return this.metadata;
     }
 
@@ -87,7 +88,7 @@ public BodyMetadata metadata() {
      * @param metadata the metadata value to set
      * @return the Body object itself.
      */
-    public Body withMetadata(BodyMetadata metadata) {
+    public Body withMetadata(Map<String, String> metadata) {
         this.metadata = metadata;
         return this;
     }
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/ImageList.java b/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/ImageList.java
index 2d09eb8e6028..2e608be6122a 100644
--- a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/ImageList.java
+++ b/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/ImageList.java
@@ -8,6 +8,7 @@
 
 package com.microsoft.azure.cognitiveservices.vision.contentmoderator.models;
 
+import java.util.Map;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
@@ -36,7 +37,7 @@ public class ImageList {
      * Image List Metadata.
      */
     @JsonProperty(value = "Metadata")
-    private ImageListMetadata metadata;
+    private Map<String, String> metadata;
 
     /**
      * Get image List Id.
@@ -103,7 +104,7 @@ public ImageList withDescription(String description) {
      *
      * @return the metadata value
      */
-    public ImageListMetadata metadata() {
+    public Map<String, String> metadata() {
         return this.metadata;
     }
 
@@ -113,7 +114,7 @@ public ImageListMetadata metadata() {
      * @param metadata the metadata value to set
      * @return the ImageList object itself.
      */
-    public ImageList withMetadata(ImageListMetadata metadata) {
+    public ImageList withMetadata(Map<String, String> metadata) {
         this.metadata = metadata;
         return this;
     }
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/RefreshIndex.java b/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/RefreshIndex.java
index a973098c3bec..ce9936e8301a 100644
--- a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/RefreshIndex.java
+++ b/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/RefreshIndex.java
@@ -9,6 +9,7 @@
 package com.microsoft.azure.cognitiveservices.vision.contentmoderator.models;
 
 import java.util.List;
+import java.util.Map;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
@@ -31,7 +32,7 @@ public class RefreshIndex {
      * Advanced info list.
      */
     @JsonProperty(value = "AdvancedInfo")
-    private List<RefreshIndexAdvancedInfoItem> advancedInfo;
+    private List<Map<String, String>> advancedInfo;
 
     /**
      * Refresh index status.
@@ -90,7 +91,7 @@ public RefreshIndex withIsUpdateSuccess(Boolean isUpdateSuccess) {
      *
      * @return the advancedInfo value
      */
-    public List<RefreshIndexAdvancedInfoItem> advancedInfo() {
+    public List<Map<String, String>> advancedInfo() {
         return this.advancedInfo;
     }
 
@@ -100,7 +101,7 @@ public List<RefreshIndexAdvancedInfoItem> advancedInfo() {
      * @param advancedInfo the advancedInfo value to set
      * @return the RefreshIndex object itself.
      */
-    public RefreshIndex withAdvancedInfo(List<RefreshIndexAdvancedInfoItem> advancedInfo) {
+    public RefreshIndex withAdvancedInfo(List<Map<String, String>> advancedInfo) {
         this.advancedInfo = advancedInfo;
         return this;
     }
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/TermList.java b/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/TermList.java
index cd301b25e4fa..a84b993a8ae9 100644
--- a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/TermList.java
+++ b/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/TermList.java
@@ -8,6 +8,7 @@
 
 package com.microsoft.azure.cognitiveservices.vision.contentmoderator.models;
 
+import java.util.Map;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
@@ -36,7 +37,7 @@ public class TermList {
      * Term list metadata.
      */
     @JsonProperty(value = "Metadata")
-    private TermListMetadata metadata;
+    private Map<String, String> metadata;
 
     /**
      * Get term list Id.
@@ -103,7 +104,7 @@ public TermList withDescription(String description) {
      *
      * @return the metadata value
      */
-    public TermListMetadata metadata() {
+    public Map<String, String> metadata() {
         return this.metadata;
     }
 
@@ -113,7 +114,7 @@ public TermListMetadata metadata() {
      * @param metadata the metadata value to set
      * @return the TermList object itself.
      */
-    public TermList withMetadata(TermListMetadata metadata) {
+    public TermList withMetadata(Map<String, String> metadata) {
         this.metadata = metadata;
         return this;
     }