diff --git a/src/main/java/app/quickcase/sdk/spring/definition/model/DataField.java b/src/main/java/app/quickcase/sdk/spring/definition/model/DataField.java
index c2cde90..eb9534d 100644
--- a/src/main/java/app/quickcase/sdk/spring/definition/model/DataField.java
+++ b/src/main/java/app/quickcase/sdk/spring/definition/model/DataField.java
@@ -14,9 +14,9 @@ public record DataField(
     String label,
     String hint,
     @NonNull String type,
-    @Singular List<Option> options,
+    @Singular(ignoreNullCollections = true) List<Option> options,
     Content content,
-    @Singular Map<String, DataField> members,
+    @Singular(ignoreNullCollections = true) Map<String, DataField> members,
     Validation validation,
     Field.Display display,
     @NonNull @Singular("acl") Map<String, Integer> acl,
diff --git a/src/main/java/app/quickcase/sdk/spring/definition/model/Field.java b/src/main/java/app/quickcase/sdk/spring/definition/model/Field.java
index 5751ad5..8fcc0b9 100644
--- a/src/main/java/app/quickcase/sdk/spring/definition/model/Field.java
+++ b/src/main/java/app/quickcase/sdk/spring/definition/model/Field.java
@@ -15,7 +15,7 @@ public interface Field {
     @Builder
     record Display(
             String mode,
-            @Singular Map<String, String> parameters
+            @Singular(ignoreNullCollections = true) Map<String, String> parameters
     ) {
     }
 }
diff --git a/src/main/java/app/quickcase/sdk/spring/definition/model/MetadataField.java b/src/main/java/app/quickcase/sdk/spring/definition/model/MetadataField.java
index a7c92c9..c5da4db 100644
--- a/src/main/java/app/quickcase/sdk/spring/definition/model/MetadataField.java
+++ b/src/main/java/app/quickcase/sdk/spring/definition/model/MetadataField.java
@@ -11,7 +11,7 @@ public record MetadataField(
         @NonNull String id,
         @NonNull String name,
         String label,
-        @Singular List<MetadataField.Option> options,
+        @Singular(ignoreNullCollections = true) List<MetadataField.Option> options,
         Field.Display display
 ) implements Field{
     @Builder