diff --git a/src/main/generated/io/vertx/ext/mongo/AggregateOptionsConverter.java b/src/main/generated/io/vertx/ext/mongo/AggregateOptionsConverter.java
index 35c008c4..52ebd6db 100644
--- a/src/main/generated/io/vertx/ext/mongo/AggregateOptionsConverter.java
+++ b/src/main/generated/io/vertx/ext/mongo/AggregateOptionsConverter.java
@@ -17,7 +17,7 @@ public class AggregateOptionsConverter {
   private static final Base64.Decoder BASE64_DECODER = JsonUtil.BASE64_DECODER;
   private static final Base64.Encoder BASE64_ENCODER = JsonUtil.BASE64_ENCODER;
 
-  public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, AggregateOptions obj) {
+   static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, AggregateOptions obj) {
     for (java.util.Map.Entry<String, Object> member : json) {
       switch (member.getKey()) {
         case "collation":
@@ -44,11 +44,11 @@ public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json,
     }
   }
 
-  public static void toJson(AggregateOptions obj, JsonObject json) {
+   static void toJson(AggregateOptions obj, JsonObject json) {
     toJson(obj, json.getMap());
   }
 
-  public static void toJson(AggregateOptions obj, java.util.Map<String, Object> json) {
+   static void toJson(AggregateOptions obj, java.util.Map<String, Object> json) {
     if (obj.getCollation() != null) {
       json.put("collation", obj.getCollation().toJson());
     }
diff --git a/src/main/generated/io/vertx/ext/mongo/CollationOptionsConverter.java b/src/main/generated/io/vertx/ext/mongo/CollationOptionsConverter.java
index 4e00fdab..71dd7fe0 100644
--- a/src/main/generated/io/vertx/ext/mongo/CollationOptionsConverter.java
+++ b/src/main/generated/io/vertx/ext/mongo/CollationOptionsConverter.java
@@ -17,7 +17,7 @@ public class CollationOptionsConverter {
   private static final Base64.Decoder BASE64_DECODER = JsonUtil.BASE64_DECODER;
   private static final Base64.Encoder BASE64_ENCODER = JsonUtil.BASE64_ENCODER;
 
-  public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, CollationOptions obj) {
+   static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, CollationOptions obj) {
     for (java.util.Map.Entry<String, Object> member : json) {
       switch (member.getKey()) {
         case "normalization":
@@ -54,11 +54,11 @@ public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json,
     }
   }
 
-  public static void toJson(CollationOptions obj, JsonObject json) {
+   static void toJson(CollationOptions obj, JsonObject json) {
     toJson(obj, json.getMap());
   }
 
-  public static void toJson(CollationOptions obj, java.util.Map<String, Object> json) {
+   static void toJson(CollationOptions obj, java.util.Map<String, Object> json) {
     if (obj.isNormalization() != null) {
       json.put("normalization", obj.isNormalization());
     }
diff --git a/src/main/generated/io/vertx/ext/mongo/CountOptionsConverter.java b/src/main/generated/io/vertx/ext/mongo/CountOptionsConverter.java
index 4e796777..e341fc59 100644
--- a/src/main/generated/io/vertx/ext/mongo/CountOptionsConverter.java
+++ b/src/main/generated/io/vertx/ext/mongo/CountOptionsConverter.java
@@ -17,7 +17,7 @@ public class CountOptionsConverter {
   private static final Base64.Decoder BASE64_DECODER = JsonUtil.BASE64_DECODER;
   private static final Base64.Encoder BASE64_ENCODER = JsonUtil.BASE64_ENCODER;
 
-  public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, CountOptions obj) {
+   static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, CountOptions obj) {
     for (java.util.Map.Entry<String, Object> member : json) {
       switch (member.getKey()) {
         case "hint":
@@ -54,11 +54,11 @@ public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json,
     }
   }
 
-  public static void toJson(CountOptions obj, JsonObject json) {
+   static void toJson(CountOptions obj, JsonObject json) {
     toJson(obj, json.getMap());
   }
 
-  public static void toJson(CountOptions obj, java.util.Map<String, Object> json) {
+   static void toJson(CountOptions obj, java.util.Map<String, Object> json) {
     if (obj.getHint() != null) {
       json.put("hint", obj.getHint());
     }
diff --git a/src/main/generated/io/vertx/ext/mongo/CreateCollectionOptionsConverter.java b/src/main/generated/io/vertx/ext/mongo/CreateCollectionOptionsConverter.java
index 770a9986..14affdea 100644
--- a/src/main/generated/io/vertx/ext/mongo/CreateCollectionOptionsConverter.java
+++ b/src/main/generated/io/vertx/ext/mongo/CreateCollectionOptionsConverter.java
@@ -17,7 +17,7 @@ public class CreateCollectionOptionsConverter {
   private static final Base64.Decoder BASE64_DECODER = JsonUtil.BASE64_DECODER;
   private static final Base64.Encoder BASE64_ENCODER = JsonUtil.BASE64_ENCODER;
 
-  public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, CreateCollectionOptions obj) {
+   static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, CreateCollectionOptions obj) {
     for (java.util.Map.Entry<String, Object> member : json) {
       switch (member.getKey()) {
         case "maxDocuments":
@@ -69,11 +69,11 @@ public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json,
     }
   }
 
-  public static void toJson(CreateCollectionOptions obj, JsonObject json) {
+   static void toJson(CreateCollectionOptions obj, JsonObject json) {
     toJson(obj, json.getMap());
   }
 
-  public static void toJson(CreateCollectionOptions obj, java.util.Map<String, Object> json) {
+   static void toJson(CreateCollectionOptions obj, java.util.Map<String, Object> json) {
     if (obj.getMaxDocuments() != null) {
       json.put("maxDocuments", obj.getMaxDocuments());
     }
diff --git a/src/main/generated/io/vertx/ext/mongo/DistinctOptionsConverter.java b/src/main/generated/io/vertx/ext/mongo/DistinctOptionsConverter.java
index dbc67593..5d6d8365 100644
--- a/src/main/generated/io/vertx/ext/mongo/DistinctOptionsConverter.java
+++ b/src/main/generated/io/vertx/ext/mongo/DistinctOptionsConverter.java
@@ -17,7 +17,7 @@ public class DistinctOptionsConverter {
   private static final Base64.Decoder BASE64_DECODER = JsonUtil.BASE64_DECODER;
   private static final Base64.Encoder BASE64_ENCODER = JsonUtil.BASE64_ENCODER;
 
-  public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, DistinctOptions obj) {
+   static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, DistinctOptions obj) {
     for (java.util.Map.Entry<String, Object> member : json) {
       switch (member.getKey()) {
         case "collation":
@@ -29,11 +29,11 @@ public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json,
     }
   }
 
-  public static void toJson(DistinctOptions obj, JsonObject json) {
+   static void toJson(DistinctOptions obj, JsonObject json) {
     toJson(obj, json.getMap());
   }
 
-  public static void toJson(DistinctOptions obj, java.util.Map<String, Object> json) {
+   static void toJson(DistinctOptions obj, java.util.Map<String, Object> json) {
     if (obj.getCollation() != null) {
       json.put("collation", obj.getCollation().toJson());
     }
diff --git a/src/main/generated/io/vertx/ext/mongo/FindOptionsConverter.java b/src/main/generated/io/vertx/ext/mongo/FindOptionsConverter.java
index c629250c..6ba30706 100644
--- a/src/main/generated/io/vertx/ext/mongo/FindOptionsConverter.java
+++ b/src/main/generated/io/vertx/ext/mongo/FindOptionsConverter.java
@@ -17,7 +17,7 @@ public class FindOptionsConverter {
   private static final Base64.Decoder BASE64_DECODER = JsonUtil.BASE64_DECODER;
   private static final Base64.Encoder BASE64_ENCODER = JsonUtil.BASE64_ENCODER;
 
-  public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, FindOptions obj) {
+   static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, FindOptions obj) {
     for (java.util.Map.Entry<String, Object> member : json) {
       switch (member.getKey()) {
         case "collation":
@@ -64,11 +64,11 @@ public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json,
     }
   }
 
-  public static void toJson(FindOptions obj, JsonObject json) {
+   static void toJson(FindOptions obj, JsonObject json) {
     toJson(obj, json.getMap());
   }
 
-  public static void toJson(FindOptions obj, java.util.Map<String, Object> json) {
+   static void toJson(FindOptions obj, java.util.Map<String, Object> json) {
     if (obj.getCollation() != null) {
       json.put("collation", obj.getCollation().toJson());
     }
diff --git a/src/main/generated/io/vertx/ext/mongo/IndexModelConverter.java b/src/main/generated/io/vertx/ext/mongo/IndexModelConverter.java
index 789bf6c6..65c5cccf 100644
--- a/src/main/generated/io/vertx/ext/mongo/IndexModelConverter.java
+++ b/src/main/generated/io/vertx/ext/mongo/IndexModelConverter.java
@@ -17,7 +17,7 @@ public class IndexModelConverter {
   private static final Base64.Decoder BASE64_DECODER = JsonUtil.BASE64_DECODER;
   private static final Base64.Encoder BASE64_ENCODER = JsonUtil.BASE64_ENCODER;
 
-  public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, IndexModel obj) {
+   static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, IndexModel obj) {
     for (java.util.Map.Entry<String, Object> member : json) {
       switch (member.getKey()) {
         case "key":
@@ -34,11 +34,11 @@ public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json,
     }
   }
 
-  public static void toJson(IndexModel obj, JsonObject json) {
+   static void toJson(IndexModel obj, JsonObject json) {
     toJson(obj, json.getMap());
   }
 
-  public static void toJson(IndexModel obj, java.util.Map<String, Object> json) {
+   static void toJson(IndexModel obj, java.util.Map<String, Object> json) {
     if (obj.getKey() != null) {
       json.put("key", obj.getKey());
     }
diff --git a/src/main/generated/io/vertx/ext/mongo/TimeSeriesOptionsConverter.java b/src/main/generated/io/vertx/ext/mongo/TimeSeriesOptionsConverter.java
index 60d5ccdd..15ac7b87 100644
--- a/src/main/generated/io/vertx/ext/mongo/TimeSeriesOptionsConverter.java
+++ b/src/main/generated/io/vertx/ext/mongo/TimeSeriesOptionsConverter.java
@@ -17,7 +17,7 @@ public class TimeSeriesOptionsConverter {
   private static final Base64.Decoder BASE64_DECODER = JsonUtil.BASE64_DECODER;
   private static final Base64.Encoder BASE64_ENCODER = JsonUtil.BASE64_ENCODER;
 
-  public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, TimeSeriesOptions obj) {
+   static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, TimeSeriesOptions obj) {
     for (java.util.Map.Entry<String, Object> member : json) {
       switch (member.getKey()) {
         case "timeField":
@@ -39,11 +39,11 @@ public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json,
     }
   }
 
-  public static void toJson(TimeSeriesOptions obj, JsonObject json) {
+   static void toJson(TimeSeriesOptions obj, JsonObject json) {
     toJson(obj, json.getMap());
   }
 
-  public static void toJson(TimeSeriesOptions obj, java.util.Map<String, Object> json) {
+   static void toJson(TimeSeriesOptions obj, java.util.Map<String, Object> json) {
     if (obj.getTimeField() != null) {
       json.put("timeField", obj.getTimeField());
     }
diff --git a/src/main/generated/io/vertx/ext/mongo/ValidationOptionsConverter.java b/src/main/generated/io/vertx/ext/mongo/ValidationOptionsConverter.java
index 5b0d8911..a0c18d59 100644
--- a/src/main/generated/io/vertx/ext/mongo/ValidationOptionsConverter.java
+++ b/src/main/generated/io/vertx/ext/mongo/ValidationOptionsConverter.java
@@ -17,7 +17,7 @@ public class ValidationOptionsConverter {
   private static final Base64.Decoder BASE64_DECODER = JsonUtil.BASE64_DECODER;
   private static final Base64.Encoder BASE64_ENCODER = JsonUtil.BASE64_ENCODER;
 
-  public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, ValidationOptions obj) {
+   static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, ValidationOptions obj) {
     for (java.util.Map.Entry<String, Object> member : json) {
       switch (member.getKey()) {
         case "validator":
@@ -39,11 +39,11 @@ public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json,
     }
   }
 
-  public static void toJson(ValidationOptions obj, JsonObject json) {
+   static void toJson(ValidationOptions obj, JsonObject json) {
     toJson(obj, json.getMap());
   }
 
-  public static void toJson(ValidationOptions obj, java.util.Map<String, Object> json) {
+   static void toJson(ValidationOptions obj, java.util.Map<String, Object> json) {
     if (obj.getValidator() != null) {
       json.put("validator", obj.getValidator());
     }
diff --git a/src/main/java/io/vertx/ext/mongo/AggregateOptions.java b/src/main/java/io/vertx/ext/mongo/AggregateOptions.java
index 9573784e..1cf89a52 100644
--- a/src/main/java/io/vertx/ext/mongo/AggregateOptions.java
+++ b/src/main/java/io/vertx/ext/mongo/AggregateOptions.java
@@ -1,6 +1,7 @@
 package io.vertx.ext.mongo;
 
 import io.vertx.codegen.annotations.DataObject;
+import io.vertx.codegen.json.annotations.JsonGen;
 import io.vertx.core.json.JsonObject;
 
 import java.util.Objects;
@@ -10,7 +11,8 @@
  *
  * @author <a href="mailto:nscavell@redhat.com">Nick Scavelli</a>
  */
-@DataObject(generateConverter = true)
+@DataObject
+@JsonGen(publicConverter = false)
 public class AggregateOptions {
   /**
    * The default value of batchSize = 20.
diff --git a/src/main/java/io/vertx/ext/mongo/CollationOptions.java b/src/main/java/io/vertx/ext/mongo/CollationOptions.java
index 34e19193..bc80e09a 100644
--- a/src/main/java/io/vertx/ext/mongo/CollationOptions.java
+++ b/src/main/java/io/vertx/ext/mongo/CollationOptions.java
@@ -3,6 +3,7 @@
 import com.mongodb.client.model.*;
 import io.vertx.codegen.annotations.DataObject;
 import io.vertx.codegen.annotations.GenIgnore;
+import io.vertx.codegen.json.annotations.JsonGen;
 import io.vertx.core.json.JsonObject;
 
 import java.util.Objects;
@@ -12,7 +13,8 @@
  *
  * @author <a href="mailto:christoph.spoerk@gmail.com">Christoph Spörk</a>
  */
-@DataObject(generateConverter = true)
+@DataObject
+@JsonGen(publicConverter = false)
 public class CollationOptions {
   /**
    * Default locale : {@code simple}
diff --git a/src/main/java/io/vertx/ext/mongo/CountOptions.java b/src/main/java/io/vertx/ext/mongo/CountOptions.java
index dfe68867..c83f6ddc 100644
--- a/src/main/java/io/vertx/ext/mongo/CountOptions.java
+++ b/src/main/java/io/vertx/ext/mongo/CountOptions.java
@@ -2,13 +2,15 @@
 
 
 import io.vertx.codegen.annotations.DataObject;
+import io.vertx.codegen.json.annotations.JsonGen;
 import io.vertx.core.json.JsonObject;
 import io.vertx.ext.mongo.impl.JsonObjectBsonAdapter;
 
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
-@DataObject(generateConverter = true)
+@DataObject
+@JsonGen(publicConverter = false)
 public class CountOptions {
   private JsonObject hint;
   private String hintString;
diff --git a/src/main/java/io/vertx/ext/mongo/CreateCollectionOptions.java b/src/main/java/io/vertx/ext/mongo/CreateCollectionOptions.java
index 9a0182f0..76f750eb 100644
--- a/src/main/java/io/vertx/ext/mongo/CreateCollectionOptions.java
+++ b/src/main/java/io/vertx/ext/mongo/CreateCollectionOptions.java
@@ -4,6 +4,7 @@
 import com.mongodb.client.model.IndexOptionDefaults;
 import com.mongodb.lang.Nullable;
 import io.vertx.codegen.annotations.DataObject;
+import io.vertx.codegen.json.annotations.JsonGen;
 import io.vertx.core.json.JsonObject;
 
 import java.util.Objects;
@@ -12,7 +13,8 @@
 /**
  * Options for creating a collection
  */
-@DataObject(generateConverter = true)
+@DataObject
+@JsonGen(publicConverter = false)
 public class CreateCollectionOptions {
   private Long maxDocuments;
   private Boolean capped;
diff --git a/src/main/java/io/vertx/ext/mongo/DistinctOptions.java b/src/main/java/io/vertx/ext/mongo/DistinctOptions.java
index 9b55cb90..3e7b12e0 100644
--- a/src/main/java/io/vertx/ext/mongo/DistinctOptions.java
+++ b/src/main/java/io/vertx/ext/mongo/DistinctOptions.java
@@ -1,11 +1,13 @@
 package io.vertx.ext.mongo;
 
 import io.vertx.codegen.annotations.DataObject;
+import io.vertx.codegen.json.annotations.JsonGen;
 import io.vertx.core.json.JsonObject;
 
 import java.util.Objects;
 
-@DataObject(generateConverter = true)
+@DataObject
+@JsonGen(publicConverter = false)
 public class DistinctOptions {
   CollationOptions collation;
 
diff --git a/src/main/java/io/vertx/ext/mongo/FindOptions.java b/src/main/java/io/vertx/ext/mongo/FindOptions.java
index 5100c9a2..7f7d9538 100644
--- a/src/main/java/io/vertx/ext/mongo/FindOptions.java
+++ b/src/main/java/io/vertx/ext/mongo/FindOptions.java
@@ -1,6 +1,7 @@
 package io.vertx.ext.mongo;
 
 import io.vertx.codegen.annotations.DataObject;
+import io.vertx.codegen.json.annotations.JsonGen;
 import io.vertx.core.json.JsonObject;
 
 import java.util.Objects;
@@ -10,7 +11,8 @@
  *
  * @author <a href="mailto:nscavell@redhat.com">Nick Scavelli</a>
  */
-@DataObject(generateConverter = true)
+@DataObject
+@JsonGen(publicConverter = false)
 public class FindOptions {
 
   /**
diff --git a/src/main/java/io/vertx/ext/mongo/IndexModel.java b/src/main/java/io/vertx/ext/mongo/IndexModel.java
index 638e6fac..6cf3de6b 100644
--- a/src/main/java/io/vertx/ext/mongo/IndexModel.java
+++ b/src/main/java/io/vertx/ext/mongo/IndexModel.java
@@ -1,11 +1,13 @@
 package io.vertx.ext.mongo;
 
 import io.vertx.codegen.annotations.DataObject;
+import io.vertx.codegen.json.annotations.JsonGen;
 import io.vertx.core.json.JsonObject;
 
 import java.util.Objects;
 
-@DataObject(generateConverter = true)
+@DataObject
+@JsonGen(publicConverter = false)
 public class IndexModel {
   private JsonObject key;
   private IndexOptions options;
diff --git a/src/main/java/io/vertx/ext/mongo/TimeSeriesOptions.java b/src/main/java/io/vertx/ext/mongo/TimeSeriesOptions.java
index ac984c25..a985b274 100644
--- a/src/main/java/io/vertx/ext/mongo/TimeSeriesOptions.java
+++ b/src/main/java/io/vertx/ext/mongo/TimeSeriesOptions.java
@@ -1,6 +1,7 @@
 package io.vertx.ext.mongo;
 
 import io.vertx.codegen.annotations.DataObject;
+import io.vertx.codegen.json.annotations.JsonGen;
 import io.vertx.core.json.JsonObject;
 
 import java.util.Objects;
@@ -12,7 +13,8 @@
  *
  * @author <a href="mailto:mail@liuchong.io">Liu Chong</a>
  */
-@DataObject(generateConverter = true)
+@DataObject
+@JsonGen(publicConverter = false)
 public class TimeSeriesOptions {
 
   /**
diff --git a/src/main/java/io/vertx/ext/mongo/ValidationOptions.java b/src/main/java/io/vertx/ext/mongo/ValidationOptions.java
index cc0e2ef6..654fa970 100644
--- a/src/main/java/io/vertx/ext/mongo/ValidationOptions.java
+++ b/src/main/java/io/vertx/ext/mongo/ValidationOptions.java
@@ -4,11 +4,13 @@
 import com.mongodb.client.model.ValidationLevel;
 import com.mongodb.lang.Nullable;
 import io.vertx.codegen.annotations.DataObject;
+import io.vertx.codegen.json.annotations.JsonGen;
 import io.vertx.core.json.JsonObject;
 
 import java.util.Objects;
 
-@DataObject(generateConverter = true)
+@DataObject
+@JsonGen(publicConverter = false)
 public final class ValidationOptions {
   private JsonObject validator = new JsonObject();
   private ValidationLevel validationLevel;