diff --git a/examples/java/src/main/java/com/twilio/rest/api/v2010/Account.java b/examples/java/src/main/java/com/twilio/rest/api/v2010/Account.java
index da7b9b8c8..5d32aeecb 100644
--- a/examples/java/src/main/java/com/twilio/rest/api/v2010/Account.java
+++ b/examples/java/src/main/java/com/twilio/rest/api/v2010/Account.java
@@ -56,6 +56,7 @@
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
+import lombok.Builder;
 
 import java.util.Map;
 import java.time.LocalDate;
diff --git a/examples/java/src/main/java/com/twilio/rest/api/v2010/account/Call.java b/examples/java/src/main/java/com/twilio/rest/api/v2010/account/Call.java
index dfaddd34f..0907e575a 100644
--- a/examples/java/src/main/java/com/twilio/rest/api/v2010/account/Call.java
+++ b/examples/java/src/main/java/com/twilio/rest/api/v2010/account/Call.java
@@ -56,6 +56,7 @@
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
+import lombok.Builder;
 
 import java.util.Map;
 import java.time.LocalDate;
diff --git a/examples/java/src/main/java/com/twilio/rest/api/v2010/account/call/FeedbackCallSummary.java b/examples/java/src/main/java/com/twilio/rest/api/v2010/account/call/FeedbackCallSummary.java
index 7ca21c42f..ee81074cc 100644
--- a/examples/java/src/main/java/com/twilio/rest/api/v2010/account/call/FeedbackCallSummary.java
+++ b/examples/java/src/main/java/com/twilio/rest/api/v2010/account/call/FeedbackCallSummary.java
@@ -56,6 +56,7 @@
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
+import lombok.Builder;
 
 import java.util.Map;
 import java.time.LocalDate;
diff --git a/examples/java/src/main/java/com/twilio/rest/flexapi/v1/Call.java b/examples/java/src/main/java/com/twilio/rest/flexapi/v1/Call.java
index 71e9bf277..f959be5f6 100644
--- a/examples/java/src/main/java/com/twilio/rest/flexapi/v1/Call.java
+++ b/examples/java/src/main/java/com/twilio/rest/flexapi/v1/Call.java
@@ -56,6 +56,7 @@
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
+import lombok.Builder;
 
 import java.util.Map;
 import java.time.LocalDate;
diff --git a/examples/java/src/main/java/com/twilio/rest/flexapi/v1/credential/Aws.java b/examples/java/src/main/java/com/twilio/rest/flexapi/v1/credential/Aws.java
index b5cf0affe..933b784e2 100644
--- a/examples/java/src/main/java/com/twilio/rest/flexapi/v1/credential/Aws.java
+++ b/examples/java/src/main/java/com/twilio/rest/flexapi/v1/credential/Aws.java
@@ -56,6 +56,7 @@
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
+import lombok.Builder;
 
 import java.util.Map;
 import java.time.LocalDate;
diff --git a/examples/java/src/main/java/com/twilio/rest/flexapi/v1/credential/NewCredentials.java b/examples/java/src/main/java/com/twilio/rest/flexapi/v1/credential/NewCredentials.java
index 6960b5343..a532cb593 100644
--- a/examples/java/src/main/java/com/twilio/rest/flexapi/v1/credential/NewCredentials.java
+++ b/examples/java/src/main/java/com/twilio/rest/flexapi/v1/credential/NewCredentials.java
@@ -56,6 +56,7 @@
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
+import lombok.Builder;
 
 import java.util.Map;
 import java.time.LocalDate;
diff --git a/examples/java/src/main/java/com/twilio/rest/flexapi/v1/credential/aws/History.java b/examples/java/src/main/java/com/twilio/rest/flexapi/v1/credential/aws/History.java
index 53944a7a6..f7be42d4c 100644
--- a/examples/java/src/main/java/com/twilio/rest/flexapi/v1/credential/aws/History.java
+++ b/examples/java/src/main/java/com/twilio/rest/flexapi/v1/credential/aws/History.java
@@ -56,6 +56,7 @@
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
+import lombok.Builder;
 
 import java.util.Map;
 import java.time.LocalDate;
diff --git a/examples/java/src/main/java/com/twilio/rest/previewiam/organizations/User.java b/examples/java/src/main/java/com/twilio/rest/previewiam/organizations/User.java
index d18a27e28..95f6a247c 100644
--- a/examples/java/src/main/java/com/twilio/rest/previewiam/organizations/User.java
+++ b/examples/java/src/main/java/com/twilio/rest/previewiam/organizations/User.java
@@ -56,6 +56,7 @@
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
+import lombok.Builder;
 
 import java.util.Map;
 import java.time.LocalDate;
