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 cd71d83..358cd9e 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
@@ -2,7 +2,6 @@
 
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 
 import lombok.Builder;
 import lombok.NonNull;
@@ -25,9 +24,9 @@ public record DataField(
 ) implements Field {
     @Builder
     public record Validation(
-            Integer min,
-            Optional<Integer> max,
-            Optional<String> pattern
+            String min,
+            String max,
+            String pattern
     ) {}
 
     @Builder
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 c067639..5751ad5 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
@@ -1,9 +1,10 @@
 package app.quickcase.sdk.spring.definition.model;
 
 import java.util.Map;
-import java.util.Optional;
 
+import lombok.Builder;
 import lombok.NonNull;
+import lombok.Singular;
 
 public interface Field {
     @NonNull String id();
@@ -11,8 +12,10 @@ public interface Field {
     String label();
     Field.Display display();
 
-    interface Display {
-        String mode();
-        Map<String, String> parameters();
+    @Builder
+    record Display(
+            String mode,
+            @Singular Map<String, String> parameters
+    ) {
     }
 }