@@ -81,14 +82,15 @@ public class User extends Resource {
 
     
         @ToString
+        @Builder
         static public class ScimName {
             @JsonInclude(JsonInclude.Include.NON_EMPTY)
             @JsonProperty("givenName")
-            @Getter @Setter private String givenName;
+            private String givenName;
 
             @JsonInclude(JsonInclude.Include.NON_EMPTY)
             @JsonProperty("familyName")
-            @Getter @Setter private String familyName;
+            private String familyName;
 
 
             public static ScimName fromJson(String jsonString, ObjectMapper mapper) throws IOException {
@@ -96,18 +98,19 @@ public static ScimName fromJson(String jsonString, ObjectMapper mapper) throws I
             }
         }
         @ToString
+        @Builder
         static public class ScimEmailAddress {
             @JsonInclude(JsonInclude.Include.NON_EMPTY)
             @JsonProperty("primary")
-            @Getter @Setter private Boolean primary;
+            private Boolean primary;
 
             @JsonInclude(JsonInclude.Include.NON_EMPTY)
             @JsonProperty("value")
-            @Getter @Setter private String value;
+            private String value;
 
             @JsonInclude(JsonInclude.Include.NON_EMPTY)
             @JsonProperty("type")
-            @Getter @Setter private String type;
+            private String type;
 
 
             public static ScimEmailAddress fromJson(String jsonString, ObjectMapper mapper) throws IOException {
@@ -115,26 +118,27 @@ public static ScimEmailAddress fromJson(String jsonString, ObjectMapper mapper)
             }
         }
         @ToString
+        @Builder
         static public class ScimMeta {
             @JsonInclude(JsonInclude.Include.NON_EMPTY)
             @JsonProperty("resourceType")
-            @Getter @Setter private String resourceType;
+            private String resourceType;
 
             @JsonInclude(JsonInclude.Include.NON_EMPTY)
             @JsonProperty("created")
-            @Getter @Setter private ZonedDateTime created;
+            private ZonedDateTime created;
             public String getCreated() {
                 return created.toInstant().toString();
             }
             @JsonInclude(JsonInclude.Include.NON_EMPTY)
             @JsonProperty("lastModified")
-            @Getter @Setter private ZonedDateTime lastModified;
+            private ZonedDateTime lastModified;
             public String getLastModified() {
                 return lastModified.toInstant().toString();
             }
             @JsonInclude(JsonInclude.Include.NON_EMPTY)
             @JsonProperty("version")
-            @Getter @Setter private String version;
+            private String version;
 
 
             public static ScimMeta fromJson(String jsonString, ObjectMapper mapper) throws IOException {
@@ -142,54 +146,52 @@ public static ScimMeta fromJson(String jsonString, ObjectMapper mapper) throws I
             }
         }
         @ToString
+        @Builder
         static public class ScimUser {
             @JsonInclude(JsonInclude.Include.NON_EMPTY)
             @JsonProperty("id")
-            @Getter @Setter private String id;
+            private String id;
 
             @JsonInclude(JsonInclude.Include.NON_EMPTY)
             @JsonProperty("externalId")
-            @Getter @Setter private String externalId;
+            private String externalId;
 
             @JsonInclude(JsonInclude.Include.NON_EMPTY)
             @JsonProperty("userName")
-            @Getter @Setter private String userName;
+            private String userName;
 
             @JsonInclude(JsonInclude.Include.NON_EMPTY)
             @JsonProperty("displayName")
-            @Getter @Setter private String displayName;
+            private String displayName;
 
             @JsonInclude(JsonInclude.Include.NON_EMPTY)
             @JsonProperty("name")
-            @Getter @Setter private ScimName name;
+            private ScimName name;
 
             @JsonInclude(JsonInclude.Include.NON_EMPTY)
             @JsonProperty("emails")
-            @Getter @Setter private List<ScimEmailAddress> emails;
+            private List<ScimEmailAddress> emails;
 
             @JsonInclude(JsonInclude.Include.NON_EMPTY)
             @JsonProperty("active")
-            @Getter @Setter private Boolean active;
+            private Boolean active;
 
             @JsonInclude(JsonInclude.Include.NON_EMPTY)
             @JsonProperty("locale")
-            @Getter @Setter private String locale;
+            private String locale;
 
             @JsonInclude(JsonInclude.Include.NON_EMPTY)
             @JsonProperty("timezone")
-            @Getter @Setter private String timezone;
+            private String timezone;
 
             @JsonInclude(JsonInclude.Include.NON_EMPTY)
             @JsonProperty("schemas")
-            @Getter @Setter private List<String> schemas;
+            private List<String> schemas;
 
             @JsonInclude(JsonInclude.Include.NON_EMPTY)
             @JsonProperty("meta")
-            @Getter @Setter private ScimMeta meta;
+            private ScimMeta meta;
 
-            public ScimUser(final String userName ) {
-                this.userName = userName;
-            }
 
             public static ScimUser fromJson(String jsonString, ObjectMapper mapper) throws IOException {
                 return mapper.readValue(jsonString, ScimUser.class);
diff --git a/examples/java/src/main/java/com/twilio/rest/previewiam/v1/Token.java b/examples/java/src/main/java/com/twilio/rest/previewiam/v1/Token.java
index 17b8ef4d7..05bd1d80a 100644
--- a/examples/java/src/main/java/com/twilio/rest/previewiam/v1/Token.java
+++ b/examples/java/src/main/java/com/twilio/rest/previewiam/v1/Token.java
@@ -56,6 +56,7 @@
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
+import lombok.Builder;
 
 import java.util.Map;
 import java.time.LocalDate;
diff --git a/examples/java/src/main/java/com/twilio/rest/versionless/deployedDevices/Fleet.java b/examples/java/src/main/java/com/twilio/rest/versionless/deployedDevices/Fleet.java
index 92e6315ab..b4ab1084c 100644
--- a/examples/java/src/main/java/com/twilio/rest/versionless/deployedDevices/Fleet.java
+++ b/examples/java/src/main/java/com/twilio/rest/versionless/deployedDevices/Fleet.java
@@ -56,6 +56,7 @@
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
+import lombok.Builder;
 
 import java.util.Map;
 import java.time.LocalDate;
diff --git a/examples/java/src/main/java/com/twilio/rest/versionless/understand/Assistant.java b/examples/java/src/main/java/com/twilio/rest/versionless/understand/Assistant.java
index 011b6a32c..baac50e80 100644
--- a/examples/java/src/main/java/com/twilio/rest/versionless/understand/Assistant.java
+++ b/examples/java/src/main/java/com/twilio/rest/versionless/understand/Assistant.java
@@ -56,6 +56,7 @@
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
+import lombok.Builder;
 
 import java.util.Map;
 import java.time.LocalDate;
diff --git a/src/main/resources/twilio-java/api.mustache b/src/main/resources/twilio-java/api.mustache
index deaa723ed..5e08177d2 100644
--- a/src/main/resources/twilio-java/api.mustache
+++ b/src/main/resources/twilio-java/api.mustache
@@ -46,6 +46,7 @@ import java.util.Objects;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
+import lombok.Builder;
 
 import java.util.Map;
 import java.time.LocalDate;
diff --git a/src/main/resources/twilio-java/models.mustache b/src/main/resources/twilio-java/models.mustache
index 3464c6fcb..b4ce4bbfe 100644
--- a/src/main/resources/twilio-java/models.mustache
+++ b/src/main/resources/twilio-java/models.mustache
@@ -1,11 +1,12 @@
 
         {{#resources.nestedModels}}
         @ToString
+        @Builder
         static public class {{classname}} {
         {{#vars}}
             @JsonInclude(JsonInclude.Include.NON_EMPTY)
             @JsonProperty("{{{baseName}}}")
-            @Getter @Setter private {{{dataType}}} {{name}};
+            private {{{dataType}}} {{name}};
             {{^isMap}}
             {{#vendorExtensions.x-serialize}}
             public String get{{#lambda.titlecase}}{{name}}{{/lambda.titlecase}}() {
@@ -13,15 +14,6 @@
             }{{/vendorExtensions.x-serialize}}
             {{/isMap}}
         {{/vars}}
-        {{#vendorExtensions.x-constructor-required}}
-        {{#modelParameters}}
-            public {{classname}}({{#.}}final {{{dataType}}} {{name}}{{^-last}}, {{/-last}}{{/.}} ) {
-                {{#.}}
-                this.{{name}} = {{name}};
-                {{/.}}
-            }
-            {{/modelParameters}}
-            {{/vendorExtensions.x-constructor-required}}
 
             {{^vendorExtensions.x-response}}
             public static {{classname}} fromJson(String jsonString, ObjectMapper mapper) throws IOException {
@@ -29,4 +21,4 @@
             }
             {{/vendorExtensions.x-response}}
         }
-    {{/resources.nestedModels}}
\ No newline at end of file
+    {{/resources.nestedModels}}