diff --git a/examples/AccountCreateExample.java b/examples/AccountCreateExample.java
index a9b8c52d2..2743ffa13 100644
--- a/examples/AccountCreateExample.java
+++ b/examples/AccountCreateExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class AccountCreateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var accountCreateRequest = new AccountCreateRequest();
         accountCreateRequest.emailAddress("newuser@dropboxsign.com");
diff --git a/examples/AccountCreateExample.ts b/examples/AccountCreateExample.ts
index f5b490085..bf8570a02 100644
--- a/examples/AccountCreateExample.ts
+++ b/examples/AccountCreateExample.ts
@@ -6,8 +6,9 @@ const apiCaller = new api.AccountApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const accountCreateRequest = new models.AccountCreateRequest();
-accountCreateRequest.emailAddress = "newuser@dropboxsign.com";
+const accountCreateRequest: models.AccountCreateRequest = {
+  emailAddress: "newuser@dropboxsign.com",
+};
 
 apiCaller.accountCreate(
   accountCreateRequest,
diff --git a/examples/AccountCreateOauthExample.java b/examples/AccountCreateOauthExample.java
index 5cfc13531..e6ae95b94 100644
--- a/examples/AccountCreateOauthExample.java
+++ b/examples/AccountCreateOauthExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class AccountCreateOauthExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var accountCreateRequest = new AccountCreateRequest();
         accountCreateRequest.emailAddress("newuser@dropboxsign.com");
diff --git a/examples/AccountCreateOauthExample.ts b/examples/AccountCreateOauthExample.ts
index 0554d4d79..d77c2e560 100644
--- a/examples/AccountCreateOauthExample.ts
+++ b/examples/AccountCreateOauthExample.ts
@@ -6,10 +6,11 @@ const apiCaller = new api.AccountApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const accountCreateRequest = new models.AccountCreateRequest();
-accountCreateRequest.emailAddress = "newuser@dropboxsign.com";
-accountCreateRequest.clientId = "cc91c61d00f8bb2ece1428035716b";
-accountCreateRequest.clientSecret = "1d14434088507ffa390e6f5528465";
+const accountCreateRequest: models.AccountCreateRequest = {
+  emailAddress: "newuser@dropboxsign.com",
+  clientId: "cc91c61d00f8bb2ece1428035716b",
+  clientSecret: "1d14434088507ffa390e6f5528465",
+};
 
 apiCaller.accountCreate(
   accountCreateRequest,
diff --git a/examples/AccountGetExample.java b/examples/AccountGetExample.java
index 3a90b0375..b1f712ace 100644
--- a/examples/AccountGetExample.java
+++ b/examples/AccountGetExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,12 +20,15 @@ public class AccountGetExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
-            var response = new AccountApi(config).accountGet();
+            var response = new AccountApi(config).accountGet(
+                null, // accountId
+                null // emailAddress
+            );
 
             System.out.println(response);
         } catch (ApiException e) {
diff --git a/examples/AccountUpdateExample.java b/examples/AccountUpdateExample.java
index ac9c0d227..c1d2f1ca2 100644
--- a/examples/AccountUpdateExample.java
+++ b/examples/AccountUpdateExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class AccountUpdateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var accountUpdateRequest = new AccountUpdateRequest();
         accountUpdateRequest.callbackUrl("https://www.example.com/callback");
diff --git a/examples/AccountUpdateExample.ts b/examples/AccountUpdateExample.ts
index 8a546ee0e..3f86ffea0 100644
--- a/examples/AccountUpdateExample.ts
+++ b/examples/AccountUpdateExample.ts
@@ -6,9 +6,10 @@ const apiCaller = new api.AccountApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const accountUpdateRequest = new models.AccountUpdateRequest();
-accountUpdateRequest.callbackUrl = "https://www.example.com/callback";
-accountUpdateRequest.locale = "en-US";
+const accountUpdateRequest: models.AccountUpdateRequest = {
+  callbackUrl: "https://www.example.com/callback",
+  locale: "en-US",
+};
 
 apiCaller.accountUpdate(
   accountUpdateRequest,
diff --git a/examples/AccountVerifyExample.java b/examples/AccountVerifyExample.java
index 6d6f22f72..5180f6772 100644
--- a/examples/AccountVerifyExample.java
+++ b/examples/AccountVerifyExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class AccountVerifyExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var accountVerifyRequest = new AccountVerifyRequest();
         accountVerifyRequest.emailAddress("some_user@dropboxsign.com");
diff --git a/examples/AccountVerifyExample.ts b/examples/AccountVerifyExample.ts
index 417ffce6d..8b79bdf00 100644
--- a/examples/AccountVerifyExample.ts
+++ b/examples/AccountVerifyExample.ts
@@ -6,8 +6,9 @@ const apiCaller = new api.AccountApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const accountVerifyRequest = new models.AccountVerifyRequest();
-accountVerifyRequest.emailAddress = "some_user@dropboxsign.com";
+const accountVerifyRequest: models.AccountVerifyRequest = {
+  emailAddress: "some_user@dropboxsign.com",
+};
 
 apiCaller.accountVerify(
   accountVerifyRequest,
diff --git a/examples/ApiAppCreateExample.java b/examples/ApiAppCreateExample.java
index 9422376ae..2d81a97b1 100644
--- a/examples/ApiAppCreateExample.java
+++ b/examples/ApiAppCreateExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class ApiAppCreateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var oauth = new SubOAuth();
         oauth.callbackUrl("https://example.com/oauth");
diff --git a/examples/ApiAppCreateExample.ts b/examples/ApiAppCreateExample.ts
index be9234816..82890bf18 100644
--- a/examples/ApiAppCreateExample.ts
+++ b/examples/ApiAppCreateExample.ts
@@ -6,25 +6,28 @@ const apiCaller = new api.ApiAppApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const oauth = new models.SubOAuth();
-oauth.callbackUrl = "https://example.com/oauth";
-oauth.scopes = [
-  models.SubOAuth.ScopesEnum.BasicAccountInfo,
-  models.SubOAuth.ScopesEnum.RequestSignature,
-];
+const oauth: models.SubOAuth = {
+  callbackUrl: "https://example.com/oauth",
+  scopes: [
+    models.SubOAuth.ScopesEnum.BasicAccountInfo,
+    models.SubOAuth.ScopesEnum.RequestSignature,
+  ],
+};
 
-const whiteLabelingOptions = new models.SubWhiteLabelingOptions();
-whiteLabelingOptions.primaryButtonColor = "#00b3e6";
-whiteLabelingOptions.primaryButtonTextColor = "#ffffff";
+const whiteLabelingOptions: models.SubWhiteLabelingOptions = {
+  primaryButtonColor: "#00b3e6",
+  primaryButtonTextColor: "#ffffff",
+};
 
-const apiAppCreateRequest = new models.ApiAppCreateRequest();
-apiAppCreateRequest.name = "My Production App";
-apiAppCreateRequest.domains = [
-  "example.com",
-];
-apiAppCreateRequest.customLogoFile = fs.createReadStream("CustomLogoFile.png");
-apiAppCreateRequest.oauth = oauth;
-apiAppCreateRequest.whiteLabelingOptions = whiteLabelingOptions;
+const apiAppCreateRequest: models.ApiAppCreateRequest = {
+  name: "My Production App",
+  domains: [
+    "example.com",
+  ],
+  customLogoFile: fs.createReadStream("CustomLogoFile.png"),
+  oauth: oauth,
+  whiteLabelingOptions: whiteLabelingOptions,
+};
 
 apiCaller.apiAppCreate(
   apiAppCreateRequest,
diff --git a/examples/ApiAppDeleteExample.java b/examples/ApiAppDeleteExample.java
index f9f7c5c9f..aa23b5f0c 100644
--- a/examples/ApiAppDeleteExample.java
+++ b/examples/ApiAppDeleteExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class ApiAppDeleteExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
diff --git a/examples/ApiAppGetExample.java b/examples/ApiAppGetExample.java
index 6a8330449..6ad075b4b 100644
--- a/examples/ApiAppGetExample.java
+++ b/examples/ApiAppGetExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class ApiAppGetExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
diff --git a/examples/ApiAppListExample.java b/examples/ApiAppListExample.java
index 5f023c890..073756800 100644
--- a/examples/ApiAppListExample.java
+++ b/examples/ApiAppListExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class ApiAppListExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
diff --git a/examples/ApiAppUpdateExample.java b/examples/ApiAppUpdateExample.java
index 19eb17192..ee6290b5e 100644
--- a/examples/ApiAppUpdateExample.java
+++ b/examples/ApiAppUpdateExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class ApiAppUpdateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var oauth = new SubOAuth();
         oauth.callbackUrl("https://example.com/oauth");
diff --git a/examples/ApiAppUpdateExample.ts b/examples/ApiAppUpdateExample.ts
index fa8937223..0331942c0 100644
--- a/examples/ApiAppUpdateExample.ts
+++ b/examples/ApiAppUpdateExample.ts
@@ -6,26 +6,29 @@ const apiCaller = new api.ApiAppApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const oauth = new models.SubOAuth();
-oauth.callbackUrl = "https://example.com/oauth";
-oauth.scopes = [
-  models.SubOAuth.ScopesEnum.BasicAccountInfo,
-  models.SubOAuth.ScopesEnum.RequestSignature,
-];
+const oauth: models.SubOAuth = {
+  callbackUrl: "https://example.com/oauth",
+  scopes: [
+    models.SubOAuth.ScopesEnum.BasicAccountInfo,
+    models.SubOAuth.ScopesEnum.RequestSignature,
+  ],
+};
 
-const whiteLabelingOptions = new models.SubWhiteLabelingOptions();
-whiteLabelingOptions.primaryButtonColor = "#00b3e6";
-whiteLabelingOptions.primaryButtonTextColor = "#ffffff";
+const whiteLabelingOptions: models.SubWhiteLabelingOptions = {
+  primaryButtonColor: "#00b3e6",
+  primaryButtonTextColor: "#ffffff",
+};
 
-const apiAppUpdateRequest = new models.ApiAppUpdateRequest();
-apiAppUpdateRequest.callbackUrl = "https://example.com/dropboxsign";
-apiAppUpdateRequest.name = "New Name";
-apiAppUpdateRequest.domains = [
-  "example.com",
-];
-apiAppUpdateRequest.customLogoFile = fs.createReadStream("CustomLogoFile.png");
-apiAppUpdateRequest.oauth = oauth;
-apiAppUpdateRequest.whiteLabelingOptions = whiteLabelingOptions;
+const apiAppUpdateRequest: models.ApiAppUpdateRequest = {
+  callbackUrl: "https://example.com/dropboxsign",
+  name: "New Name",
+  domains: [
+    "example.com",
+  ],
+  customLogoFile: fs.createReadStream("CustomLogoFile.png"),
+  oauth: oauth,
+  whiteLabelingOptions: whiteLabelingOptions,
+};
 
 apiCaller.apiAppUpdate(
   "0dd3b823a682527788c4e40cb7b6f7e9", // clientId
diff --git a/examples/BulkSendJobGetExample.java b/examples/BulkSendJobGetExample.java
index a90b43560..da4680b15 100644
--- a/examples/BulkSendJobGetExample.java
+++ b/examples/BulkSendJobGetExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class BulkSendJobGetExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
diff --git a/examples/BulkSendJobListExample.java b/examples/BulkSendJobListExample.java
index fc5d223e3..9c9b835e5 100644
--- a/examples/BulkSendJobListExample.java
+++ b/examples/BulkSendJobListExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class BulkSendJobListExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
diff --git a/examples/EmbeddedEditUrlExample.java b/examples/EmbeddedEditUrlExample.java
index 81139263b..a1097bd5c 100644
--- a/examples/EmbeddedEditUrlExample.java
+++ b/examples/EmbeddedEditUrlExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class EmbeddedEditUrlExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var mergeFields = new ArrayList<SubMergeField>(List.of ());
 
diff --git a/examples/EmbeddedEditUrlExample.ts b/examples/EmbeddedEditUrlExample.ts
index bca3980cf..cdfa90b80 100644
--- a/examples/EmbeddedEditUrlExample.ts
+++ b/examples/EmbeddedEditUrlExample.ts
@@ -9,11 +9,12 @@ apiCaller.username = "YOUR_API_KEY";
 const mergeFields = [
 ];
 
-const embeddedEditUrlRequest = new models.EmbeddedEditUrlRequest();
-embeddedEditUrlRequest.ccRoles = [
-  "",
-];
-embeddedEditUrlRequest.mergeFields = mergeFields;
+const embeddedEditUrlRequest: models.EmbeddedEditUrlRequest = {
+  ccRoles: [
+    "",
+  ],
+  mergeFields: mergeFields,
+};
 
 apiCaller.embeddedEditUrl(
   "f57db65d3f933b5316d398057a36176831451a35", // templateId
diff --git a/examples/EmbeddedSignUrlExample.java b/examples/EmbeddedSignUrlExample.java
index 8b58ba353..45b7f5040 100644
--- a/examples/EmbeddedSignUrlExample.java
+++ b/examples/EmbeddedSignUrlExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class EmbeddedSignUrlExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
diff --git a/examples/FaxDeleteExample.java b/examples/FaxDeleteExample.java
index ac5fc888d..f31f0ea99 100644
--- a/examples/FaxDeleteExample.java
+++ b/examples/FaxDeleteExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,7 +20,7 @@ public class FaxDeleteExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
 
         try
         {
diff --git a/examples/FaxFilesExample.java b/examples/FaxFilesExample.java
index 1d2e62fac..a9e1f1728 100644
--- a/examples/FaxFilesExample.java
+++ b/examples/FaxFilesExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,7 +20,7 @@ public class FaxFilesExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
 
         try
         {
diff --git a/examples/FaxGetExample.java b/examples/FaxGetExample.java
index 3db05bd4b..1500980aa 100644
--- a/examples/FaxGetExample.java
+++ b/examples/FaxGetExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,7 +20,7 @@ public class FaxGetExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
 
         try
         {
diff --git a/examples/FaxLineAddUserExample.java b/examples/FaxLineAddUserExample.java
index f3883223f..d18bd73f6 100644
--- a/examples/FaxLineAddUserExample.java
+++ b/examples/FaxLineAddUserExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,7 +20,7 @@ public class FaxLineAddUserExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
 
         var faxLineAddUserRequest = new FaxLineAddUserRequest();
         faxLineAddUserRequest.number("[FAX_NUMBER]");
diff --git a/examples/FaxLineAddUserExample.ts b/examples/FaxLineAddUserExample.ts
index 468fe36a6..07d056914 100644
--- a/examples/FaxLineAddUserExample.ts
+++ b/examples/FaxLineAddUserExample.ts
@@ -5,9 +5,10 @@ import models from "@dropbox/sign"
 const apiCaller = new api.FaxLineApi();
 apiCaller.username = "YOUR_API_KEY";
 
-const faxLineAddUserRequest = new models.FaxLineAddUserRequest();
-faxLineAddUserRequest.number = "[FAX_NUMBER]";
-faxLineAddUserRequest.emailAddress = "member@dropboxsign.com";
+const faxLineAddUserRequest: models.FaxLineAddUserRequest = {
+  number: "[FAX_NUMBER]",
+  emailAddress: "member@dropboxsign.com",
+};
 
 apiCaller.faxLineAddUser(
   faxLineAddUserRequest,
diff --git a/examples/FaxLineAreaCodeGetExample.cs b/examples/FaxLineAreaCodeGetExample.cs
index b2b60876b..403591924 100644
--- a/examples/FaxLineAreaCodeGetExample.cs
+++ b/examples/FaxLineAreaCodeGetExample.cs
@@ -19,10 +19,7 @@ public static void Run()
         try
         {
             var response = new FaxLineApi(config).FaxLineAreaCodeGet(
-                country: "US",
-                state: null,
-                province: null,
-                city: null
+                country: "US"
             );
 
             Console.WriteLine(response);
diff --git a/examples/FaxLineAreaCodeGetExample.java b/examples/FaxLineAreaCodeGetExample.java
index 0f2055863..57d64b40b 100644
--- a/examples/FaxLineAreaCodeGetExample.java
+++ b/examples/FaxLineAreaCodeGetExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,7 +20,7 @@ public class FaxLineAreaCodeGetExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
 
         try
         {
diff --git a/examples/FaxLineAreaCodeGetExample.php b/examples/FaxLineAreaCodeGetExample.php
index dfd46d313..f8d4e717c 100644
--- a/examples/FaxLineAreaCodeGetExample.php
+++ b/examples/FaxLineAreaCodeGetExample.php
@@ -13,9 +13,6 @@
 try {
     $response = (new Dropbox\Sign\Api\FaxLineApi(config: $config))->faxLineAreaCodeGet(
         country: "US",
-        state: null,
-        province: null,
-        city: null,
     );
 
     print_r($response);
diff --git a/examples/FaxLineAreaCodeGetExample.py b/examples/FaxLineAreaCodeGetExample.py
index a2752d8d6..52310c75a 100644
--- a/examples/FaxLineAreaCodeGetExample.py
+++ b/examples/FaxLineAreaCodeGetExample.py
@@ -12,9 +12,6 @@
     try:
         response = api.FaxLineApi(api_client).fax_line_area_code_get(
             country="US",
-            state=None,
-            province=None,
-            city=None,
         )
 
         pprint(response)
diff --git a/examples/FaxLineCreateExample.java b/examples/FaxLineCreateExample.java
index d1a1fa689..1c765fc97 100644
--- a/examples/FaxLineCreateExample.java
+++ b/examples/FaxLineCreateExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,7 +20,7 @@ public class FaxLineCreateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
 
         var faxLineCreateRequest = new FaxLineCreateRequest();
         faxLineCreateRequest.areaCode(209);
diff --git a/examples/FaxLineCreateExample.ts b/examples/FaxLineCreateExample.ts
index b9398b2fa..5f1f5e2fd 100644
--- a/examples/FaxLineCreateExample.ts
+++ b/examples/FaxLineCreateExample.ts
@@ -5,9 +5,10 @@ import models from "@dropbox/sign"
 const apiCaller = new api.FaxLineApi();
 apiCaller.username = "YOUR_API_KEY";
 
-const faxLineCreateRequest = new models.FaxLineCreateRequest();
-faxLineCreateRequest.areaCode = 209;
-faxLineCreateRequest.country = models.FaxLineCreateRequest.CountryEnum.Us;
+const faxLineCreateRequest: models.FaxLineCreateRequest = {
+  areaCode: 209,
+  country: models.FaxLineCreateRequest.CountryEnum.Us,
+};
 
 apiCaller.faxLineCreate(
   faxLineCreateRequest,
diff --git a/examples/FaxLineDeleteExample.java b/examples/FaxLineDeleteExample.java
index 348833fba..8516f8f63 100644
--- a/examples/FaxLineDeleteExample.java
+++ b/examples/FaxLineDeleteExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,7 +20,7 @@ public class FaxLineDeleteExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
 
         var faxLineDeleteRequest = new FaxLineDeleteRequest();
         faxLineDeleteRequest.number("[FAX_NUMBER]");
diff --git a/examples/FaxLineDeleteExample.ts b/examples/FaxLineDeleteExample.ts
index 72b2279a3..834fe8a96 100644
--- a/examples/FaxLineDeleteExample.ts
+++ b/examples/FaxLineDeleteExample.ts
@@ -5,8 +5,9 @@ import models from "@dropbox/sign"
 const apiCaller = new api.FaxLineApi();
 apiCaller.username = "YOUR_API_KEY";
 
-const faxLineDeleteRequest = new models.FaxLineDeleteRequest();
-faxLineDeleteRequest.number = "[FAX_NUMBER]";
+const faxLineDeleteRequest: models.FaxLineDeleteRequest = {
+  number: "[FAX_NUMBER]",
+};
 
 apiCaller.faxLineDelete(
   faxLineDeleteRequest,
diff --git a/examples/FaxLineGetExample.java b/examples/FaxLineGetExample.java
index 8f9cd3169..5784253bb 100644
--- a/examples/FaxLineGetExample.java
+++ b/examples/FaxLineGetExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,7 +20,7 @@ public class FaxLineGetExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
 
         try
         {
diff --git a/examples/FaxLineListExample.cs b/examples/FaxLineListExample.cs
index cbd75903e..278eeea74 100644
--- a/examples/FaxLineListExample.cs
+++ b/examples/FaxLineListExample.cs
@@ -21,8 +21,7 @@ public static void Run()
             var response = new FaxLineApi(config).FaxLineList(
                 accountId: "ab55cd14a97219e36b5ff5fe23f2f9329b0c1e97",
                 page: 1,
-                pageSize: 20,
-                showTeamLines: null
+                pageSize: 20
             );
 
             Console.WriteLine(response);
diff --git a/examples/FaxLineListExample.java b/examples/FaxLineListExample.java
index 7ce8cf1cf..0facd7cfe 100644
--- a/examples/FaxLineListExample.java
+++ b/examples/FaxLineListExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,7 +20,7 @@ public class FaxLineListExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
 
         try
         {
diff --git a/examples/FaxLineListExample.php b/examples/FaxLineListExample.php
index 995c0d949..c759934e9 100644
--- a/examples/FaxLineListExample.php
+++ b/examples/FaxLineListExample.php
@@ -15,7 +15,6 @@
         account_id: "ab55cd14a97219e36b5ff5fe23f2f9329b0c1e97",
         page: 1,
         page_size: 20,
-        show_team_lines: null,
     );
 
     print_r($response);
diff --git a/examples/FaxLineListExample.py b/examples/FaxLineListExample.py
index 4af3f4a56..5e3822e75 100644
--- a/examples/FaxLineListExample.py
+++ b/examples/FaxLineListExample.py
@@ -14,7 +14,6 @@
             account_id="ab55cd14a97219e36b5ff5fe23f2f9329b0c1e97",
             page=1,
             page_size=20,
-            show_team_lines=None,
         )
 
         pprint(response)
diff --git a/examples/FaxLineRemoveUserExample.java b/examples/FaxLineRemoveUserExample.java
index 568d08d5d..f815f362b 100644
--- a/examples/FaxLineRemoveUserExample.java
+++ b/examples/FaxLineRemoveUserExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,7 +20,7 @@ public class FaxLineRemoveUserExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
 
         var faxLineRemoveUserRequest = new FaxLineRemoveUserRequest();
         faxLineRemoveUserRequest.number("[FAX_NUMBER]");
diff --git a/examples/FaxLineRemoveUserExample.ts b/examples/FaxLineRemoveUserExample.ts
index e73b8c7c5..6daea08ee 100644
--- a/examples/FaxLineRemoveUserExample.ts
+++ b/examples/FaxLineRemoveUserExample.ts
@@ -5,9 +5,10 @@ import models from "@dropbox/sign"
 const apiCaller = new api.FaxLineApi();
 apiCaller.username = "YOUR_API_KEY";
 
-const faxLineRemoveUserRequest = new models.FaxLineRemoveUserRequest();
-faxLineRemoveUserRequest.number = "[FAX_NUMBER]";
-faxLineRemoveUserRequest.emailAddress = "member@dropboxsign.com";
+const faxLineRemoveUserRequest: models.FaxLineRemoveUserRequest = {
+  number: "[FAX_NUMBER]",
+  emailAddress: "member@dropboxsign.com",
+};
 
 apiCaller.faxLineRemoveUser(
   faxLineRemoveUserRequest,
diff --git a/examples/FaxListExample.java b/examples/FaxListExample.java
index 1ca7c0a54..c44f536b9 100644
--- a/examples/FaxListExample.java
+++ b/examples/FaxListExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,7 +20,7 @@ public class FaxListExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
 
         try
         {
diff --git a/examples/FaxSendExample.java b/examples/FaxSendExample.java
index 62696b80d..9648b871a 100644
--- a/examples/FaxSendExample.java
+++ b/examples/FaxSendExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,7 +20,7 @@ public class FaxSendExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
 
         var faxSendRequest = new FaxSendRequest();
         faxSendRequest.recipient("16690000001");
diff --git a/examples/FaxSendExample.ts b/examples/FaxSendExample.ts
index 0b39faee5..190caf070 100644
--- a/examples/FaxSendExample.ts
+++ b/examples/FaxSendExample.ts
@@ -5,17 +5,18 @@ import models from "@dropbox/sign"
 const apiCaller = new api.FaxApi();
 apiCaller.username = "YOUR_API_KEY";
 
-const faxSendRequest = new models.FaxSendRequest();
-faxSendRequest.recipient = "16690000001";
-faxSendRequest.sender = "16690000000";
-faxSendRequest.testMode = true;
-faxSendRequest.coverPageTo = "Jill Fax";
-faxSendRequest.coverPageFrom = "Faxer Faxerson";
-faxSendRequest.coverPageMessage = "I'm sending you a fax!";
-faxSendRequest.title = "This is what the fax is about!";
-faxSendRequest.files = [
-  fs.createReadStream("./example_fax.pdf"),
-];
+const faxSendRequest: models.FaxSendRequest = {
+  recipient: "16690000001",
+  sender: "16690000000",
+  testMode: true,
+  coverPageTo: "Jill Fax",
+  coverPageFrom: "Faxer Faxerson",
+  coverPageMessage: "I'm sending you a fax!",
+  title: "This is what the fax is about!",
+  files: [
+    fs.createReadStream("./example_fax.pdf"),
+  ],
+};
 
 apiCaller.faxSend(
   faxSendRequest,
diff --git a/examples/OauthTokenGenerateExample.java b/examples/OauthTokenGenerateExample.java
index 7c51af01f..24bbb65c6 100644
--- a/examples/OauthTokenGenerateExample.java
+++ b/examples/OauthTokenGenerateExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
diff --git a/examples/OauthTokenGenerateExample.ts b/examples/OauthTokenGenerateExample.ts
index ace0df01d..80e6adf5e 100644
--- a/examples/OauthTokenGenerateExample.ts
+++ b/examples/OauthTokenGenerateExample.ts
@@ -4,12 +4,13 @@ import models from "@dropbox/sign"
 
 const apiCaller = new api.OAuthApi();
 
-const oAuthTokenGenerateRequest = new models.OAuthTokenGenerateRequest();
-oAuthTokenGenerateRequest.clientId = "cc91c61d00f8bb2ece1428035716b";
-oAuthTokenGenerateRequest.clientSecret = "1d14434088507ffa390e6f5528465";
-oAuthTokenGenerateRequest.code = "1b0d28d90c86c141";
-oAuthTokenGenerateRequest.state = "900e06e2";
-oAuthTokenGenerateRequest.grantType = "authorization_code";
+const oAuthTokenGenerateRequest: models.OAuthTokenGenerateRequest = {
+  clientId: "cc91c61d00f8bb2ece1428035716b",
+  clientSecret: "1d14434088507ffa390e6f5528465",
+  code: "1b0d28d90c86c141",
+  state: "900e06e2",
+  grantType: "authorization_code",
+};
 
 apiCaller.oauthTokenGenerate(
   oAuthTokenGenerateRequest,
diff --git a/examples/OauthTokenRefreshExample.java b/examples/OauthTokenRefreshExample.java
index 5b2133b0e..f79562e02 100644
--- a/examples/OauthTokenRefreshExample.java
+++ b/examples/OauthTokenRefreshExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
diff --git a/examples/OauthTokenRefreshExample.ts b/examples/OauthTokenRefreshExample.ts
index fa9973e6f..351d689e0 100644
--- a/examples/OauthTokenRefreshExample.ts
+++ b/examples/OauthTokenRefreshExample.ts
@@ -4,9 +4,10 @@ import models from "@dropbox/sign"
 
 const apiCaller = new api.OAuthApi();
 
-const oAuthTokenRefreshRequest = new models.OAuthTokenRefreshRequest();
-oAuthTokenRefreshRequest.grantType = "refresh_token";
-oAuthTokenRefreshRequest.refreshToken = "hNTI2MTFmM2VmZDQxZTZjOWRmZmFjZmVmMGMyNGFjMzI2MGI5YzgzNmE3";
+const oAuthTokenRefreshRequest: models.OAuthTokenRefreshRequest = {
+  grantType: "refresh_token",
+  refreshToken: "hNTI2MTFmM2VmZDQxZTZjOWRmZmFjZmVmMGMyNGFjMzI2MGI5YzgzNmE3",
+};
 
 apiCaller.oauthTokenRefresh(
   oAuthTokenRefreshRequest,
diff --git a/examples/ReportCreateExample.java b/examples/ReportCreateExample.java
index ecd726bcb..2f0013c1a 100644
--- a/examples/ReportCreateExample.java
+++ b/examples/ReportCreateExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,7 +20,7 @@ public class ReportCreateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
 
         var reportCreateRequest = new ReportCreateRequest();
         reportCreateRequest.startDate("09/01/2020");
diff --git a/examples/ReportCreateExample.ts b/examples/ReportCreateExample.ts
index 57bf8127d..7195512ab 100644
--- a/examples/ReportCreateExample.ts
+++ b/examples/ReportCreateExample.ts
@@ -5,13 +5,14 @@ import models from "@dropbox/sign"
 const apiCaller = new api.ReportApi();
 apiCaller.username = "YOUR_API_KEY";
 
-const reportCreateRequest = new models.ReportCreateRequest();
-reportCreateRequest.startDate = "09/01/2020";
-reportCreateRequest.endDate = "09/01/2020";
-reportCreateRequest.reportType = [
-  models.ReportCreateRequest.ReportTypeEnum.UserActivity,
-  models.ReportCreateRequest.ReportTypeEnum.DocumentStatus,
-];
+const reportCreateRequest: models.ReportCreateRequest = {
+  startDate: "09/01/2020",
+  endDate: "09/01/2020",
+  reportType: [
+    models.ReportCreateRequest.ReportTypeEnum.UserActivity,
+    models.ReportCreateRequest.ReportTypeEnum.DocumentStatus,
+  ],
+};
 
 apiCaller.reportCreate(
   reportCreateRequest,
diff --git a/examples/SignatureRequestBulkCreateEmbeddedWithTemplateExample.java b/examples/SignatureRequestBulkCreateEmbeddedWithTemplateExample.java
index fcfbef591..a5bec1fb9 100644
--- a/examples/SignatureRequestBulkCreateEmbeddedWithTemplateExample.java
+++ b/examples/SignatureRequestBulkCreateEmbeddedWithTemplateExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,7 +20,7 @@ public class SignatureRequestBulkCreateEmbeddedWithTemplateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
 
         var signerList2CustomFields1 = new SubBulkSignerListCustomField();
         signerList2CustomFields1.name("company");
diff --git a/examples/SignatureRequestBulkCreateEmbeddedWithTemplateExample.ts b/examples/SignatureRequestBulkCreateEmbeddedWithTemplateExample.ts
index d8b5b2ef9..9c95521ee 100644
--- a/examples/SignatureRequestBulkCreateEmbeddedWithTemplateExample.ts
+++ b/examples/SignatureRequestBulkCreateEmbeddedWithTemplateExample.ts
@@ -5,73 +5,81 @@ import models from "@dropbox/sign"
 const apiCaller = new api.SignatureRequestApi();
 apiCaller.username = "YOUR_API_KEY";
 
-const signerList2CustomFields1 = new models.SubBulkSignerListCustomField();
-signerList2CustomFields1.name = "company";
-signerList2CustomFields1.value = "123 LLC";
+const signerList2CustomFields1: models.SubBulkSignerListCustomField = {
+  name: "company",
+  value: "123 LLC",
+};
 
 const signerList2CustomFields = [
   signerList2CustomFields1,
 ];
 
-const signerList2Signers1 = new models.SubSignatureRequestTemplateSigner();
-signerList2Signers1.role = "Client";
-signerList2Signers1.name = "Mary";
-signerList2Signers1.emailAddress = "mary@example.com";
-signerList2Signers1.pin = "gd9as5b";
+const signerList2Signers1: models.SubSignatureRequestTemplateSigner = {
+  role: "Client",
+  name: "Mary",
+  emailAddress: "mary@example.com",
+  pin: "gd9as5b",
+};
 
 const signerList2Signers = [
   signerList2Signers1,
 ];
 
-const signerList1CustomFields1 = new models.SubBulkSignerListCustomField();
-signerList1CustomFields1.name = "company";
-signerList1CustomFields1.value = "ABC Corp";
+const signerList1CustomFields1: models.SubBulkSignerListCustomField = {
+  name: "company",
+  value: "ABC Corp",
+};
 
 const signerList1CustomFields = [
   signerList1CustomFields1,
 ];
 
-const signerList1Signers1 = new models.SubSignatureRequestTemplateSigner();
-signerList1Signers1.role = "Client";
-signerList1Signers1.name = "George";
-signerList1Signers1.emailAddress = "george@example.com";
-signerList1Signers1.pin = "d79a3td";
+const signerList1Signers1: models.SubSignatureRequestTemplateSigner = {
+  role: "Client",
+  name: "George",
+  emailAddress: "george@example.com",
+  pin: "d79a3td",
+};
 
 const signerList1Signers = [
   signerList1Signers1,
 ];
 
-const signerList1 = new models.SubBulkSignerList();
-signerList1.customFields = signerList1CustomFields;
-signerList1.signers = signerList1Signers;
+const signerList1: models.SubBulkSignerList = {
+  customFields: signerList1CustomFields,
+  signers: signerList1Signers,
+};
 
-const signerList2 = new models.SubBulkSignerList();
-signerList2.customFields = signerList2CustomFields;
-signerList2.signers = signerList2Signers;
+const signerList2: models.SubBulkSignerList = {
+  customFields: signerList2CustomFields,
+  signers: signerList2Signers,
+};
 
 const signerList = [
   signerList1,
   signerList2,
 ];
 
-const ccs1 = new models.SubCC();
-ccs1.role = "Accounting";
-ccs1.emailAddress = "accounting@example.com";
+const ccs1: models.SubCC = {
+  role: "Accounting",
+  emailAddress: "accounting@example.com",
+};
 
 const ccs = [
   ccs1,
 ];
 
-const signatureRequestBulkCreateEmbeddedWithTemplateRequest = new models.SignatureRequestBulkCreateEmbeddedWithTemplateRequest();
-signatureRequestBulkCreateEmbeddedWithTemplateRequest.clientId = "1a659d9ad95bccd307ecad78d72192f8";
-signatureRequestBulkCreateEmbeddedWithTemplateRequest.templateIds = [
-  "c26b8a16784a872da37ea946b9ddec7c1e11dff6",
-];
-signatureRequestBulkCreateEmbeddedWithTemplateRequest.message = "Glad we could come to an agreement.";
-signatureRequestBulkCreateEmbeddedWithTemplateRequest.subject = "Purchase Order";
-signatureRequestBulkCreateEmbeddedWithTemplateRequest.testMode = true;
-signatureRequestBulkCreateEmbeddedWithTemplateRequest.signerList = signerList;
-signatureRequestBulkCreateEmbeddedWithTemplateRequest.ccs = ccs;
+const signatureRequestBulkCreateEmbeddedWithTemplateRequest: models.SignatureRequestBulkCreateEmbeddedWithTemplateRequest = {
+  clientId: "1a659d9ad95bccd307ecad78d72192f8",
+  templateIds: [
+    "c26b8a16784a872da37ea946b9ddec7c1e11dff6",
+  ],
+  message: "Glad we could come to an agreement.",
+  subject: "Purchase Order",
+  testMode: true,
+  signerList: signerList,
+  ccs: ccs,
+};
 
 apiCaller.signatureRequestBulkCreateEmbeddedWithTemplate(
   signatureRequestBulkCreateEmbeddedWithTemplateRequest,
diff --git a/examples/SignatureRequestBulkSendWithTemplateExample.java b/examples/SignatureRequestBulkSendWithTemplateExample.java
index fb9baba01..b539626e0 100644
--- a/examples/SignatureRequestBulkSendWithTemplateExample.java
+++ b/examples/SignatureRequestBulkSendWithTemplateExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class SignatureRequestBulkSendWithTemplateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var signerList2CustomFields1 = new SubBulkSignerListCustomField();
         signerList2CustomFields1.name("company");
diff --git a/examples/SignatureRequestBulkSendWithTemplateExample.ts b/examples/SignatureRequestBulkSendWithTemplateExample.ts
index f2fff90b1..a8c7d7bbd 100644
--- a/examples/SignatureRequestBulkSendWithTemplateExample.ts
+++ b/examples/SignatureRequestBulkSendWithTemplateExample.ts
@@ -6,72 +6,80 @@ const apiCaller = new api.SignatureRequestApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const signerList2CustomFields1 = new models.SubBulkSignerListCustomField();
-signerList2CustomFields1.name = "company";
-signerList2CustomFields1.value = "123 LLC";
+const signerList2CustomFields1: models.SubBulkSignerListCustomField = {
+  name: "company",
+  value: "123 LLC",
+};
 
 const signerList2CustomFields = [
   signerList2CustomFields1,
 ];
 
-const signerList2Signers1 = new models.SubSignatureRequestTemplateSigner();
-signerList2Signers1.role = "Client";
-signerList2Signers1.name = "Mary";
-signerList2Signers1.emailAddress = "mary@example.com";
-signerList2Signers1.pin = "gd9as5b";
+const signerList2Signers1: models.SubSignatureRequestTemplateSigner = {
+  role: "Client",
+  name: "Mary",
+  emailAddress: "mary@example.com",
+  pin: "gd9as5b",
+};
 
 const signerList2Signers = [
   signerList2Signers1,
 ];
 
-const signerList1CustomFields1 = new models.SubBulkSignerListCustomField();
-signerList1CustomFields1.name = "company";
-signerList1CustomFields1.value = "ABC Corp";
+const signerList1CustomFields1: models.SubBulkSignerListCustomField = {
+  name: "company",
+  value: "ABC Corp",
+};
 
 const signerList1CustomFields = [
   signerList1CustomFields1,
 ];
 
-const signerList1Signers1 = new models.SubSignatureRequestTemplateSigner();
-signerList1Signers1.role = "Client";
-signerList1Signers1.name = "George";
-signerList1Signers1.emailAddress = "george@example.com";
-signerList1Signers1.pin = "d79a3td";
+const signerList1Signers1: models.SubSignatureRequestTemplateSigner = {
+  role: "Client",
+  name: "George",
+  emailAddress: "george@example.com",
+  pin: "d79a3td",
+};
 
 const signerList1Signers = [
   signerList1Signers1,
 ];
 
-const signerList1 = new models.SubBulkSignerList();
-signerList1.customFields = signerList1CustomFields;
-signerList1.signers = signerList1Signers;
+const signerList1: models.SubBulkSignerList = {
+  customFields: signerList1CustomFields,
+  signers: signerList1Signers,
+};
 
-const signerList2 = new models.SubBulkSignerList();
-signerList2.customFields = signerList2CustomFields;
-signerList2.signers = signerList2Signers;
+const signerList2: models.SubBulkSignerList = {
+  customFields: signerList2CustomFields,
+  signers: signerList2Signers,
+};
 
 const signerList = [
   signerList1,
   signerList2,
 ];
 
-const ccs1 = new models.SubCC();
-ccs1.role = "Accounting";
-ccs1.emailAddress = "accounting@example.com";
+const ccs1: models.SubCC = {
+  role: "Accounting",
+  emailAddress: "accounting@example.com",
+};
 
 const ccs = [
   ccs1,
 ];
 
-const signatureRequestBulkSendWithTemplateRequest = new models.SignatureRequestBulkSendWithTemplateRequest();
-signatureRequestBulkSendWithTemplateRequest.templateIds = [
-  "c26b8a16784a872da37ea946b9ddec7c1e11dff6",
-];
-signatureRequestBulkSendWithTemplateRequest.message = "Glad we could come to an agreement.";
-signatureRequestBulkSendWithTemplateRequest.subject = "Purchase Order";
-signatureRequestBulkSendWithTemplateRequest.testMode = true;
-signatureRequestBulkSendWithTemplateRequest.signerList = signerList;
-signatureRequestBulkSendWithTemplateRequest.ccs = ccs;
+const signatureRequestBulkSendWithTemplateRequest: models.SignatureRequestBulkSendWithTemplateRequest = {
+  templateIds: [
+    "c26b8a16784a872da37ea946b9ddec7c1e11dff6",
+  ],
+  message: "Glad we could come to an agreement.",
+  subject: "Purchase Order",
+  testMode: true,
+  signerList: signerList,
+  ccs: ccs,
+};
 
 apiCaller.signatureRequestBulkSendWithTemplate(
   signatureRequestBulkSendWithTemplateRequest,
diff --git a/examples/SignatureRequestCancelExample.java b/examples/SignatureRequestCancelExample.java
index a1e436802..076a73d1d 100644
--- a/examples/SignatureRequestCancelExample.java
+++ b/examples/SignatureRequestCancelExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class SignatureRequestCancelExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
diff --git a/examples/SignatureRequestCreateEmbeddedExample.java b/examples/SignatureRequestCreateEmbeddedExample.java
index ee5f5bb2a..5193cee20 100644
--- a/examples/SignatureRequestCreateEmbeddedExample.java
+++ b/examples/SignatureRequestCreateEmbeddedExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class SignatureRequestCreateEmbeddedExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var signingOptions = new SubSigningOptions();
         signingOptions.defaultType(SubSigningOptions.DefaultTypeEnum.DRAW);
diff --git a/examples/SignatureRequestCreateEmbeddedExample.ts b/examples/SignatureRequestCreateEmbeddedExample.ts
index 15c30c113..a2c620a2e 100644
--- a/examples/SignatureRequestCreateEmbeddedExample.ts
+++ b/examples/SignatureRequestCreateEmbeddedExample.ts
@@ -6,43 +6,47 @@ const apiCaller = new api.SignatureRequestApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const signingOptions = new models.SubSigningOptions();
-signingOptions.defaultType = models.SubSigningOptions.DefaultTypeEnum.Draw;
-signingOptions.draw = true;
-signingOptions.phone = false;
-signingOptions.type = true;
-signingOptions.upload = true;
+const signingOptions: models.SubSigningOptions = {
+  defaultType: models.SubSigningOptions.DefaultTypeEnum.Draw,
+  draw: true,
+  phone: false,
+  type: true,
+  upload: true,
+};
 
-const signers1 = new models.SubSignatureRequestSigner();
-signers1.name = "Jack";
-signers1.emailAddress = "jack@example.com";
-signers1.order = 0;
+const signers1: models.SubSignatureRequestSigner = {
+  name: "Jack",
+  emailAddress: "jack@example.com",
+  order: 0,
+};
 
-const signers2 = new models.SubSignatureRequestSigner();
-signers2.name = "Jill";
-signers2.emailAddress = "jill@example.com";
-signers2.order = 1;
+const signers2: models.SubSignatureRequestSigner = {
+  name: "Jill",
+  emailAddress: "jill@example.com",
+  order: 1,
+};
 
 const signers = [
   signers1,
   signers2,
 ];
 
-const signatureRequestCreateEmbeddedRequest = new models.SignatureRequestCreateEmbeddedRequest();
-signatureRequestCreateEmbeddedRequest.clientId = "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a";
-signatureRequestCreateEmbeddedRequest.message = "Please sign this NDA and then we can discuss more. Let me know if you\nhave any questions.";
-signatureRequestCreateEmbeddedRequest.subject = "The NDA we talked about";
-signatureRequestCreateEmbeddedRequest.testMode = true;
-signatureRequestCreateEmbeddedRequest.title = "NDA with Acme Co.";
-signatureRequestCreateEmbeddedRequest.ccEmailAddresses = [
-  "lawyer1@dropboxsign.com",
-  "lawyer2@dropboxsign.com",
-];
-signatureRequestCreateEmbeddedRequest.files = [
-  fs.createReadStream("./example_signature_request.pdf"),
-];
-signatureRequestCreateEmbeddedRequest.signingOptions = signingOptions;
-signatureRequestCreateEmbeddedRequest.signers = signers;
+const signatureRequestCreateEmbeddedRequest: models.SignatureRequestCreateEmbeddedRequest = {
+  clientId: "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a",
+  message: "Please sign this NDA and then we can discuss more. Let me know if you\nhave any questions.",
+  subject: "The NDA we talked about",
+  testMode: true,
+  title: "NDA with Acme Co.",
+  ccEmailAddresses: [
+    "lawyer1@dropboxsign.com",
+    "lawyer2@dropboxsign.com",
+  ],
+  files: [
+    fs.createReadStream("./example_signature_request.pdf"),
+  ],
+  signingOptions: signingOptions,
+  signers: signers,
+};
 
 apiCaller.signatureRequestCreateEmbedded(
   signatureRequestCreateEmbeddedRequest,
diff --git a/examples/SignatureRequestCreateEmbeddedGroupedSignersExample.java b/examples/SignatureRequestCreateEmbeddedGroupedSignersExample.java
index 0228be4a6..b069e2001 100644
--- a/examples/SignatureRequestCreateEmbeddedGroupedSignersExample.java
+++ b/examples/SignatureRequestCreateEmbeddedGroupedSignersExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class SignatureRequestCreateEmbeddedGroupedSignersExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var groupedSigners2Signers1 = new SubSignatureRequestSigner();
         groupedSigners2Signers1.name("Bob");
diff --git a/examples/SignatureRequestCreateEmbeddedGroupedSignersExample.ts b/examples/SignatureRequestCreateEmbeddedGroupedSignersExample.ts
index 6fcc1bab3..a79b117ad 100644
--- a/examples/SignatureRequestCreateEmbeddedGroupedSignersExample.ts
+++ b/examples/SignatureRequestCreateEmbeddedGroupedSignersExample.ts
@@ -6,69 +6,77 @@ const apiCaller = new api.SignatureRequestApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const groupedSigners2Signers1 = new models.SubSignatureRequestSigner();
-groupedSigners2Signers1.name = "Bob";
-groupedSigners2Signers1.emailAddress = "bob@example.com";
+const groupedSigners2Signers1: models.SubSignatureRequestSigner = {
+  name: "Bob",
+  emailAddress: "bob@example.com",
+};
 
-const groupedSigners2Signers2 = new models.SubSignatureRequestSigner();
-groupedSigners2Signers2.name = "Charlie";
-groupedSigners2Signers2.emailAddress = "charlie@example.com";
+const groupedSigners2Signers2: models.SubSignatureRequestSigner = {
+  name: "Charlie",
+  emailAddress: "charlie@example.com",
+};
 
 const groupedSigners2Signers = [
   groupedSigners2Signers1,
   groupedSigners2Signers2,
 ];
 
-const groupedSigners1Signers1 = new models.SubSignatureRequestSigner();
-groupedSigners1Signers1.name = "Jack";
-groupedSigners1Signers1.emailAddress = "jack@example.com";
+const groupedSigners1Signers1: models.SubSignatureRequestSigner = {
+  name: "Jack",
+  emailAddress: "jack@example.com",
+};
 
-const groupedSigners1Signers2 = new models.SubSignatureRequestSigner();
-groupedSigners1Signers2.name = "Jill";
-groupedSigners1Signers2.emailAddress = "jill@example.com";
+const groupedSigners1Signers2: models.SubSignatureRequestSigner = {
+  name: "Jill",
+  emailAddress: "jill@example.com",
+};
 
 const groupedSigners1Signers = [
   groupedSigners1Signers1,
   groupedSigners1Signers2,
 ];
 
-const signingOptions = new models.SubSigningOptions();
-signingOptions.defaultType = models.SubSigningOptions.DefaultTypeEnum.Draw;
-signingOptions.draw = true;
-signingOptions.phone = false;
-signingOptions.type = true;
-signingOptions.upload = true;
+const signingOptions: models.SubSigningOptions = {
+  defaultType: models.SubSigningOptions.DefaultTypeEnum.Draw,
+  draw: true,
+  phone: false,
+  type: true,
+  upload: true,
+};
 
-const groupedSigners1 = new models.SubSignatureRequestGroupedSigners();
-groupedSigners1.group = "Group #1";
-groupedSigners1.order = 0;
-groupedSigners1.signers = groupedSigners1Signers;
+const groupedSigners1: models.SubSignatureRequestGroupedSigners = {
+  group: "Group #1",
+  order: 0,
+  signers: groupedSigners1Signers,
+};
 
-const groupedSigners2 = new models.SubSignatureRequestGroupedSigners();
-groupedSigners2.group = "Group #2";
-groupedSigners2.order = 1;
-groupedSigners2.signers = groupedSigners2Signers;
+const groupedSigners2: models.SubSignatureRequestGroupedSigners = {
+  group: "Group #2",
+  order: 1,
+  signers: groupedSigners2Signers,
+};
 
 const groupedSigners = [
   groupedSigners1,
   groupedSigners2,
 ];
 
-const signatureRequestCreateEmbeddedRequest = new models.SignatureRequestCreateEmbeddedRequest();
-signatureRequestCreateEmbeddedRequest.clientId = "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a";
-signatureRequestCreateEmbeddedRequest.message = "Please sign this NDA and then we can discuss more. Let me know if you\nhave any questions.";
-signatureRequestCreateEmbeddedRequest.subject = "The NDA we talked about";
-signatureRequestCreateEmbeddedRequest.testMode = true;
-signatureRequestCreateEmbeddedRequest.title = "NDA with Acme Co.";
-signatureRequestCreateEmbeddedRequest.fileUrls = [
-  "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
-];
-signatureRequestCreateEmbeddedRequest.ccEmailAddresses = [
-  "lawyer1@dropboxsign.com",
-  "lawyer2@dropboxsign.com",
-];
-signatureRequestCreateEmbeddedRequest.signingOptions = signingOptions;
-signatureRequestCreateEmbeddedRequest.groupedSigners = groupedSigners;
+const signatureRequestCreateEmbeddedRequest: models.SignatureRequestCreateEmbeddedRequest = {
+  clientId: "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a",
+  message: "Please sign this NDA and then we can discuss more. Let me know if you\nhave any questions.",
+  subject: "The NDA we talked about",
+  testMode: true,
+  title: "NDA with Acme Co.",
+  fileUrls: [
+    "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
+  ],
+  ccEmailAddresses: [
+    "lawyer1@dropboxsign.com",
+    "lawyer2@dropboxsign.com",
+  ],
+  signingOptions: signingOptions,
+  groupedSigners: groupedSigners,
+};
 
 apiCaller.signatureRequestCreateEmbedded(
   signatureRequestCreateEmbeddedRequest,
diff --git a/examples/SignatureRequestCreateEmbeddedWithTemplateExample.java b/examples/SignatureRequestCreateEmbeddedWithTemplateExample.java
index 5957ccba0..309d422ee 100644
--- a/examples/SignatureRequestCreateEmbeddedWithTemplateExample.java
+++ b/examples/SignatureRequestCreateEmbeddedWithTemplateExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class SignatureRequestCreateEmbeddedWithTemplateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var signingOptions = new SubSigningOptions();
         signingOptions.defaultType(SubSigningOptions.DefaultTypeEnum.DRAW);
diff --git a/examples/SignatureRequestCreateEmbeddedWithTemplateExample.ts b/examples/SignatureRequestCreateEmbeddedWithTemplateExample.ts
index 399f0c491..a2ee15e46 100644
--- a/examples/SignatureRequestCreateEmbeddedWithTemplateExample.ts
+++ b/examples/SignatureRequestCreateEmbeddedWithTemplateExample.ts
@@ -6,32 +6,35 @@ const apiCaller = new api.SignatureRequestApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const signingOptions = new models.SubSigningOptions();
-signingOptions.defaultType = models.SubSigningOptions.DefaultTypeEnum.Draw;
-signingOptions.draw = true;
-signingOptions.phone = false;
-signingOptions.type = true;
-signingOptions.upload = true;
+const signingOptions: models.SubSigningOptions = {
+  defaultType: models.SubSigningOptions.DefaultTypeEnum.Draw,
+  draw: true,
+  phone: false,
+  type: true,
+  upload: true,
+};
 
-const signers1 = new models.SubSignatureRequestTemplateSigner();
-signers1.role = "Client";
-signers1.name = "George";
-signers1.emailAddress = "george@example.com";
+const signers1: models.SubSignatureRequestTemplateSigner = {
+  role: "Client",
+  name: "George",
+  emailAddress: "george@example.com",
+};
 
 const signers = [
   signers1,
 ];
 
-const signatureRequestCreateEmbeddedWithTemplateRequest = new models.SignatureRequestCreateEmbeddedWithTemplateRequest();
-signatureRequestCreateEmbeddedWithTemplateRequest.clientId = "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a";
-signatureRequestCreateEmbeddedWithTemplateRequest.templateIds = [
-  "c26b8a16784a872da37ea946b9ddec7c1e11dff6",
-];
-signatureRequestCreateEmbeddedWithTemplateRequest.message = "Glad we could come to an agreement.";
-signatureRequestCreateEmbeddedWithTemplateRequest.subject = "Purchase Order";
-signatureRequestCreateEmbeddedWithTemplateRequest.testMode = true;
-signatureRequestCreateEmbeddedWithTemplateRequest.signingOptions = signingOptions;
-signatureRequestCreateEmbeddedWithTemplateRequest.signers = signers;
+const signatureRequestCreateEmbeddedWithTemplateRequest: models.SignatureRequestCreateEmbeddedWithTemplateRequest = {
+  clientId: "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a",
+  templateIds: [
+    "c26b8a16784a872da37ea946b9ddec7c1e11dff6",
+  ],
+  message: "Glad we could come to an agreement.",
+  subject: "Purchase Order",
+  testMode: true,
+  signingOptions: signingOptions,
+  signers: signers,
+};
 
 apiCaller.signatureRequestCreateEmbeddedWithTemplate(
   signatureRequestCreateEmbeddedWithTemplateRequest,
diff --git a/examples/SignatureRequestEditEmbeddedExample.java b/examples/SignatureRequestEditEmbeddedExample.java
index 8370a232e..c69cc85e4 100644
--- a/examples/SignatureRequestEditEmbeddedExample.java
+++ b/examples/SignatureRequestEditEmbeddedExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class SignatureRequestEditEmbeddedExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var signingOptions = new SubSigningOptions();
         signingOptions.defaultType(SubSigningOptions.DefaultTypeEnum.DRAW);
diff --git a/examples/SignatureRequestEditEmbeddedExample.ts b/examples/SignatureRequestEditEmbeddedExample.ts
index 6affce8fb..f0f7580cc 100644
--- a/examples/SignatureRequestEditEmbeddedExample.ts
+++ b/examples/SignatureRequestEditEmbeddedExample.ts
@@ -6,43 +6,47 @@ const apiCaller = new api.SignatureRequestApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const signingOptions = new models.SubSigningOptions();
-signingOptions.defaultType = models.SubSigningOptions.DefaultTypeEnum.Draw;
-signingOptions.draw = true;
-signingOptions.phone = false;
-signingOptions.type = true;
-signingOptions.upload = true;
+const signingOptions: models.SubSigningOptions = {
+  defaultType: models.SubSigningOptions.DefaultTypeEnum.Draw,
+  draw: true,
+  phone: false,
+  type: true,
+  upload: true,
+};
 
-const signers1 = new models.SubSignatureRequestSigner();
-signers1.name = "Jack";
-signers1.emailAddress = "jack@example.com";
-signers1.order = 0;
+const signers1: models.SubSignatureRequestSigner = {
+  name: "Jack",
+  emailAddress: "jack@example.com",
+  order: 0,
+};
 
-const signers2 = new models.SubSignatureRequestSigner();
-signers2.name = "Jill";
-signers2.emailAddress = "jill@example.com";
-signers2.order = 1;
+const signers2: models.SubSignatureRequestSigner = {
+  name: "Jill",
+  emailAddress: "jill@example.com",
+  order: 1,
+};
 
 const signers = [
   signers1,
   signers2,
 ];
 
-const signatureRequestEditEmbeddedRequest = new models.SignatureRequestEditEmbeddedRequest();
-signatureRequestEditEmbeddedRequest.clientId = "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a";
-signatureRequestEditEmbeddedRequest.message = "Please sign this NDA and then we can discuss more. Let me know if you\nhave any questions.";
-signatureRequestEditEmbeddedRequest.subject = "The NDA we talked about";
-signatureRequestEditEmbeddedRequest.testMode = true;
-signatureRequestEditEmbeddedRequest.title = "NDA with Acme Co.";
-signatureRequestEditEmbeddedRequest.ccEmailAddresses = [
-  "lawyer1@dropboxsign.com",
-  "lawyer2@dropboxsign.com",
-];
-signatureRequestEditEmbeddedRequest.files = [
-  fs.createReadStream("./example_signature_request.pdf"),
-];
-signatureRequestEditEmbeddedRequest.signingOptions = signingOptions;
-signatureRequestEditEmbeddedRequest.signers = signers;
+const signatureRequestEditEmbeddedRequest: models.SignatureRequestEditEmbeddedRequest = {
+  clientId: "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a",
+  message: "Please sign this NDA and then we can discuss more. Let me know if you\nhave any questions.",
+  subject: "The NDA we talked about",
+  testMode: true,
+  title: "NDA with Acme Co.",
+  ccEmailAddresses: [
+    "lawyer1@dropboxsign.com",
+    "lawyer2@dropboxsign.com",
+  ],
+  files: [
+    fs.createReadStream("./example_signature_request.pdf"),
+  ],
+  signingOptions: signingOptions,
+  signers: signers,
+};
 
 apiCaller.signatureRequestEditEmbedded(
   "fa5c8a0b0f492d768749333ad6fcc214c111e967", // signatureRequestId
diff --git a/examples/SignatureRequestEditEmbeddedGroupedSignersExample.java b/examples/SignatureRequestEditEmbeddedGroupedSignersExample.java
index 8859b04f8..d526e3d88 100644
--- a/examples/SignatureRequestEditEmbeddedGroupedSignersExample.java
+++ b/examples/SignatureRequestEditEmbeddedGroupedSignersExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class SignatureRequestEditEmbeddedGroupedSignersExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var groupedSigners2Signers1 = new SubSignatureRequestSigner();
         groupedSigners2Signers1.name("Bob");
diff --git a/examples/SignatureRequestEditEmbeddedGroupedSignersExample.ts b/examples/SignatureRequestEditEmbeddedGroupedSignersExample.ts
index c65767fed..3d828dbf8 100644
--- a/examples/SignatureRequestEditEmbeddedGroupedSignersExample.ts
+++ b/examples/SignatureRequestEditEmbeddedGroupedSignersExample.ts
@@ -6,69 +6,77 @@ const apiCaller = new api.SignatureRequestApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const groupedSigners2Signers1 = new models.SubSignatureRequestSigner();
-groupedSigners2Signers1.name = "Bob";
-groupedSigners2Signers1.emailAddress = "bob@example.com";
+const groupedSigners2Signers1: models.SubSignatureRequestSigner = {
+  name: "Bob",
+  emailAddress: "bob@example.com",
+};
 
-const groupedSigners2Signers2 = new models.SubSignatureRequestSigner();
-groupedSigners2Signers2.name = "Charlie";
-groupedSigners2Signers2.emailAddress = "charlie@example.com";
+const groupedSigners2Signers2: models.SubSignatureRequestSigner = {
+  name: "Charlie",
+  emailAddress: "charlie@example.com",
+};
 
 const groupedSigners2Signers = [
   groupedSigners2Signers1,
   groupedSigners2Signers2,
 ];
 
-const groupedSigners1Signers1 = new models.SubSignatureRequestSigner();
-groupedSigners1Signers1.name = "Jack";
-groupedSigners1Signers1.emailAddress = "jack@example.com";
+const groupedSigners1Signers1: models.SubSignatureRequestSigner = {
+  name: "Jack",
+  emailAddress: "jack@example.com",
+};
 
-const groupedSigners1Signers2 = new models.SubSignatureRequestSigner();
-groupedSigners1Signers2.name = "Jill";
-groupedSigners1Signers2.emailAddress = "jill@example.com";
+const groupedSigners1Signers2: models.SubSignatureRequestSigner = {
+  name: "Jill",
+  emailAddress: "jill@example.com",
+};
 
 const groupedSigners1Signers = [
   groupedSigners1Signers1,
   groupedSigners1Signers2,
 ];
 
-const signingOptions = new models.SubSigningOptions();
-signingOptions.defaultType = models.SubSigningOptions.DefaultTypeEnum.Draw;
-signingOptions.draw = true;
-signingOptions.phone = false;
-signingOptions.type = true;
-signingOptions.upload = true;
+const signingOptions: models.SubSigningOptions = {
+  defaultType: models.SubSigningOptions.DefaultTypeEnum.Draw,
+  draw: true,
+  phone: false,
+  type: true,
+  upload: true,
+};
 
-const groupedSigners1 = new models.SubSignatureRequestGroupedSigners();
-groupedSigners1.group = "Group #1";
-groupedSigners1.order = 0;
-groupedSigners1.signers = groupedSigners1Signers;
+const groupedSigners1: models.SubSignatureRequestGroupedSigners = {
+  group: "Group #1",
+  order: 0,
+  signers: groupedSigners1Signers,
+};
 
-const groupedSigners2 = new models.SubSignatureRequestGroupedSigners();
-groupedSigners2.group = "Group #2";
-groupedSigners2.order = 1;
-groupedSigners2.signers = groupedSigners2Signers;
+const groupedSigners2: models.SubSignatureRequestGroupedSigners = {
+  group: "Group #2",
+  order: 1,
+  signers: groupedSigners2Signers,
+};
 
 const groupedSigners = [
   groupedSigners1,
   groupedSigners2,
 ];
 
-const signatureRequestEditEmbeddedRequest = new models.SignatureRequestEditEmbeddedRequest();
-signatureRequestEditEmbeddedRequest.clientId = "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a";
-signatureRequestEditEmbeddedRequest.message = "Please sign this NDA and then we can discuss more. Let me know if you\nhave any questions.";
-signatureRequestEditEmbeddedRequest.subject = "The NDA we talked about";
-signatureRequestEditEmbeddedRequest.testMode = true;
-signatureRequestEditEmbeddedRequest.title = "NDA with Acme Co.";
-signatureRequestEditEmbeddedRequest.fileUrls = [
-  "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
-];
-signatureRequestEditEmbeddedRequest.ccEmailAddresses = [
-  "lawyer1@dropboxsign.com",
-  "lawyer2@dropboxsign.com",
-];
-signatureRequestEditEmbeddedRequest.signingOptions = signingOptions;
-signatureRequestEditEmbeddedRequest.groupedSigners = groupedSigners;
+const signatureRequestEditEmbeddedRequest: models.SignatureRequestEditEmbeddedRequest = {
+  clientId: "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a",
+  message: "Please sign this NDA and then we can discuss more. Let me know if you\nhave any questions.",
+  subject: "The NDA we talked about",
+  testMode: true,
+  title: "NDA with Acme Co.",
+  fileUrls: [
+    "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
+  ],
+  ccEmailAddresses: [
+    "lawyer1@dropboxsign.com",
+    "lawyer2@dropboxsign.com",
+  ],
+  signingOptions: signingOptions,
+  groupedSigners: groupedSigners,
+};
 
 apiCaller.signatureRequestEditEmbedded(
   "fa5c8a0b0f492d768749333ad6fcc214c111e967", // signatureRequestId
diff --git a/examples/SignatureRequestEditEmbeddedWithTemplateExample.java b/examples/SignatureRequestEditEmbeddedWithTemplateExample.java
index 77c294dea..b0c034f3b 100644
--- a/examples/SignatureRequestEditEmbeddedWithTemplateExample.java
+++ b/examples/SignatureRequestEditEmbeddedWithTemplateExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class SignatureRequestEditEmbeddedWithTemplateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var signingOptions = new SubSigningOptions();
         signingOptions.defaultType(SubSigningOptions.DefaultTypeEnum.DRAW);
diff --git a/examples/SignatureRequestEditEmbeddedWithTemplateExample.ts b/examples/SignatureRequestEditEmbeddedWithTemplateExample.ts
index 6da9e8e05..0deff76bc 100644
--- a/examples/SignatureRequestEditEmbeddedWithTemplateExample.ts
+++ b/examples/SignatureRequestEditEmbeddedWithTemplateExample.ts
@@ -6,32 +6,35 @@ const apiCaller = new api.SignatureRequestApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const signingOptions = new models.SubSigningOptions();
-signingOptions.defaultType = models.SubSigningOptions.DefaultTypeEnum.Draw;
-signingOptions.draw = true;
-signingOptions.phone = false;
-signingOptions.type = true;
-signingOptions.upload = true;
+const signingOptions: models.SubSigningOptions = {
+  defaultType: models.SubSigningOptions.DefaultTypeEnum.Draw,
+  draw: true,
+  phone: false,
+  type: true,
+  upload: true,
+};
 
-const signers1 = new models.SubSignatureRequestTemplateSigner();
-signers1.role = "Client";
-signers1.name = "George";
-signers1.emailAddress = "george@example.com";
+const signers1: models.SubSignatureRequestTemplateSigner = {
+  role: "Client",
+  name: "George",
+  emailAddress: "george@example.com",
+};
 
 const signers = [
   signers1,
 ];
 
-const signatureRequestEditEmbeddedWithTemplateRequest = new models.SignatureRequestEditEmbeddedWithTemplateRequest();
-signatureRequestEditEmbeddedWithTemplateRequest.clientId = "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a";
-signatureRequestEditEmbeddedWithTemplateRequest.templateIds = [
-  "c26b8a16784a872da37ea946b9ddec7c1e11dff6",
-];
-signatureRequestEditEmbeddedWithTemplateRequest.message = "Glad we could come to an agreement.";
-signatureRequestEditEmbeddedWithTemplateRequest.subject = "Purchase Order";
-signatureRequestEditEmbeddedWithTemplateRequest.testMode = true;
-signatureRequestEditEmbeddedWithTemplateRequest.signingOptions = signingOptions;
-signatureRequestEditEmbeddedWithTemplateRequest.signers = signers;
+const signatureRequestEditEmbeddedWithTemplateRequest: models.SignatureRequestEditEmbeddedWithTemplateRequest = {
+  clientId: "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a",
+  templateIds: [
+    "c26b8a16784a872da37ea946b9ddec7c1e11dff6",
+  ],
+  message: "Glad we could come to an agreement.",
+  subject: "Purchase Order",
+  testMode: true,
+  signingOptions: signingOptions,
+  signers: signers,
+};
 
 apiCaller.signatureRequestEditEmbeddedWithTemplate(
   "fa5c8a0b0f492d768749333ad6fcc214c111e967", // signatureRequestId
diff --git a/examples/SignatureRequestEditExample.java b/examples/SignatureRequestEditExample.java
index c0423f9b9..ee628deef 100644
--- a/examples/SignatureRequestEditExample.java
+++ b/examples/SignatureRequestEditExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class SignatureRequestEditExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var fieldOptions = new SubFieldOptions();
         fieldOptions.dateFormat(SubFieldOptions.DateFormatEnum.DD_MM_YYYY);
diff --git a/examples/SignatureRequestEditExample.ts b/examples/SignatureRequestEditExample.ts
index 43aca782d..86e3fd1b6 100644
--- a/examples/SignatureRequestEditExample.ts
+++ b/examples/SignatureRequestEditExample.ts
@@ -6,50 +6,55 @@ const apiCaller = new api.SignatureRequestApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const fieldOptions = new models.SubFieldOptions();
-fieldOptions.dateFormat = models.SubFieldOptions.DateFormatEnum.DD_MM_YYYY;
-
-const signingOptions = new models.SubSigningOptions();
-signingOptions.defaultType = models.SubSigningOptions.DefaultTypeEnum.Draw;
-signingOptions.draw = true;
-signingOptions.phone = false;
-signingOptions.type = true;
-signingOptions.upload = true;
-
-const signers1 = new models.SubSignatureRequestSigner();
-signers1.name = "Jack";
-signers1.emailAddress = "jack@example.com";
-signers1.order = 0;
-
-const signers2 = new models.SubSignatureRequestSigner();
-signers2.name = "Jill";
-signers2.emailAddress = "jill@example.com";
-signers2.order = 1;
+const fieldOptions: models.SubFieldOptions = {
+  dateFormat: models.SubFieldOptions.DateFormatEnum.DdMmYyyy,
+};
+
+const signingOptions: models.SubSigningOptions = {
+  defaultType: models.SubSigningOptions.DefaultTypeEnum.Draw,
+  draw: true,
+  phone: false,
+  type: true,
+  upload: true,
+};
+
+const signers1: models.SubSignatureRequestSigner = {
+  name: "Jack",
+  emailAddress: "jack@example.com",
+  order: 0,
+};
+
+const signers2: models.SubSignatureRequestSigner = {
+  name: "Jill",
+  emailAddress: "jill@example.com",
+  order: 1,
+};
 
 const signers = [
   signers1,
   signers2,
 ];
 
-const signatureRequestEditRequest = new models.SignatureRequestEditRequest();
-signatureRequestEditRequest.message = "Please sign this NDA and then we can discuss more. Let me know if you\nhave any questions.";
-signatureRequestEditRequest.subject = "The NDA we talked about";
-signatureRequestEditRequest.testMode = true;
-signatureRequestEditRequest.title = "NDA with Acme Co.";
-signatureRequestEditRequest.ccEmailAddresses = [
-  "lawyer1@dropboxsign.com",
-  "lawyer2@dropboxsign.com",
-];
-signatureRequestEditRequest.files = [
-  fs.createReadStream("./example_signature_request.pdf"),
-];
-signatureRequestEditRequest.metadata =   {
-  "custom_id": 1234,
-  "custom_text": "NDA #9"
+const signatureRequestEditRequest: models.SignatureRequestEditRequest = {
+  message: "Please sign this NDA and then we can discuss more. Let me know if you\nhave any questions.",
+  subject: "The NDA we talked about",
+  testMode: true,
+  title: "NDA with Acme Co.",
+  ccEmailAddresses: [
+    "lawyer1@dropboxsign.com",
+    "lawyer2@dropboxsign.com",
+  ],
+  files: [
+    fs.createReadStream("./example_signature_request.pdf"),
+  ],
+  metadata: {
+    "custom_id": 1234,
+    "custom_text": "NDA #9"
+  },
+  fieldOptions: fieldOptions,
+  signingOptions: signingOptions,
+  signers: signers,
 };
-signatureRequestEditRequest.fieldOptions = fieldOptions;
-signatureRequestEditRequest.signingOptions = signingOptions;
-signatureRequestEditRequest.signers = signers;
 
 apiCaller.signatureRequestEdit(
   "fa5c8a0b0f492d768749333ad6fcc214c111e967", // signatureRequestId
diff --git a/examples/SignatureRequestEditGroupedSignersExample.java b/examples/SignatureRequestEditGroupedSignersExample.java
index 693b72c6c..934764bdd 100644
--- a/examples/SignatureRequestEditGroupedSignersExample.java
+++ b/examples/SignatureRequestEditGroupedSignersExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class SignatureRequestEditGroupedSignersExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var groupedSigners2Signers1 = new SubSignatureRequestSigner();
         groupedSigners2Signers1.name("Bob");
diff --git a/examples/SignatureRequestEditGroupedSignersExample.ts b/examples/SignatureRequestEditGroupedSignersExample.ts
index fe5e19645..7b300f742 100644
--- a/examples/SignatureRequestEditGroupedSignersExample.ts
+++ b/examples/SignatureRequestEditGroupedSignersExample.ts
@@ -6,76 +6,85 @@ const apiCaller = new api.SignatureRequestApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const groupedSigners2Signers1 = new models.SubSignatureRequestSigner();
-groupedSigners2Signers1.name = "Bob";
-groupedSigners2Signers1.emailAddress = "bob@example.com";
+const groupedSigners2Signers1: models.SubSignatureRequestSigner = {
+  name: "Bob",
+  emailAddress: "bob@example.com",
+};
 
-const groupedSigners2Signers2 = new models.SubSignatureRequestSigner();
-groupedSigners2Signers2.name = "Charlie";
-groupedSigners2Signers2.emailAddress = "charlie@example.com";
+const groupedSigners2Signers2: models.SubSignatureRequestSigner = {
+  name: "Charlie",
+  emailAddress: "charlie@example.com",
+};
 
 const groupedSigners2Signers = [
   groupedSigners2Signers1,
   groupedSigners2Signers2,
 ];
 
-const groupedSigners1Signers1 = new models.SubSignatureRequestSigner();
-groupedSigners1Signers1.name = "Jack";
-groupedSigners1Signers1.emailAddress = "jack@example.com";
+const groupedSigners1Signers1: models.SubSignatureRequestSigner = {
+  name: "Jack",
+  emailAddress: "jack@example.com",
+};
 
-const groupedSigners1Signers2 = new models.SubSignatureRequestSigner();
-groupedSigners1Signers2.name = "Jill";
-groupedSigners1Signers2.emailAddress = "jill@example.com";
+const groupedSigners1Signers2: models.SubSignatureRequestSigner = {
+  name: "Jill",
+  emailAddress: "jill@example.com",
+};
 
 const groupedSigners1Signers = [
   groupedSigners1Signers1,
   groupedSigners1Signers2,
 ];
 
-const fieldOptions = new models.SubFieldOptions();
-fieldOptions.dateFormat = models.SubFieldOptions.DateFormatEnum.DD_MM_YYYY;
+const fieldOptions: models.SubFieldOptions = {
+  dateFormat: models.SubFieldOptions.DateFormatEnum.DdMmYyyy,
+};
 
-const signingOptions = new models.SubSigningOptions();
-signingOptions.defaultType = models.SubSigningOptions.DefaultTypeEnum.Draw;
-signingOptions.draw = true;
-signingOptions.phone = false;
-signingOptions.type = true;
-signingOptions.upload = true;
+const signingOptions: models.SubSigningOptions = {
+  defaultType: models.SubSigningOptions.DefaultTypeEnum.Draw,
+  draw: true,
+  phone: false,
+  type: true,
+  upload: true,
+};
 
-const groupedSigners1 = new models.SubSignatureRequestGroupedSigners();
-groupedSigners1.group = "Group #1";
-groupedSigners1.order = 0;
-groupedSigners1.signers = groupedSigners1Signers;
+const groupedSigners1: models.SubSignatureRequestGroupedSigners = {
+  group: "Group #1",
+  order: 0,
+  signers: groupedSigners1Signers,
+};
 
-const groupedSigners2 = new models.SubSignatureRequestGroupedSigners();
-groupedSigners2.group = "Group #2";
-groupedSigners2.order = 1;
-groupedSigners2.signers = groupedSigners2Signers;
+const groupedSigners2: models.SubSignatureRequestGroupedSigners = {
+  group: "Group #2",
+  order: 1,
+  signers: groupedSigners2Signers,
+};
 
 const groupedSigners = [
   groupedSigners1,
   groupedSigners2,
 ];
 
-const signatureRequestEditRequest = new models.SignatureRequestEditRequest();
-signatureRequestEditRequest.message = "Please sign this NDA and then we can discuss more. Let me know if you\nhave any questions.";
-signatureRequestEditRequest.subject = "The NDA we talked about";
-signatureRequestEditRequest.testMode = true;
-signatureRequestEditRequest.title = "NDA with Acme Co.";
-signatureRequestEditRequest.fileUrls = [
-  "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
-];
-signatureRequestEditRequest.ccEmailAddresses = [
-  "lawyer1@dropboxsign.com",
-  "lawyer2@dropboxsign.com",
-];
-signatureRequestEditRequest.metadata =   {
-  "custom_id": 1234,
-  "custom_text": "NDA #9"
+const signatureRequestEditRequest: models.SignatureRequestEditRequest = {
+  message: "Please sign this NDA and then we can discuss more. Let me know if you\nhave any questions.",
+  subject: "The NDA we talked about",
+  testMode: true,
+  title: "NDA with Acme Co.",
+  fileUrls: [
+    "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
+  ],
+  ccEmailAddresses: [
+    "lawyer1@dropboxsign.com",
+    "lawyer2@dropboxsign.com",
+  ],
+  metadata: {
+    "custom_id": 1234,
+    "custom_text": "NDA #9"
+  },
+  fieldOptions: fieldOptions,
+  signingOptions: signingOptions,
+  groupedSigners: groupedSigners,
 };
-signatureRequestEditRequest.fieldOptions = fieldOptions;
-signatureRequestEditRequest.signingOptions = signingOptions;
-signatureRequestEditRequest.groupedSigners = groupedSigners;
 
 apiCaller.signatureRequestEdit(
   "fa5c8a0b0f492d768749333ad6fcc214c111e967", // signatureRequestId
diff --git a/examples/SignatureRequestEditWithTemplateExample.java b/examples/SignatureRequestEditWithTemplateExample.java
index bcb4128d6..d755e4e03 100644
--- a/examples/SignatureRequestEditWithTemplateExample.java
+++ b/examples/SignatureRequestEditWithTemplateExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class SignatureRequestEditWithTemplateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var signingOptions = new SubSigningOptions();
         signingOptions.defaultType(SubSigningOptions.DefaultTypeEnum.DRAW);
diff --git a/examples/SignatureRequestEditWithTemplateExample.php b/examples/SignatureRequestEditWithTemplateExample.php
index aa8391c3e..a6f2c9f10 100644
--- a/examples/SignatureRequestEditWithTemplateExample.php
+++ b/examples/SignatureRequestEditWithTemplateExample.php
@@ -39,7 +39,7 @@
     ->setName("Cost")
     ->setEditor("Client")
     ->setRequired(true)
-    ->setValue('$20,000');
+    ->setValue("\$20,000");
 
 $custom_fields = [
     $custom_fields_1,
diff --git a/examples/SignatureRequestEditWithTemplateExample.ts b/examples/SignatureRequestEditWithTemplateExample.ts
index 650ce2ff1..f8e8cd074 100644
--- a/examples/SignatureRequestEditWithTemplateExample.ts
+++ b/examples/SignatureRequestEditWithTemplateExample.ts
@@ -6,51 +6,56 @@ const apiCaller = new api.SignatureRequestApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const signingOptions = new models.SubSigningOptions();
-signingOptions.defaultType = models.SubSigningOptions.DefaultTypeEnum.Draw;
-signingOptions.draw = true;
-signingOptions.phone = false;
-signingOptions.type = true;
-signingOptions.upload = true;
-
-const signers1 = new models.SubSignatureRequestTemplateSigner();
-signers1.role = "Client";
-signers1.name = "George";
-signers1.emailAddress = "george@example.com";
+const signingOptions: models.SubSigningOptions = {
+  defaultType: models.SubSigningOptions.DefaultTypeEnum.Draw,
+  draw: true,
+  phone: false,
+  type: true,
+  upload: true,
+};
+
+const signers1: models.SubSignatureRequestTemplateSigner = {
+  role: "Client",
+  name: "George",
+  emailAddress: "george@example.com",
+};
 
 const signers = [
   signers1,
 ];
 
-const ccs1 = new models.SubCC();
-ccs1.role = "Accounting";
-ccs1.emailAddress = "accounting@example.com";
+const ccs1: models.SubCC = {
+  role: "Accounting",
+  emailAddress: "accounting@example.com",
+};
 
 const ccs = [
   ccs1,
 ];
 
-const customFields1 = new models.SubCustomField();
-customFields1.name = "Cost";
-customFields1.editor = "Client";
-customFields1.required = true;
-customFields1.value = "$20,000";
+const customFields1: models.SubCustomField = {
+  name: "Cost",
+  editor: "Client",
+  required: true,
+  value: "$20,000",
+};
 
 const customFields = [
   customFields1,
 ];
 
-const signatureRequestEditWithTemplateRequest = new models.SignatureRequestEditWithTemplateRequest();
-signatureRequestEditWithTemplateRequest.templateIds = [
-  "61a832ff0d8423f91d503e76bfbcc750f7417c78",
-];
-signatureRequestEditWithTemplateRequest.message = "Glad we could come to an agreement.";
-signatureRequestEditWithTemplateRequest.subject = "Purchase Order";
-signatureRequestEditWithTemplateRequest.testMode = true;
-signatureRequestEditWithTemplateRequest.signingOptions = signingOptions;
-signatureRequestEditWithTemplateRequest.signers = signers;
-signatureRequestEditWithTemplateRequest.ccs = ccs;
-signatureRequestEditWithTemplateRequest.customFields = customFields;
+const signatureRequestEditWithTemplateRequest: models.SignatureRequestEditWithTemplateRequest = {
+  templateIds: [
+    "61a832ff0d8423f91d503e76bfbcc750f7417c78",
+  ],
+  message: "Glad we could come to an agreement.",
+  subject: "Purchase Order",
+  testMode: true,
+  signingOptions: signingOptions,
+  signers: signers,
+  ccs: ccs,
+  customFields: customFields,
+};
 
 apiCaller.signatureRequestEditWithTemplate(
   "fa5c8a0b0f492d768749333ad6fcc214c111e967", // signatureRequestId
diff --git a/examples/SignatureRequestFilesAsDataUriExample.java b/examples/SignatureRequestFilesAsDataUriExample.java
index 765fb93ce..a7e5a36e8 100644
--- a/examples/SignatureRequestFilesAsDataUriExample.java
+++ b/examples/SignatureRequestFilesAsDataUriExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class SignatureRequestFilesAsDataUriExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
diff --git a/examples/SignatureRequestFilesAsFileUrlExample.java b/examples/SignatureRequestFilesAsFileUrlExample.java
index 62e253779..2a024ee7d 100644
--- a/examples/SignatureRequestFilesAsFileUrlExample.java
+++ b/examples/SignatureRequestFilesAsFileUrlExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class SignatureRequestFilesAsFileUrlExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
diff --git a/examples/SignatureRequestFilesExample.java b/examples/SignatureRequestFilesExample.java
index 758d2997b..53e828103 100644
--- a/examples/SignatureRequestFilesExample.java
+++ b/examples/SignatureRequestFilesExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class SignatureRequestFilesExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
diff --git a/examples/SignatureRequestGetExample.java b/examples/SignatureRequestGetExample.java
index b93d099d6..dc912723d 100644
--- a/examples/SignatureRequestGetExample.java
+++ b/examples/SignatureRequestGetExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class SignatureRequestGetExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
diff --git a/examples/SignatureRequestListExample.cs b/examples/SignatureRequestListExample.cs
index d5b2bfb9d..8092e5330 100644
--- a/examples/SignatureRequestListExample.cs
+++ b/examples/SignatureRequestListExample.cs
@@ -20,10 +20,8 @@ public static void Run()
         try
         {
             var response = new SignatureRequestApi(config).SignatureRequestList(
-                accountId: null,
                 page: 1,
-                pageSize: 20,
-                query: null
+                pageSize: 20
             );
 
             Console.WriteLine(response);
diff --git a/examples/SignatureRequestListExample.java b/examples/SignatureRequestListExample.java
index 76f018548..72048a036 100644
--- a/examples/SignatureRequestListExample.java
+++ b/examples/SignatureRequestListExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class SignatureRequestListExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
diff --git a/examples/SignatureRequestListExample.php b/examples/SignatureRequestListExample.php
index c11043fcf..9cf737c26 100644
--- a/examples/SignatureRequestListExample.php
+++ b/examples/SignatureRequestListExample.php
@@ -13,10 +13,8 @@
 
 try {
     $response = (new Dropbox\Sign\Api\SignatureRequestApi(config: $config))->signatureRequestList(
-        account_id: null,
         page: 1,
         page_size: 20,
-        query: null,
     );
 
     print_r($response);
diff --git a/examples/SignatureRequestListExample.py b/examples/SignatureRequestListExample.py
index 6d3db2fe3..3255d2cc6 100644
--- a/examples/SignatureRequestListExample.py
+++ b/examples/SignatureRequestListExample.py
@@ -12,10 +12,8 @@
 with ApiClient(configuration) as api_client:
     try:
         response = api.SignatureRequestApi(api_client).signature_request_list(
-            account_id=None,
             page=1,
             page_size=20,
-            query=None,
         )
 
         pprint(response)
diff --git a/examples/SignatureRequestReleaseHoldExample.java b/examples/SignatureRequestReleaseHoldExample.java
index 521794ef1..a7fd42c40 100644
--- a/examples/SignatureRequestReleaseHoldExample.java
+++ b/examples/SignatureRequestReleaseHoldExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class SignatureRequestReleaseHoldExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
diff --git a/examples/SignatureRequestRemindExample.java b/examples/SignatureRequestRemindExample.java
index 23830d9d3..ce292ba16 100644
--- a/examples/SignatureRequestRemindExample.java
+++ b/examples/SignatureRequestRemindExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class SignatureRequestRemindExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var signatureRequestRemindRequest = new SignatureRequestRemindRequest();
         signatureRequestRemindRequest.emailAddress("john@example.com");
diff --git a/examples/SignatureRequestRemindExample.ts b/examples/SignatureRequestRemindExample.ts
index fa558c1d6..4801d7087 100644
--- a/examples/SignatureRequestRemindExample.ts
+++ b/examples/SignatureRequestRemindExample.ts
@@ -6,8 +6,9 @@ const apiCaller = new api.SignatureRequestApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const signatureRequestRemindRequest = new models.SignatureRequestRemindRequest();
-signatureRequestRemindRequest.emailAddress = "john@example.com";
+const signatureRequestRemindRequest: models.SignatureRequestRemindRequest = {
+  emailAddress: "john@example.com",
+};
 
 apiCaller.signatureRequestRemind(
   "fa5c8a0b0f492d768749333ad6fcc214c111e967", // signatureRequestId
diff --git a/examples/SignatureRequestRemoveExample.java b/examples/SignatureRequestRemoveExample.java
index d205e388a..e9b030a26 100644
--- a/examples/SignatureRequestRemoveExample.java
+++ b/examples/SignatureRequestRemoveExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,7 +20,7 @@ public class SignatureRequestRemoveExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
 
         try
         {
diff --git a/examples/SignatureRequestSendExample.java b/examples/SignatureRequestSendExample.java
index 2a57da157..313b895b7 100644
--- a/examples/SignatureRequestSendExample.java
+++ b/examples/SignatureRequestSendExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class SignatureRequestSendExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var fieldOptions = new SubFieldOptions();
         fieldOptions.dateFormat(SubFieldOptions.DateFormatEnum.DD_MM_YYYY);
diff --git a/examples/SignatureRequestSendExample.ts b/examples/SignatureRequestSendExample.ts
index c742336fa..910a66743 100644
--- a/examples/SignatureRequestSendExample.ts
+++ b/examples/SignatureRequestSendExample.ts
@@ -6,50 +6,55 @@ const apiCaller = new api.SignatureRequestApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const fieldOptions = new models.SubFieldOptions();
-fieldOptions.dateFormat = models.SubFieldOptions.DateFormatEnum.DD_MM_YYYY;
-
-const signingOptions = new models.SubSigningOptions();
-signingOptions.defaultType = models.SubSigningOptions.DefaultTypeEnum.Draw;
-signingOptions.draw = true;
-signingOptions.phone = false;
-signingOptions.type = true;
-signingOptions.upload = true;
-
-const signers1 = new models.SubSignatureRequestSigner();
-signers1.name = "Jack";
-signers1.emailAddress = "jack@example.com";
-signers1.order = 0;
-
-const signers2 = new models.SubSignatureRequestSigner();
-signers2.name = "Jill";
-signers2.emailAddress = "jill@example.com";
-signers2.order = 1;
+const fieldOptions: models.SubFieldOptions = {
+  dateFormat: models.SubFieldOptions.DateFormatEnum.DdMmYyyy,
+};
+
+const signingOptions: models.SubSigningOptions = {
+  defaultType: models.SubSigningOptions.DefaultTypeEnum.Draw,
+  draw: true,
+  phone: false,
+  type: true,
+  upload: true,
+};
+
+const signers1: models.SubSignatureRequestSigner = {
+  name: "Jack",
+  emailAddress: "jack@example.com",
+  order: 0,
+};
+
+const signers2: models.SubSignatureRequestSigner = {
+  name: "Jill",
+  emailAddress: "jill@example.com",
+  order: 1,
+};
 
 const signers = [
   signers1,
   signers2,
 ];
 
-const signatureRequestSendRequest = new models.SignatureRequestSendRequest();
-signatureRequestSendRequest.message = "Please sign this NDA and then we can discuss more. Let me know if you\nhave any questions.";
-signatureRequestSendRequest.subject = "The NDA we talked about";
-signatureRequestSendRequest.testMode = true;
-signatureRequestSendRequest.title = "NDA with Acme Co.";
-signatureRequestSendRequest.ccEmailAddresses = [
-  "lawyer1@dropboxsign.com",
-  "lawyer2@dropboxsign.com",
-];
-signatureRequestSendRequest.files = [
-  fs.createReadStream("./example_signature_request.pdf"),
-];
-signatureRequestSendRequest.metadata =   {
-  "custom_id": 1234,
-  "custom_text": "NDA #9"
+const signatureRequestSendRequest: models.SignatureRequestSendRequest = {
+  message: "Please sign this NDA and then we can discuss more. Let me know if you\nhave any questions.",
+  subject: "The NDA we talked about",
+  testMode: true,
+  title: "NDA with Acme Co.",
+  ccEmailAddresses: [
+    "lawyer1@dropboxsign.com",
+    "lawyer2@dropboxsign.com",
+  ],
+  files: [
+    fs.createReadStream("./example_signature_request.pdf"),
+  ],
+  metadata: {
+    "custom_id": 1234,
+    "custom_text": "NDA #9"
+  },
+  fieldOptions: fieldOptions,
+  signingOptions: signingOptions,
+  signers: signers,
 };
-signatureRequestSendRequest.fieldOptions = fieldOptions;
-signatureRequestSendRequest.signingOptions = signingOptions;
-signatureRequestSendRequest.signers = signers;
 
 apiCaller.signatureRequestSend(
   signatureRequestSendRequest,
diff --git a/examples/SignatureRequestSendGroupedSignersExample.java b/examples/SignatureRequestSendGroupedSignersExample.java
index 14d6d0fba..ba078573a 100644
--- a/examples/SignatureRequestSendGroupedSignersExample.java
+++ b/examples/SignatureRequestSendGroupedSignersExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class SignatureRequestSendGroupedSignersExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var groupedSigners2Signers1 = new SubSignatureRequestSigner();
         groupedSigners2Signers1.name("Bob");
diff --git a/examples/SignatureRequestSendGroupedSignersExample.ts b/examples/SignatureRequestSendGroupedSignersExample.ts
index d7414588a..110567251 100644
--- a/examples/SignatureRequestSendGroupedSignersExample.ts
+++ b/examples/SignatureRequestSendGroupedSignersExample.ts
@@ -6,76 +6,85 @@ const apiCaller = new api.SignatureRequestApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const groupedSigners2Signers1 = new models.SubSignatureRequestSigner();
-groupedSigners2Signers1.name = "Bob";
-groupedSigners2Signers1.emailAddress = "bob@example.com";
+const groupedSigners2Signers1: models.SubSignatureRequestSigner = {
+  name: "Bob",
+  emailAddress: "bob@example.com",
+};
 
-const groupedSigners2Signers2 = new models.SubSignatureRequestSigner();
-groupedSigners2Signers2.name = "Charlie";
-groupedSigners2Signers2.emailAddress = "charlie@example.com";
+const groupedSigners2Signers2: models.SubSignatureRequestSigner = {
+  name: "Charlie",
+  emailAddress: "charlie@example.com",
+};
 
 const groupedSigners2Signers = [
   groupedSigners2Signers1,
   groupedSigners2Signers2,
 ];
 
-const groupedSigners1Signers1 = new models.SubSignatureRequestSigner();
-groupedSigners1Signers1.name = "Jack";
-groupedSigners1Signers1.emailAddress = "jack@example.com";
+const groupedSigners1Signers1: models.SubSignatureRequestSigner = {
+  name: "Jack",
+  emailAddress: "jack@example.com",
+};
 
-const groupedSigners1Signers2 = new models.SubSignatureRequestSigner();
-groupedSigners1Signers2.name = "Jill";
-groupedSigners1Signers2.emailAddress = "jill@example.com";
+const groupedSigners1Signers2: models.SubSignatureRequestSigner = {
+  name: "Jill",
+  emailAddress: "jill@example.com",
+};
 
 const groupedSigners1Signers = [
   groupedSigners1Signers1,
   groupedSigners1Signers2,
 ];
 
-const fieldOptions = new models.SubFieldOptions();
-fieldOptions.dateFormat = models.SubFieldOptions.DateFormatEnum.DD_MM_YYYY;
+const fieldOptions: models.SubFieldOptions = {
+  dateFormat: models.SubFieldOptions.DateFormatEnum.DdMmYyyy,
+};
 
-const signingOptions = new models.SubSigningOptions();
-signingOptions.defaultType = models.SubSigningOptions.DefaultTypeEnum.Draw;
-signingOptions.draw = true;
-signingOptions.phone = false;
-signingOptions.type = true;
-signingOptions.upload = true;
+const signingOptions: models.SubSigningOptions = {
+  defaultType: models.SubSigningOptions.DefaultTypeEnum.Draw,
+  draw: true,
+  phone: false,
+  type: true,
+  upload: true,
+};
 
-const groupedSigners1 = new models.SubSignatureRequestGroupedSigners();
-groupedSigners1.group = "Group #1";
-groupedSigners1.order = 0;
-groupedSigners1.signers = groupedSigners1Signers;
+const groupedSigners1: models.SubSignatureRequestGroupedSigners = {
+  group: "Group #1",
+  order: 0,
+  signers: groupedSigners1Signers,
+};
 
-const groupedSigners2 = new models.SubSignatureRequestGroupedSigners();
-groupedSigners2.group = "Group #2";
-groupedSigners2.order = 1;
-groupedSigners2.signers = groupedSigners2Signers;
+const groupedSigners2: models.SubSignatureRequestGroupedSigners = {
+  group: "Group #2",
+  order: 1,
+  signers: groupedSigners2Signers,
+};
 
 const groupedSigners = [
   groupedSigners1,
   groupedSigners2,
 ];
 
-const signatureRequestSendRequest = new models.SignatureRequestSendRequest();
-signatureRequestSendRequest.message = "Please sign this NDA and then we can discuss more. Let me know if you\nhave any questions.";
-signatureRequestSendRequest.subject = "The NDA we talked about";
-signatureRequestSendRequest.testMode = true;
-signatureRequestSendRequest.title = "NDA with Acme Co.";
-signatureRequestSendRequest.fileUrls = [
-  "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
-];
-signatureRequestSendRequest.ccEmailAddresses = [
-  "lawyer1@dropboxsign.com",
-  "lawyer2@dropboxsign.com",
-];
-signatureRequestSendRequest.metadata =   {
-  "custom_id": 1234,
-  "custom_text": "NDA #9"
+const signatureRequestSendRequest: models.SignatureRequestSendRequest = {
+  message: "Please sign this NDA and then we can discuss more. Let me know if you\nhave any questions.",
+  subject: "The NDA we talked about",
+  testMode: true,
+  title: "NDA with Acme Co.",
+  fileUrls: [
+    "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
+  ],
+  ccEmailAddresses: [
+    "lawyer1@dropboxsign.com",
+    "lawyer2@dropboxsign.com",
+  ],
+  metadata: {
+    "custom_id": 1234,
+    "custom_text": "NDA #9"
+  },
+  fieldOptions: fieldOptions,
+  signingOptions: signingOptions,
+  groupedSigners: groupedSigners,
 };
-signatureRequestSendRequest.fieldOptions = fieldOptions;
-signatureRequestSendRequest.signingOptions = signingOptions;
-signatureRequestSendRequest.groupedSigners = groupedSigners;
 
 apiCaller.signatureRequestSend(
   signatureRequestSendRequest,
diff --git a/examples/SignatureRequestSendWithTemplateExample.java b/examples/SignatureRequestSendWithTemplateExample.java
index fe3a4ce83..f44a67ed9 100644
--- a/examples/SignatureRequestSendWithTemplateExample.java
+++ b/examples/SignatureRequestSendWithTemplateExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class SignatureRequestSendWithTemplateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var signingOptions = new SubSigningOptions();
         signingOptions.defaultType(SubSigningOptions.DefaultTypeEnum.DRAW);
diff --git a/examples/SignatureRequestSendWithTemplateExample.php b/examples/SignatureRequestSendWithTemplateExample.php
index 7c9963cf3..d68205392 100644
--- a/examples/SignatureRequestSendWithTemplateExample.php
+++ b/examples/SignatureRequestSendWithTemplateExample.php
@@ -39,7 +39,7 @@
     ->setName("Cost")
     ->setEditor("Client")
     ->setRequired(true)
-    ->setValue('$20,000');
+    ->setValue("\$20,000");
 
 $custom_fields = [
     $custom_fields_1,
diff --git a/examples/SignatureRequestSendWithTemplateExample.ts b/examples/SignatureRequestSendWithTemplateExample.ts
index 181e37a35..88219107a 100644
--- a/examples/SignatureRequestSendWithTemplateExample.ts
+++ b/examples/SignatureRequestSendWithTemplateExample.ts
@@ -6,51 +6,56 @@ const apiCaller = new api.SignatureRequestApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const signingOptions = new models.SubSigningOptions();
-signingOptions.defaultType = models.SubSigningOptions.DefaultTypeEnum.Draw;
-signingOptions.draw = true;
-signingOptions.phone = false;
-signingOptions.type = true;
-signingOptions.upload = true;
-
-const signers1 = new models.SubSignatureRequestTemplateSigner();
-signers1.role = "Client";
-signers1.name = "George";
-signers1.emailAddress = "george@example.com";
+const signingOptions: models.SubSigningOptions = {
+  defaultType: models.SubSigningOptions.DefaultTypeEnum.Draw,
+  draw: true,
+  phone: false,
+  type: true,
+  upload: true,
+};
+
+const signers1: models.SubSignatureRequestTemplateSigner = {
+  role: "Client",
+  name: "George",
+  emailAddress: "george@example.com",
+};
 
 const signers = [
   signers1,
 ];
 
-const ccs1 = new models.SubCC();
-ccs1.role = "Accounting";
-ccs1.emailAddress = "accounting@example.com";
+const ccs1: models.SubCC = {
+  role: "Accounting",
+  emailAddress: "accounting@example.com",
+};
 
 const ccs = [
   ccs1,
 ];
 
-const customFields1 = new models.SubCustomField();
-customFields1.name = "Cost";
-customFields1.editor = "Client";
-customFields1.required = true;
-customFields1.value = "$20,000";
+const customFields1: models.SubCustomField = {
+  name: "Cost",
+  editor: "Client",
+  required: true,
+  value: "$20,000",
+};
 
 const customFields = [
   customFields1,
 ];
 
-const signatureRequestSendWithTemplateRequest = new models.SignatureRequestSendWithTemplateRequest();
-signatureRequestSendWithTemplateRequest.templateIds = [
-  "61a832ff0d8423f91d503e76bfbcc750f7417c78",
-];
-signatureRequestSendWithTemplateRequest.message = "Glad we could come to an agreement.";
-signatureRequestSendWithTemplateRequest.subject = "Purchase Order";
-signatureRequestSendWithTemplateRequest.testMode = true;
-signatureRequestSendWithTemplateRequest.signingOptions = signingOptions;
-signatureRequestSendWithTemplateRequest.signers = signers;
-signatureRequestSendWithTemplateRequest.ccs = ccs;
-signatureRequestSendWithTemplateRequest.customFields = customFields;
+const signatureRequestSendWithTemplateRequest: models.SignatureRequestSendWithTemplateRequest = {
+  templateIds: [
+    "61a832ff0d8423f91d503e76bfbcc750f7417c78",
+  ],
+  message: "Glad we could come to an agreement.",
+  subject: "Purchase Order",
+  testMode: true,
+  signingOptions: signingOptions,
+  signers: signers,
+  ccs: ccs,
+  customFields: customFields,
+};
 
 apiCaller.signatureRequestSendWithTemplate(
   signatureRequestSendWithTemplateRequest,
diff --git a/examples/SignatureRequestUpdateExample.java b/examples/SignatureRequestUpdateExample.java
index ef9873326..3500c76c5 100644
--- a/examples/SignatureRequestUpdateExample.java
+++ b/examples/SignatureRequestUpdateExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class SignatureRequestUpdateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var signatureRequestUpdateRequest = new SignatureRequestUpdateRequest();
         signatureRequestUpdateRequest.signatureId("2f9781e1a8e2045224d808c153c2e1d3df6f8f2f");
diff --git a/examples/SignatureRequestUpdateExample.ts b/examples/SignatureRequestUpdateExample.ts
index fa02e0345..8464618cb 100644
--- a/examples/SignatureRequestUpdateExample.ts
+++ b/examples/SignatureRequestUpdateExample.ts
@@ -6,9 +6,10 @@ const apiCaller = new api.SignatureRequestApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const signatureRequestUpdateRequest = new models.SignatureRequestUpdateRequest();
-signatureRequestUpdateRequest.signatureId = "2f9781e1a8e2045224d808c153c2e1d3df6f8f2f";
-signatureRequestUpdateRequest.emailAddress = "john@example.com";
+const signatureRequestUpdateRequest: models.SignatureRequestUpdateRequest = {
+  signatureId: "2f9781e1a8e2045224d808c153c2e1d3df6f8f2f",
+  emailAddress: "john@example.com",
+};
 
 apiCaller.signatureRequestUpdate(
   "fa5c8a0b0f492d768749333ad6fcc214c111e967", // signatureRequestId
diff --git a/examples/TeamAddMemberAccountIdExample.java b/examples/TeamAddMemberAccountIdExample.java
index cdeea5ec5..1aea5849a 100644
--- a/examples/TeamAddMemberAccountIdExample.java
+++ b/examples/TeamAddMemberAccountIdExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class TeamAddMemberAccountIdExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var teamAddMemberRequest = new TeamAddMemberRequest();
         teamAddMemberRequest.accountId("f57db65d3f933b5316d398057a36176831451a35");
diff --git a/examples/TeamAddMemberAccountIdExample.ts b/examples/TeamAddMemberAccountIdExample.ts
index 6aedbc340..1f2190b26 100644
--- a/examples/TeamAddMemberAccountIdExample.ts
+++ b/examples/TeamAddMemberAccountIdExample.ts
@@ -6,8 +6,9 @@ const apiCaller = new api.TeamApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const teamAddMemberRequest = new models.TeamAddMemberRequest();
-teamAddMemberRequest.accountId = "f57db65d3f933b5316d398057a36176831451a35";
+const teamAddMemberRequest: models.TeamAddMemberRequest = {
+  accountId: "f57db65d3f933b5316d398057a36176831451a35",
+};
 
 apiCaller.teamAddMember(
   teamAddMemberRequest,
diff --git a/examples/TeamAddMemberExample.java b/examples/TeamAddMemberExample.java
index 788cc3bd0..6e3af4073 100644
--- a/examples/TeamAddMemberExample.java
+++ b/examples/TeamAddMemberExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class TeamAddMemberExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var teamAddMemberRequest = new TeamAddMemberRequest();
         teamAddMemberRequest.emailAddress("george@example.com");
diff --git a/examples/TeamAddMemberExample.ts b/examples/TeamAddMemberExample.ts
index 0ffde9292..b781f2967 100644
--- a/examples/TeamAddMemberExample.ts
+++ b/examples/TeamAddMemberExample.ts
@@ -6,8 +6,9 @@ const apiCaller = new api.TeamApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const teamAddMemberRequest = new models.TeamAddMemberRequest();
-teamAddMemberRequest.emailAddress = "george@example.com";
+const teamAddMemberRequest: models.TeamAddMemberRequest = {
+  emailAddress: "george@example.com",
+};
 
 apiCaller.teamAddMember(
   teamAddMemberRequest,
diff --git a/examples/TeamCreateExample.java b/examples/TeamCreateExample.java
index 0b72d53e2..ecfe2329d 100644
--- a/examples/TeamCreateExample.java
+++ b/examples/TeamCreateExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class TeamCreateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var teamCreateRequest = new TeamCreateRequest();
         teamCreateRequest.name("New Team Name");
diff --git a/examples/TeamCreateExample.ts b/examples/TeamCreateExample.ts
index 22ad05f83..03431e028 100644
--- a/examples/TeamCreateExample.ts
+++ b/examples/TeamCreateExample.ts
@@ -6,8 +6,9 @@ const apiCaller = new api.TeamApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const teamCreateRequest = new models.TeamCreateRequest();
-teamCreateRequest.name = "New Team Name";
+const teamCreateRequest: models.TeamCreateRequest = {
+  name: "New Team Name",
+};
 
 apiCaller.teamCreate(
   teamCreateRequest,
diff --git a/examples/TeamDeleteExample.java b/examples/TeamDeleteExample.java
index f39d1324c..076a2e520 100644
--- a/examples/TeamDeleteExample.java
+++ b/examples/TeamDeleteExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class TeamDeleteExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
diff --git a/examples/TeamGetExample.java b/examples/TeamGetExample.java
index 4356bb8a9..8ab6d7468 100644
--- a/examples/TeamGetExample.java
+++ b/examples/TeamGetExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class TeamGetExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
diff --git a/examples/TeamInfoExample.java b/examples/TeamInfoExample.java
index 8b5718628..6f2c882a0 100644
--- a/examples/TeamInfoExample.java
+++ b/examples/TeamInfoExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class TeamInfoExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
diff --git a/examples/TeamInvitesExample.java b/examples/TeamInvitesExample.java
index 204109825..f6d2b55c1 100644
--- a/examples/TeamInvitesExample.java
+++ b/examples/TeamInvitesExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,12 +20,14 @@ public class TeamInvitesExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
-            var response = new TeamApi(config).teamInvites();
+            var response = new TeamApi(config).teamInvites(
+                null // emailAddress
+            );
 
             System.out.println(response);
         } catch (ApiException e) {
diff --git a/examples/TeamMembersExample.java b/examples/TeamMembersExample.java
index bc709c951..74999477f 100644
--- a/examples/TeamMembersExample.java
+++ b/examples/TeamMembersExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class TeamMembersExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
diff --git a/examples/TeamRemoveMemberAccountIdExample.java b/examples/TeamRemoveMemberAccountIdExample.java
index 85c46ee65..d2d4dede2 100644
--- a/examples/TeamRemoveMemberAccountIdExample.java
+++ b/examples/TeamRemoveMemberAccountIdExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class TeamRemoveMemberAccountIdExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var teamRemoveMemberRequest = new TeamRemoveMemberRequest();
         teamRemoveMemberRequest.accountId("f57db65d3f933b5316d398057a36176831451a35");
diff --git a/examples/TeamRemoveMemberAccountIdExample.ts b/examples/TeamRemoveMemberAccountIdExample.ts
index e170817b3..cf5e42a72 100644
--- a/examples/TeamRemoveMemberAccountIdExample.ts
+++ b/examples/TeamRemoveMemberAccountIdExample.ts
@@ -6,8 +6,9 @@ const apiCaller = new api.TeamApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const teamRemoveMemberRequest = new models.TeamRemoveMemberRequest();
-teamRemoveMemberRequest.accountId = "f57db65d3f933b5316d398057a36176831451a35";
+const teamRemoveMemberRequest: models.TeamRemoveMemberRequest = {
+  accountId: "f57db65d3f933b5316d398057a36176831451a35",
+};
 
 apiCaller.teamRemoveMember(
   teamRemoveMemberRequest,
diff --git a/examples/TeamRemoveMemberExample.java b/examples/TeamRemoveMemberExample.java
index 40938583f..e68187a2f 100644
--- a/examples/TeamRemoveMemberExample.java
+++ b/examples/TeamRemoveMemberExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class TeamRemoveMemberExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var teamRemoveMemberRequest = new TeamRemoveMemberRequest();
         teamRemoveMemberRequest.emailAddress("teammate@dropboxsign.com");
diff --git a/examples/TeamRemoveMemberExample.ts b/examples/TeamRemoveMemberExample.ts
index efd33d694..3f12efc31 100644
--- a/examples/TeamRemoveMemberExample.ts
+++ b/examples/TeamRemoveMemberExample.ts
@@ -6,9 +6,10 @@ const apiCaller = new api.TeamApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const teamRemoveMemberRequest = new models.TeamRemoveMemberRequest();
-teamRemoveMemberRequest.emailAddress = "teammate@dropboxsign.com";
-teamRemoveMemberRequest.newOwnerEmailAddress = "new_teammate@dropboxsign.com";
+const teamRemoveMemberRequest: models.TeamRemoveMemberRequest = {
+  emailAddress: "teammate@dropboxsign.com",
+  newOwnerEmailAddress: "new_teammate@dropboxsign.com",
+};
 
 apiCaller.teamRemoveMember(
   teamRemoveMemberRequest,
diff --git a/examples/TeamSubTeamsExample.java b/examples/TeamSubTeamsExample.java
index f0ee98cf1..4ab0bc0d7 100644
--- a/examples/TeamSubTeamsExample.java
+++ b/examples/TeamSubTeamsExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class TeamSubTeamsExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
diff --git a/examples/TeamUpdateExample.java b/examples/TeamUpdateExample.java
index 54f6bf2a1..e81903238 100644
--- a/examples/TeamUpdateExample.java
+++ b/examples/TeamUpdateExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class TeamUpdateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var teamUpdateRequest = new TeamUpdateRequest();
         teamUpdateRequest.name("New Team Name");
diff --git a/examples/TeamUpdateExample.ts b/examples/TeamUpdateExample.ts
index 0e32bcdd4..748a4adbd 100644
--- a/examples/TeamUpdateExample.ts
+++ b/examples/TeamUpdateExample.ts
@@ -6,8 +6,9 @@ const apiCaller = new api.TeamApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const teamUpdateRequest = new models.TeamUpdateRequest();
-teamUpdateRequest.name = "New Team Name";
+const teamUpdateRequest: models.TeamUpdateRequest = {
+  name: "New Team Name",
+};
 
 apiCaller.teamUpdate(
   teamUpdateRequest,
diff --git a/examples/TemplateAddUserExample.java b/examples/TemplateAddUserExample.java
index 144cb00ef..3649e46f4 100644
--- a/examples/TemplateAddUserExample.java
+++ b/examples/TemplateAddUserExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class TemplateAddUserExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var templateAddUserRequest = new TemplateAddUserRequest();
         templateAddUserRequest.emailAddress("george@dropboxsign.com");
diff --git a/examples/TemplateAddUserExample.ts b/examples/TemplateAddUserExample.ts
index f801c3e65..b8bf1a557 100644
--- a/examples/TemplateAddUserExample.ts
+++ b/examples/TemplateAddUserExample.ts
@@ -6,8 +6,9 @@ const apiCaller = new api.TemplateApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const templateAddUserRequest = new models.TemplateAddUserRequest();
-templateAddUserRequest.emailAddress = "george@dropboxsign.com";
+const templateAddUserRequest: models.TemplateAddUserRequest = {
+  emailAddress: "george@dropboxsign.com",
+};
 
 apiCaller.templateAddUser(
   "f57db65d3f933b5316d398057a36176831451a35", // templateId
diff --git a/examples/TemplateCreateEmbeddedDraftExample.java b/examples/TemplateCreateEmbeddedDraftExample.java
index cb8c9ce12..bf7c9720d 100644
--- a/examples/TemplateCreateEmbeddedDraftExample.java
+++ b/examples/TemplateCreateEmbeddedDraftExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class TemplateCreateEmbeddedDraftExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var fieldOptions = new SubFieldOptions();
         fieldOptions.dateFormat(SubFieldOptions.DateFormatEnum.DD_MM_YYYY);
diff --git a/examples/TemplateCreateEmbeddedDraftExample.ts b/examples/TemplateCreateEmbeddedDraftExample.ts
index 6371fcd18..300b1f618 100644
--- a/examples/TemplateCreateEmbeddedDraftExample.ts
+++ b/examples/TemplateCreateEmbeddedDraftExample.ts
@@ -6,50 +6,56 @@ const apiCaller = new api.TemplateApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const fieldOptions = new models.SubFieldOptions();
-fieldOptions.dateFormat = models.SubFieldOptions.DateFormatEnum.DD_MM_YYYY;
+const fieldOptions: models.SubFieldOptions = {
+  dateFormat: models.SubFieldOptions.DateFormatEnum.DdMmYyyy,
+};
 
-const mergeFields1 = new models.SubMergeField();
-mergeFields1.name = "Full Name";
-mergeFields1.type = models.SubMergeField.TypeEnum.Text;
+const mergeFields1: models.SubMergeField = {
+  name: "Full Name",
+  type: models.SubMergeField.TypeEnum.Text,
+};
 
-const mergeFields2 = new models.SubMergeField();
-mergeFields2.name = "Is Registered?";
-mergeFields2.type = models.SubMergeField.TypeEnum.Checkbox;
+const mergeFields2: models.SubMergeField = {
+  name: "Is Registered?",
+  type: models.SubMergeField.TypeEnum.Checkbox,
+};
 
 const mergeFields = [
   mergeFields1,
   mergeFields2,
 ];
 
-const signerRoles1 = new models.SubTemplateRole();
-signerRoles1.name = "Client";
-signerRoles1.order = 0;
+const signerRoles1: models.SubTemplateRole = {
+  name: "Client",
+  order: 0,
+};
 
-const signerRoles2 = new models.SubTemplateRole();
-signerRoles2.name = "Witness";
-signerRoles2.order = 1;
+const signerRoles2: models.SubTemplateRole = {
+  name: "Witness",
+  order: 1,
+};
 
 const signerRoles = [
   signerRoles1,
   signerRoles2,
 ];
 
-const templateCreateEmbeddedDraftRequest = new models.TemplateCreateEmbeddedDraftRequest();
-templateCreateEmbeddedDraftRequest.clientId = "37dee8d8440c66d54cfa05d92c160882";
-templateCreateEmbeddedDraftRequest.message = "For your approval";
-templateCreateEmbeddedDraftRequest.subject = "Please sign this document";
-templateCreateEmbeddedDraftRequest.testMode = true;
-templateCreateEmbeddedDraftRequest.title = "Test Template";
-templateCreateEmbeddedDraftRequest.ccRoles = [
-  "Manager",
-];
-templateCreateEmbeddedDraftRequest.files = [
-  fs.createReadStream("./example_signature_request.pdf"),
-];
-templateCreateEmbeddedDraftRequest.fieldOptions = fieldOptions;
-templateCreateEmbeddedDraftRequest.mergeFields = mergeFields;
-templateCreateEmbeddedDraftRequest.signerRoles = signerRoles;
+const templateCreateEmbeddedDraftRequest: models.TemplateCreateEmbeddedDraftRequest = {
+  clientId: "37dee8d8440c66d54cfa05d92c160882",
+  message: "For your approval",
+  subject: "Please sign this document",
+  testMode: true,
+  title: "Test Template",
+  ccRoles: [
+    "Manager",
+  ],
+  files: [
+    fs.createReadStream("./example_signature_request.pdf"),
+  ],
+  fieldOptions: fieldOptions,
+  mergeFields: mergeFields,
+  signerRoles: signerRoles,
+};
 
 apiCaller.templateCreateEmbeddedDraft(
   templateCreateEmbeddedDraftRequest,
diff --git a/examples/TemplateCreateEmbeddedDraftFormFieldGroupsExample.java b/examples/TemplateCreateEmbeddedDraftFormFieldGroupsExample.java
index 61c6fc967..1a7ff9bb4 100644
--- a/examples/TemplateCreateEmbeddedDraftFormFieldGroupsExample.java
+++ b/examples/TemplateCreateEmbeddedDraftFormFieldGroupsExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class TemplateCreateEmbeddedDraftFormFieldGroupsExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var fieldOptions = new SubFieldOptions();
         fieldOptions.dateFormat(SubFieldOptions.DateFormatEnum.DD_MM_YYYY);
diff --git a/examples/TemplateCreateEmbeddedDraftFormFieldGroupsExample.ts b/examples/TemplateCreateEmbeddedDraftFormFieldGroupsExample.ts
index 5bdb6384f..0f21c2209 100644
--- a/examples/TemplateCreateEmbeddedDraftFormFieldGroupsExample.ts
+++ b/examples/TemplateCreateEmbeddedDraftFormFieldGroupsExample.ts
@@ -6,96 +6,105 @@ const apiCaller = new api.TemplateApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const fieldOptions = new models.SubFieldOptions();
-fieldOptions.dateFormat = models.SubFieldOptions.DateFormatEnum.DD_MM_YYYY;
+const fieldOptions: models.SubFieldOptions = {
+  dateFormat: models.SubFieldOptions.DateFormatEnum.DdMmYyyy,
+};
 
-const formFieldGroups1 = new models.SubFormFieldGroup();
-formFieldGroups1.groupId = "RadioItemGroup1";
-formFieldGroups1.groupLabel = "Radio Item Group 1";
-formFieldGroups1.requirement = "require_0-1";
+const formFieldGroups1: models.SubFormFieldGroup = {
+  groupId: "RadioItemGroup1",
+  groupLabel: "Radio Item Group 1",
+  requirement: "require_0-1",
+};
 
 const formFieldGroups = [
   formFieldGroups1,
 ];
 
-const formFieldsPerDocument1 = new models.SubFormFieldsPerDocumentRadio();
-formFieldsPerDocument1.documentIndex = 0;
-formFieldsPerDocument1.apiId = "uniqueIdHere_1";
-formFieldsPerDocument1.type = "radio";
-formFieldsPerDocument1.required = false;
-formFieldsPerDocument1.signer = "0";
-formFieldsPerDocument1.width = 18;
-formFieldsPerDocument1.height = 18;
-formFieldsPerDocument1.x = 112;
-formFieldsPerDocument1.y = 328;
-formFieldsPerDocument1.group = "RadioItemGroup1";
-formFieldsPerDocument1.isChecked = true;
-formFieldsPerDocument1.name = "";
-formFieldsPerDocument1.page = 1;
+const formFieldsPerDocument1: models.SubFormFieldsPerDocumentRadio = {
+  documentIndex: 0,
+  apiId: "uniqueIdHere_1",
+  type: "radio",
+  required: false,
+  signer: "0",
+  width: 18,
+  height: 18,
+  x: 112,
+  y: 328,
+  group: "RadioItemGroup1",
+  isChecked: true,
+  name: "",
+  page: 1,
+};
 
-const formFieldsPerDocument2 = new models.SubFormFieldsPerDocumentRadio();
-formFieldsPerDocument2.documentIndex = 0;
-formFieldsPerDocument2.apiId = "uniqueIdHere_2";
-formFieldsPerDocument2.type = "radio";
-formFieldsPerDocument2.required = false;
-formFieldsPerDocument2.signer = "0";
-formFieldsPerDocument2.width = 18;
-formFieldsPerDocument2.height = 18;
-formFieldsPerDocument2.x = 112;
-formFieldsPerDocument2.y = 370;
-formFieldsPerDocument2.group = "RadioItemGroup1";
-formFieldsPerDocument2.isChecked = false;
-formFieldsPerDocument2.name = "";
-formFieldsPerDocument2.page = 1;
+const formFieldsPerDocument2: models.SubFormFieldsPerDocumentRadio = {
+  documentIndex: 0,
+  apiId: "uniqueIdHere_2",
+  type: "radio",
+  required: false,
+  signer: "0",
+  width: 18,
+  height: 18,
+  x: 112,
+  y: 370,
+  group: "RadioItemGroup1",
+  isChecked: false,
+  name: "",
+  page: 1,
+};
 
 const formFieldsPerDocument = [
   formFieldsPerDocument1,
   formFieldsPerDocument2,
 ];
 
-const mergeFields1 = new models.SubMergeField();
-mergeFields1.name = "Full Name";
-mergeFields1.type = models.SubMergeField.TypeEnum.Text;
+const mergeFields1: models.SubMergeField = {
+  name: "Full Name",
+  type: models.SubMergeField.TypeEnum.Text,
+};
 
-const mergeFields2 = new models.SubMergeField();
-mergeFields2.name = "Is Registered?";
-mergeFields2.type = models.SubMergeField.TypeEnum.Checkbox;
+const mergeFields2: models.SubMergeField = {
+  name: "Is Registered?",
+  type: models.SubMergeField.TypeEnum.Checkbox,
+};
 
 const mergeFields = [
   mergeFields1,
   mergeFields2,
 ];
 
-const signerRoles1 = new models.SubTemplateRole();
-signerRoles1.name = "Client";
-signerRoles1.order = 0;
+const signerRoles1: models.SubTemplateRole = {
+  name: "Client",
+  order: 0,
+};
 
-const signerRoles2 = new models.SubTemplateRole();
-signerRoles2.name = "Witness";
-signerRoles2.order = 1;
+const signerRoles2: models.SubTemplateRole = {
+  name: "Witness",
+  order: 1,
+};
 
 const signerRoles = [
   signerRoles1,
   signerRoles2,
 ];
 
-const templateCreateEmbeddedDraftRequest = new models.TemplateCreateEmbeddedDraftRequest();
-templateCreateEmbeddedDraftRequest.clientId = "37dee8d8440c66d54cfa05d92c160882";
-templateCreateEmbeddedDraftRequest.message = "For your approval";
-templateCreateEmbeddedDraftRequest.subject = "Please sign this document";
-templateCreateEmbeddedDraftRequest.testMode = true;
-templateCreateEmbeddedDraftRequest.title = "Test Template";
-templateCreateEmbeddedDraftRequest.fileUrls = [
-  "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
-];
-templateCreateEmbeddedDraftRequest.ccRoles = [
-  "Manager",
-];
-templateCreateEmbeddedDraftRequest.fieldOptions = fieldOptions;
-templateCreateEmbeddedDraftRequest.formFieldGroups = formFieldGroups;
-templateCreateEmbeddedDraftRequest.formFieldsPerDocument = formFieldsPerDocument;
-templateCreateEmbeddedDraftRequest.mergeFields = mergeFields;
-templateCreateEmbeddedDraftRequest.signerRoles = signerRoles;
+const templateCreateEmbeddedDraftRequest: models.TemplateCreateEmbeddedDraftRequest = {
+  clientId: "37dee8d8440c66d54cfa05d92c160882",
+  message: "For your approval",
+  subject: "Please sign this document",
+  testMode: true,
+  title: "Test Template",
+  fileUrls: [
+    "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
+  ],
+  ccRoles: [
+    "Manager",
+  ],
+  fieldOptions: fieldOptions,
+  formFieldGroups: formFieldGroups,
+  formFieldsPerDocument: formFieldsPerDocument,
+  mergeFields: mergeFields,
+  signerRoles: signerRoles,
+};
 
 apiCaller.templateCreateEmbeddedDraft(
   templateCreateEmbeddedDraftRequest,
diff --git a/examples/TemplateCreateEmbeddedDraftFormFieldRulesExample.java b/examples/TemplateCreateEmbeddedDraftFormFieldRulesExample.java
index 7bb877263..71b441944 100644
--- a/examples/TemplateCreateEmbeddedDraftFormFieldRulesExample.java
+++ b/examples/TemplateCreateEmbeddedDraftFormFieldRulesExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class TemplateCreateEmbeddedDraftFormFieldRulesExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var formFieldRules1Triggers1 = new SubFormFieldRuleTrigger();
         formFieldRules1Triggers1.id("uniqueIdHere_1");
diff --git a/examples/TemplateCreateEmbeddedDraftFormFieldRulesExample.ts b/examples/TemplateCreateEmbeddedDraftFormFieldRulesExample.ts
index ce20fc91d..6ff77313f 100644
--- a/examples/TemplateCreateEmbeddedDraftFormFieldRulesExample.ts
+++ b/examples/TemplateCreateEmbeddedDraftFormFieldRulesExample.ts
@@ -6,112 +6,123 @@ const apiCaller = new api.TemplateApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const formFieldRules1Triggers1 = new models.SubFormFieldRuleTrigger();
-formFieldRules1Triggers1.id = "uniqueIdHere_1";
-formFieldRules1Triggers1.operator = models.SubFormFieldRuleTrigger.OperatorEnum.Is;
-formFieldRules1Triggers1.value = "foo";
+const formFieldRules1Triggers1: models.SubFormFieldRuleTrigger = {
+  id: "uniqueIdHere_1",
+  operator: models.SubFormFieldRuleTrigger.OperatorEnum.Is,
+  value: "foo",
+};
 
 const formFieldRules1Triggers = [
   formFieldRules1Triggers1,
 ];
 
-const formFieldRules1Actions1 = new models.SubFormFieldRuleAction();
-formFieldRules1Actions1.hidden = true;
-formFieldRules1Actions1.type = models.SubFormFieldRuleAction.TypeEnum.FieldVisibility;
-formFieldRules1Actions1.fieldId = "uniqueIdHere_2";
+const formFieldRules1Actions1: models.SubFormFieldRuleAction = {
+  hidden: true,
+  type: models.SubFormFieldRuleAction.TypeEnum.FieldVisibility,
+  fieldId: "uniqueIdHere_2",
+};
 
 const formFieldRules1Actions = [
   formFieldRules1Actions1,
 ];
 
-const fieldOptions = new models.SubFieldOptions();
-fieldOptions.dateFormat = models.SubFieldOptions.DateFormatEnum.DD_MM_YYYY;
+const fieldOptions: models.SubFieldOptions = {
+  dateFormat: models.SubFieldOptions.DateFormatEnum.DdMmYyyy,
+};
 
-const formFieldRules1 = new models.SubFormFieldRule();
-formFieldRules1.id = "rule_1";
-formFieldRules1.triggerOperator = "AND";
-formFieldRules1.triggers = formFieldRules1Triggers;
-formFieldRules1.actions = formFieldRules1Actions;
+const formFieldRules1: models.SubFormFieldRule = {
+  id: "rule_1",
+  triggerOperator: "AND",
+  triggers: formFieldRules1Triggers,
+  actions: formFieldRules1Actions,
+};
 
 const formFieldRules = [
   formFieldRules1,
 ];
 
-const formFieldsPerDocument1 = new models.SubFormFieldsPerDocumentText();
-formFieldsPerDocument1.documentIndex = 0;
-formFieldsPerDocument1.apiId = "uniqueIdHere_1";
-formFieldsPerDocument1.type = "text";
-formFieldsPerDocument1.required = true;
-formFieldsPerDocument1.signer = "0";
-formFieldsPerDocument1.width = 100;
-formFieldsPerDocument1.height = 16;
-formFieldsPerDocument1.x = 112;
-formFieldsPerDocument1.y = 328;
-formFieldsPerDocument1.name = "";
-formFieldsPerDocument1.page = 1;
-formFieldsPerDocument1.validationType = models.SubFormFieldsPerDocumentText.ValidationTypeEnum.NumbersOnly;
-
-const formFieldsPerDocument2 = new models.SubFormFieldsPerDocumentSignature();
-formFieldsPerDocument2.documentIndex = 0;
-formFieldsPerDocument2.apiId = "uniqueIdHere_2";
-formFieldsPerDocument2.type = "signature";
-formFieldsPerDocument2.required = true;
-formFieldsPerDocument2.signer = "0";
-formFieldsPerDocument2.width = 120;
-formFieldsPerDocument2.height = 30;
-formFieldsPerDocument2.x = 530;
-formFieldsPerDocument2.y = 415;
-formFieldsPerDocument2.name = "";
-formFieldsPerDocument2.page = 1;
+const formFieldsPerDocument1: models.SubFormFieldsPerDocumentText = {
+  documentIndex: 0,
+  apiId: "uniqueIdHere_1",
+  type: "text",
+  required: true,
+  signer: "0",
+  width: 100,
+  height: 16,
+  x: 112,
+  y: 328,
+  name: "",
+  page: 1,
+  validationType: models.SubFormFieldsPerDocumentText.ValidationTypeEnum.NumbersOnly,
+};
+
+const formFieldsPerDocument2: models.SubFormFieldsPerDocumentSignature = {
+  documentIndex: 0,
+  apiId: "uniqueIdHere_2",
+  type: "signature",
+  required: true,
+  signer: "0",
+  width: 120,
+  height: 30,
+  x: 530,
+  y: 415,
+  name: "",
+  page: 1,
+};
 
 const formFieldsPerDocument = [
   formFieldsPerDocument1,
   formFieldsPerDocument2,
 ];
 
-const mergeFields1 = new models.SubMergeField();
-mergeFields1.name = "Full Name";
-mergeFields1.type = models.SubMergeField.TypeEnum.Text;
+const mergeFields1: models.SubMergeField = {
+  name: "Full Name",
+  type: models.SubMergeField.TypeEnum.Text,
+};
 
-const mergeFields2 = new models.SubMergeField();
-mergeFields2.name = "Is Registered?";
-mergeFields2.type = models.SubMergeField.TypeEnum.Checkbox;
+const mergeFields2: models.SubMergeField = {
+  name: "Is Registered?",
+  type: models.SubMergeField.TypeEnum.Checkbox,
+};
 
 const mergeFields = [
   mergeFields1,
   mergeFields2,
 ];
 
-const signerRoles1 = new models.SubTemplateRole();
-signerRoles1.name = "Client";
-signerRoles1.order = 0;
+const signerRoles1: models.SubTemplateRole = {
+  name: "Client",
+  order: 0,
+};
 
-const signerRoles2 = new models.SubTemplateRole();
-signerRoles2.name = "Witness";
-signerRoles2.order = 1;
+const signerRoles2: models.SubTemplateRole = {
+  name: "Witness",
+  order: 1,
+};
 
 const signerRoles = [
   signerRoles1,
   signerRoles2,
 ];
 
-const templateCreateEmbeddedDraftRequest = new models.TemplateCreateEmbeddedDraftRequest();
-templateCreateEmbeddedDraftRequest.clientId = "37dee8d8440c66d54cfa05d92c160882";
-templateCreateEmbeddedDraftRequest.message = "For your approval";
-templateCreateEmbeddedDraftRequest.subject = "Please sign this document";
-templateCreateEmbeddedDraftRequest.testMode = true;
-templateCreateEmbeddedDraftRequest.title = "Test Template";
-templateCreateEmbeddedDraftRequest.fileUrls = [
-  "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
-];
-templateCreateEmbeddedDraftRequest.ccRoles = [
-  "Manager",
-];
-templateCreateEmbeddedDraftRequest.fieldOptions = fieldOptions;
-templateCreateEmbeddedDraftRequest.formFieldRules = formFieldRules;
-templateCreateEmbeddedDraftRequest.formFieldsPerDocument = formFieldsPerDocument;
-templateCreateEmbeddedDraftRequest.mergeFields = mergeFields;
-templateCreateEmbeddedDraftRequest.signerRoles = signerRoles;
+const templateCreateEmbeddedDraftRequest: models.TemplateCreateEmbeddedDraftRequest = {
+  clientId: "37dee8d8440c66d54cfa05d92c160882",
+  message: "For your approval",
+  subject: "Please sign this document",
+  testMode: true,
+  title: "Test Template",
+  fileUrls: [
+    "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
+  ],
+  ccRoles: [
+    "Manager",
+  ],
+  fieldOptions: fieldOptions,
+  formFieldRules: formFieldRules,
+  formFieldsPerDocument: formFieldsPerDocument,
+  mergeFields: mergeFields,
+  signerRoles: signerRoles,
+};
 
 apiCaller.templateCreateEmbeddedDraft(
   templateCreateEmbeddedDraftRequest,
diff --git a/examples/TemplateCreateEmbeddedDraftFormFieldsPerDocumentExample.java b/examples/TemplateCreateEmbeddedDraftFormFieldsPerDocumentExample.java
index 38e8fccbc..8ac9bae17 100644
--- a/examples/TemplateCreateEmbeddedDraftFormFieldsPerDocumentExample.java
+++ b/examples/TemplateCreateEmbeddedDraftFormFieldsPerDocumentExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class TemplateCreateEmbeddedDraftFormFieldsPerDocumentExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var fieldOptions = new SubFieldOptions();
         fieldOptions.dateFormat(SubFieldOptions.DateFormatEnum.DD_MM_YYYY);
diff --git a/examples/TemplateCreateEmbeddedDraftFormFieldsPerDocumentExample.ts b/examples/TemplateCreateEmbeddedDraftFormFieldsPerDocumentExample.ts
index 0ce2cbcd4..e78591849 100644
--- a/examples/TemplateCreateEmbeddedDraftFormFieldsPerDocumentExample.ts
+++ b/examples/TemplateCreateEmbeddedDraftFormFieldsPerDocumentExample.ts
@@ -6,84 +6,92 @@ const apiCaller = new api.TemplateApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const fieldOptions = new models.SubFieldOptions();
-fieldOptions.dateFormat = models.SubFieldOptions.DateFormatEnum.DD_MM_YYYY;
+const fieldOptions: models.SubFieldOptions = {
+  dateFormat: models.SubFieldOptions.DateFormatEnum.DdMmYyyy,
+};
 
-const formFieldsPerDocument1 = new models.SubFormFieldsPerDocumentText();
-formFieldsPerDocument1.documentIndex = 0;
-formFieldsPerDocument1.apiId = "uniqueIdHere_1";
-formFieldsPerDocument1.type = "text";
-formFieldsPerDocument1.required = true;
-formFieldsPerDocument1.signer = "1";
-formFieldsPerDocument1.width = 100;
-formFieldsPerDocument1.height = 16;
-formFieldsPerDocument1.x = 112;
-formFieldsPerDocument1.y = 328;
-formFieldsPerDocument1.name = "";
-formFieldsPerDocument1.page = 1;
-formFieldsPerDocument1.placeholder = "";
-formFieldsPerDocument1.validationType = models.SubFormFieldsPerDocumentText.ValidationTypeEnum.NumbersOnly;
+const formFieldsPerDocument1: models.SubFormFieldsPerDocumentText = {
+  documentIndex: 0,
+  apiId: "uniqueIdHere_1",
+  type: "text",
+  required: true,
+  signer: "1",
+  width: 100,
+  height: 16,
+  x: 112,
+  y: 328,
+  name: "",
+  page: 1,
+  placeholder: "",
+  validationType: models.SubFormFieldsPerDocumentText.ValidationTypeEnum.NumbersOnly,
+};
 
-const formFieldsPerDocument2 = new models.SubFormFieldsPerDocumentSignature();
-formFieldsPerDocument2.documentIndex = 0;
-formFieldsPerDocument2.apiId = "uniqueIdHere_2";
-formFieldsPerDocument2.type = "signature";
-formFieldsPerDocument2.required = true;
-formFieldsPerDocument2.signer = "0";
-formFieldsPerDocument2.width = 120;
-formFieldsPerDocument2.height = 30;
-formFieldsPerDocument2.x = 530;
-formFieldsPerDocument2.y = 415;
-formFieldsPerDocument2.name = "";
-formFieldsPerDocument2.page = 1;
+const formFieldsPerDocument2: models.SubFormFieldsPerDocumentSignature = {
+  documentIndex: 0,
+  apiId: "uniqueIdHere_2",
+  type: "signature",
+  required: true,
+  signer: "0",
+  width: 120,
+  height: 30,
+  x: 530,
+  y: 415,
+  name: "",
+  page: 1,
+};
 
 const formFieldsPerDocument = [
   formFieldsPerDocument1,
   formFieldsPerDocument2,
 ];
 
-const mergeFields1 = new models.SubMergeField();
-mergeFields1.name = "Full Name";
-mergeFields1.type = models.SubMergeField.TypeEnum.Text;
+const mergeFields1: models.SubMergeField = {
+  name: "Full Name",
+  type: models.SubMergeField.TypeEnum.Text,
+};
 
-const mergeFields2 = new models.SubMergeField();
-mergeFields2.name = "Is Registered?";
-mergeFields2.type = models.SubMergeField.TypeEnum.Checkbox;
+const mergeFields2: models.SubMergeField = {
+  name: "Is Registered?",
+  type: models.SubMergeField.TypeEnum.Checkbox,
+};
 
 const mergeFields = [
   mergeFields1,
   mergeFields2,
 ];
 
-const signerRoles1 = new models.SubTemplateRole();
-signerRoles1.name = "Client";
-signerRoles1.order = 0;
+const signerRoles1: models.SubTemplateRole = {
+  name: "Client",
+  order: 0,
+};
 
-const signerRoles2 = new models.SubTemplateRole();
-signerRoles2.name = "Witness";
-signerRoles2.order = 1;
+const signerRoles2: models.SubTemplateRole = {
+  name: "Witness",
+  order: 1,
+};
 
 const signerRoles = [
   signerRoles1,
   signerRoles2,
 ];
 
-const templateCreateEmbeddedDraftRequest = new models.TemplateCreateEmbeddedDraftRequest();
-templateCreateEmbeddedDraftRequest.clientId = "37dee8d8440c66d54cfa05d92c160882";
-templateCreateEmbeddedDraftRequest.message = "For your approval";
-templateCreateEmbeddedDraftRequest.subject = "Please sign this document";
-templateCreateEmbeddedDraftRequest.testMode = true;
-templateCreateEmbeddedDraftRequest.title = "Test Template";
-templateCreateEmbeddedDraftRequest.fileUrls = [
-  "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
-];
-templateCreateEmbeddedDraftRequest.ccRoles = [
-  "Manager",
-];
-templateCreateEmbeddedDraftRequest.fieldOptions = fieldOptions;
-templateCreateEmbeddedDraftRequest.formFieldsPerDocument = formFieldsPerDocument;
-templateCreateEmbeddedDraftRequest.mergeFields = mergeFields;
-templateCreateEmbeddedDraftRequest.signerRoles = signerRoles;
+const templateCreateEmbeddedDraftRequest: models.TemplateCreateEmbeddedDraftRequest = {
+  clientId: "37dee8d8440c66d54cfa05d92c160882",
+  message: "For your approval",
+  subject: "Please sign this document",
+  testMode: true,
+  title: "Test Template",
+  fileUrls: [
+    "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
+  ],
+  ccRoles: [
+    "Manager",
+  ],
+  fieldOptions: fieldOptions,
+  formFieldsPerDocument: formFieldsPerDocument,
+  mergeFields: mergeFields,
+  signerRoles: signerRoles,
+};
 
 apiCaller.templateCreateEmbeddedDraft(
   templateCreateEmbeddedDraftRequest,
diff --git a/examples/TemplateCreateExample.java b/examples/TemplateCreateExample.java
index b8b8e5150..ebf652f91 100644
--- a/examples/TemplateCreateExample.java
+++ b/examples/TemplateCreateExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class TemplateCreateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var fieldOptions = new SubFieldOptions();
         fieldOptions.dateFormat(SubFieldOptions.DateFormatEnum.DD_MM_YYYY);
diff --git a/examples/TemplateCreateExample.ts b/examples/TemplateCreateExample.ts
index c17b780a9..6046df4b5 100644
--- a/examples/TemplateCreateExample.ts
+++ b/examples/TemplateCreateExample.ts
@@ -6,84 +6,92 @@ const apiCaller = new api.TemplateApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const fieldOptions = new models.SubFieldOptions();
-fieldOptions.dateFormat = models.SubFieldOptions.DateFormatEnum.DD_MM_YYYY;
+const fieldOptions: models.SubFieldOptions = {
+  dateFormat: models.SubFieldOptions.DateFormatEnum.DdMmYyyy,
+};
 
-const signerRoles1 = new models.SubTemplateRole();
-signerRoles1.name = "Client";
-signerRoles1.order = 0;
+const signerRoles1: models.SubTemplateRole = {
+  name: "Client",
+  order: 0,
+};
 
-const signerRoles2 = new models.SubTemplateRole();
-signerRoles2.name = "Witness";
-signerRoles2.order = 1;
+const signerRoles2: models.SubTemplateRole = {
+  name: "Witness",
+  order: 1,
+};
 
 const signerRoles = [
   signerRoles1,
   signerRoles2,
 ];
 
-const formFieldsPerDocument1 = new models.SubFormFieldsPerDocumentText();
-formFieldsPerDocument1.documentIndex = 0;
-formFieldsPerDocument1.apiId = "uniqueIdHere_1";
-formFieldsPerDocument1.type = "text";
-formFieldsPerDocument1.required = true;
-formFieldsPerDocument1.signer = "1";
-formFieldsPerDocument1.width = 100;
-formFieldsPerDocument1.height = 16;
-formFieldsPerDocument1.x = 112;
-formFieldsPerDocument1.y = 328;
-formFieldsPerDocument1.name = "";
-formFieldsPerDocument1.page = 1;
-formFieldsPerDocument1.placeholder = "";
-formFieldsPerDocument1.validationType = models.SubFormFieldsPerDocumentText.ValidationTypeEnum.NumbersOnly;
+const formFieldsPerDocument1: models.SubFormFieldsPerDocumentText = {
+  documentIndex: 0,
+  apiId: "uniqueIdHere_1",
+  type: "text",
+  required: true,
+  signer: "1",
+  width: 100,
+  height: 16,
+  x: 112,
+  y: 328,
+  name: "",
+  page: 1,
+  placeholder: "",
+  validationType: models.SubFormFieldsPerDocumentText.ValidationTypeEnum.NumbersOnly,
+};
 
-const formFieldsPerDocument2 = new models.SubFormFieldsPerDocumentSignature();
-formFieldsPerDocument2.documentIndex = 0;
-formFieldsPerDocument2.apiId = "uniqueIdHere_2";
-formFieldsPerDocument2.type = "signature";
-formFieldsPerDocument2.required = true;
-formFieldsPerDocument2.signer = "0";
-formFieldsPerDocument2.width = 120;
-formFieldsPerDocument2.height = 30;
-formFieldsPerDocument2.x = 530;
-formFieldsPerDocument2.y = 415;
-formFieldsPerDocument2.name = "";
-formFieldsPerDocument2.page = 1;
+const formFieldsPerDocument2: models.SubFormFieldsPerDocumentSignature = {
+  documentIndex: 0,
+  apiId: "uniqueIdHere_2",
+  type: "signature",
+  required: true,
+  signer: "0",
+  width: 120,
+  height: 30,
+  x: 530,
+  y: 415,
+  name: "",
+  page: 1,
+};
 
 const formFieldsPerDocument = [
   formFieldsPerDocument1,
   formFieldsPerDocument2,
 ];
 
-const mergeFields1 = new models.SubMergeField();
-mergeFields1.name = "Full Name";
-mergeFields1.type = models.SubMergeField.TypeEnum.Text;
+const mergeFields1: models.SubMergeField = {
+  name: "Full Name",
+  type: models.SubMergeField.TypeEnum.Text,
+};
 
-const mergeFields2 = new models.SubMergeField();
-mergeFields2.name = "Is Registered?";
-mergeFields2.type = models.SubMergeField.TypeEnum.Checkbox;
+const mergeFields2: models.SubMergeField = {
+  name: "Is Registered?",
+  type: models.SubMergeField.TypeEnum.Checkbox,
+};
 
 const mergeFields = [
   mergeFields1,
   mergeFields2,
 ];
 
-const templateCreateRequest = new models.TemplateCreateRequest();
-templateCreateRequest.clientId = "37dee8d8440c66d54cfa05d92c160882";
-templateCreateRequest.message = "For your approval";
-templateCreateRequest.subject = "Please sign this document";
-templateCreateRequest.testMode = true;
-templateCreateRequest.title = "Test Template";
-templateCreateRequest.ccRoles = [
-  "Manager",
-];
-templateCreateRequest.files = [
-  fs.createReadStream("./example_signature_request.pdf"),
-];
-templateCreateRequest.fieldOptions = fieldOptions;
-templateCreateRequest.signerRoles = signerRoles;
-templateCreateRequest.formFieldsPerDocument = formFieldsPerDocument;
-templateCreateRequest.mergeFields = mergeFields;
+const templateCreateRequest: models.TemplateCreateRequest = {
+  clientId: "37dee8d8440c66d54cfa05d92c160882",
+  message: "For your approval",
+  subject: "Please sign this document",
+  testMode: true,
+  title: "Test Template",
+  ccRoles: [
+    "Manager",
+  ],
+  files: [
+    fs.createReadStream("./example_signature_request.pdf"),
+  ],
+  fieldOptions: fieldOptions,
+  signerRoles: signerRoles,
+  formFieldsPerDocument: formFieldsPerDocument,
+  mergeFields: mergeFields,
+};
 
 apiCaller.templateCreate(
   templateCreateRequest,
diff --git a/examples/TemplateCreateFormFieldGroupsExample.java b/examples/TemplateCreateFormFieldGroupsExample.java
index 08612bd26..62f5094e7 100644
--- a/examples/TemplateCreateFormFieldGroupsExample.java
+++ b/examples/TemplateCreateFormFieldGroupsExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class TemplateCreateFormFieldGroupsExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var fieldOptions = new SubFieldOptions();
         fieldOptions.dateFormat(SubFieldOptions.DateFormatEnum.DD_MM_YYYY);
diff --git a/examples/TemplateCreateFormFieldGroupsExample.ts b/examples/TemplateCreateFormFieldGroupsExample.ts
index e12c74953..845ddaa9b 100644
--- a/examples/TemplateCreateFormFieldGroupsExample.ts
+++ b/examples/TemplateCreateFormFieldGroupsExample.ts
@@ -6,96 +6,105 @@ const apiCaller = new api.TemplateApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const fieldOptions = new models.SubFieldOptions();
-fieldOptions.dateFormat = models.SubFieldOptions.DateFormatEnum.DD_MM_YYYY;
+const fieldOptions: models.SubFieldOptions = {
+  dateFormat: models.SubFieldOptions.DateFormatEnum.DdMmYyyy,
+};
 
-const signerRoles1 = new models.SubTemplateRole();
-signerRoles1.name = "Client";
-signerRoles1.order = 0;
+const signerRoles1: models.SubTemplateRole = {
+  name: "Client",
+  order: 0,
+};
 
-const signerRoles2 = new models.SubTemplateRole();
-signerRoles2.name = "Witness";
-signerRoles2.order = 1;
+const signerRoles2: models.SubTemplateRole = {
+  name: "Witness",
+  order: 1,
+};
 
 const signerRoles = [
   signerRoles1,
   signerRoles2,
 ];
 
-const formFieldsPerDocument1 = new models.SubFormFieldsPerDocumentRadio();
-formFieldsPerDocument1.documentIndex = 0;
-formFieldsPerDocument1.apiId = "uniqueIdHere_1";
-formFieldsPerDocument1.type = "radio";
-formFieldsPerDocument1.required = false;
-formFieldsPerDocument1.signer = "0";
-formFieldsPerDocument1.width = 18;
-formFieldsPerDocument1.height = 18;
-formFieldsPerDocument1.x = 112;
-formFieldsPerDocument1.y = 328;
-formFieldsPerDocument1.group = "RadioItemGroup1";
-formFieldsPerDocument1.isChecked = true;
-formFieldsPerDocument1.name = "";
-formFieldsPerDocument1.page = 1;
+const formFieldsPerDocument1: models.SubFormFieldsPerDocumentRadio = {
+  documentIndex: 0,
+  apiId: "uniqueIdHere_1",
+  type: "radio",
+  required: false,
+  signer: "0",
+  width: 18,
+  height: 18,
+  x: 112,
+  y: 328,
+  group: "RadioItemGroup1",
+  isChecked: true,
+  name: "",
+  page: 1,
+};
 
-const formFieldsPerDocument2 = new models.SubFormFieldsPerDocumentRadio();
-formFieldsPerDocument2.documentIndex = 0;
-formFieldsPerDocument2.apiId = "uniqueIdHere_2";
-formFieldsPerDocument2.type = "radio";
-formFieldsPerDocument2.required = false;
-formFieldsPerDocument2.signer = "0";
-formFieldsPerDocument2.width = 18;
-formFieldsPerDocument2.height = 18;
-formFieldsPerDocument2.x = 112;
-formFieldsPerDocument2.y = 370;
-formFieldsPerDocument2.group = "RadioItemGroup1";
-formFieldsPerDocument2.isChecked = false;
-formFieldsPerDocument2.name = "";
-formFieldsPerDocument2.page = 1;
+const formFieldsPerDocument2: models.SubFormFieldsPerDocumentRadio = {
+  documentIndex: 0,
+  apiId: "uniqueIdHere_2",
+  type: "radio",
+  required: false,
+  signer: "0",
+  width: 18,
+  height: 18,
+  x: 112,
+  y: 370,
+  group: "RadioItemGroup1",
+  isChecked: false,
+  name: "",
+  page: 1,
+};
 
 const formFieldsPerDocument = [
   formFieldsPerDocument1,
   formFieldsPerDocument2,
 ];
 
-const formFieldGroups1 = new models.SubFormFieldGroup();
-formFieldGroups1.groupId = "RadioItemGroup1";
-formFieldGroups1.groupLabel = "Radio Item Group 1";
-formFieldGroups1.requirement = "require_0-1";
+const formFieldGroups1: models.SubFormFieldGroup = {
+  groupId: "RadioItemGroup1",
+  groupLabel: "Radio Item Group 1",
+  requirement: "require_0-1",
+};
 
 const formFieldGroups = [
   formFieldGroups1,
 ];
 
-const mergeFields1 = new models.SubMergeField();
-mergeFields1.name = "Full Name";
-mergeFields1.type = models.SubMergeField.TypeEnum.Text;
+const mergeFields1: models.SubMergeField = {
+  name: "Full Name",
+  type: models.SubMergeField.TypeEnum.Text,
+};
 
-const mergeFields2 = new models.SubMergeField();
-mergeFields2.name = "Is Registered?";
-mergeFields2.type = models.SubMergeField.TypeEnum.Checkbox;
+const mergeFields2: models.SubMergeField = {
+  name: "Is Registered?",
+  type: models.SubMergeField.TypeEnum.Checkbox,
+};
 
 const mergeFields = [
   mergeFields1,
   mergeFields2,
 ];
 
-const templateCreateRequest = new models.TemplateCreateRequest();
-templateCreateRequest.clientId = "37dee8d8440c66d54cfa05d92c160882";
-templateCreateRequest.message = "For your approval";
-templateCreateRequest.subject = "Please sign this document";
-templateCreateRequest.testMode = true;
-templateCreateRequest.title = "Test Template";
-templateCreateRequest.fileUrls = [
-  "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
-];
-templateCreateRequest.ccRoles = [
-  "Manager",
-];
-templateCreateRequest.fieldOptions = fieldOptions;
-templateCreateRequest.signerRoles = signerRoles;
-templateCreateRequest.formFieldsPerDocument = formFieldsPerDocument;
-templateCreateRequest.formFieldGroups = formFieldGroups;
-templateCreateRequest.mergeFields = mergeFields;
+const templateCreateRequest: models.TemplateCreateRequest = {
+  clientId: "37dee8d8440c66d54cfa05d92c160882",
+  message: "For your approval",
+  subject: "Please sign this document",
+  testMode: true,
+  title: "Test Template",
+  fileUrls: [
+    "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
+  ],
+  ccRoles: [
+    "Manager",
+  ],
+  fieldOptions: fieldOptions,
+  signerRoles: signerRoles,
+  formFieldsPerDocument: formFieldsPerDocument,
+  formFieldGroups: formFieldGroups,
+  mergeFields: mergeFields,
+};
 
 apiCaller.templateCreate(
   templateCreateRequest,
diff --git a/examples/TemplateCreateFormFieldRulesExample.java b/examples/TemplateCreateFormFieldRulesExample.java
index a3c621aee..acc954c3e 100644
--- a/examples/TemplateCreateFormFieldRulesExample.java
+++ b/examples/TemplateCreateFormFieldRulesExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class TemplateCreateFormFieldRulesExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var formFieldRules1Triggers1 = new SubFormFieldRuleTrigger();
         formFieldRules1Triggers1.id("uniqueIdHere_1");
diff --git a/examples/TemplateCreateFormFieldRulesExample.ts b/examples/TemplateCreateFormFieldRulesExample.ts
index 31a949aea..e8231cdde 100644
--- a/examples/TemplateCreateFormFieldRulesExample.ts
+++ b/examples/TemplateCreateFormFieldRulesExample.ts
@@ -6,112 +6,123 @@ const apiCaller = new api.TemplateApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const formFieldRules1Triggers1 = new models.SubFormFieldRuleTrigger();
-formFieldRules1Triggers1.id = "uniqueIdHere_1";
-formFieldRules1Triggers1.operator = models.SubFormFieldRuleTrigger.OperatorEnum.Is;
-formFieldRules1Triggers1.value = "foo";
+const formFieldRules1Triggers1: models.SubFormFieldRuleTrigger = {
+  id: "uniqueIdHere_1",
+  operator: models.SubFormFieldRuleTrigger.OperatorEnum.Is,
+  value: "foo",
+};
 
 const formFieldRules1Triggers = [
   formFieldRules1Triggers1,
 ];
 
-const formFieldRules1Actions1 = new models.SubFormFieldRuleAction();
-formFieldRules1Actions1.hidden = true;
-formFieldRules1Actions1.type = models.SubFormFieldRuleAction.TypeEnum.FieldVisibility;
-formFieldRules1Actions1.fieldId = "uniqueIdHere_2";
+const formFieldRules1Actions1: models.SubFormFieldRuleAction = {
+  hidden: true,
+  type: models.SubFormFieldRuleAction.TypeEnum.FieldVisibility,
+  fieldId: "uniqueIdHere_2",
+};
 
 const formFieldRules1Actions = [
   formFieldRules1Actions1,
 ];
 
-const fieldOptions = new models.SubFieldOptions();
-fieldOptions.dateFormat = models.SubFieldOptions.DateFormatEnum.DD_MM_YYYY;
+const fieldOptions: models.SubFieldOptions = {
+  dateFormat: models.SubFieldOptions.DateFormatEnum.DdMmYyyy,
+};
 
-const signerRoles1 = new models.SubTemplateRole();
-signerRoles1.name = "Client";
-signerRoles1.order = 0;
+const signerRoles1: models.SubTemplateRole = {
+  name: "Client",
+  order: 0,
+};
 
-const signerRoles2 = new models.SubTemplateRole();
-signerRoles2.name = "Witness";
-signerRoles2.order = 1;
+const signerRoles2: models.SubTemplateRole = {
+  name: "Witness",
+  order: 1,
+};
 
 const signerRoles = [
   signerRoles1,
   signerRoles2,
 ];
 
-const formFieldsPerDocument1 = new models.SubFormFieldsPerDocumentText();
-formFieldsPerDocument1.documentIndex = 0;
-formFieldsPerDocument1.apiId = "uniqueIdHere_1";
-formFieldsPerDocument1.type = "text";
-formFieldsPerDocument1.required = true;
-formFieldsPerDocument1.signer = "0";
-formFieldsPerDocument1.width = 100;
-formFieldsPerDocument1.height = 16;
-formFieldsPerDocument1.x = 112;
-formFieldsPerDocument1.y = 328;
-formFieldsPerDocument1.name = "";
-formFieldsPerDocument1.page = 1;
-formFieldsPerDocument1.validationType = models.SubFormFieldsPerDocumentText.ValidationTypeEnum.NumbersOnly;
-
-const formFieldsPerDocument2 = new models.SubFormFieldsPerDocumentSignature();
-formFieldsPerDocument2.documentIndex = 0;
-formFieldsPerDocument2.apiId = "uniqueIdHere_2";
-formFieldsPerDocument2.type = "signature";
-formFieldsPerDocument2.required = true;
-formFieldsPerDocument2.signer = "0";
-formFieldsPerDocument2.width = 120;
-formFieldsPerDocument2.height = 30;
-formFieldsPerDocument2.x = 530;
-formFieldsPerDocument2.y = 415;
-formFieldsPerDocument2.name = "";
-formFieldsPerDocument2.page = 1;
+const formFieldsPerDocument1: models.SubFormFieldsPerDocumentText = {
+  documentIndex: 0,
+  apiId: "uniqueIdHere_1",
+  type: "text",
+  required: true,
+  signer: "0",
+  width: 100,
+  height: 16,
+  x: 112,
+  y: 328,
+  name: "",
+  page: 1,
+  validationType: models.SubFormFieldsPerDocumentText.ValidationTypeEnum.NumbersOnly,
+};
+
+const formFieldsPerDocument2: models.SubFormFieldsPerDocumentSignature = {
+  documentIndex: 0,
+  apiId: "uniqueIdHere_2",
+  type: "signature",
+  required: true,
+  signer: "0",
+  width: 120,
+  height: 30,
+  x: 530,
+  y: 415,
+  name: "",
+  page: 1,
+};
 
 const formFieldsPerDocument = [
   formFieldsPerDocument1,
   formFieldsPerDocument2,
 ];
 
-const formFieldRules1 = new models.SubFormFieldRule();
-formFieldRules1.id = "rule_1";
-formFieldRules1.triggerOperator = "AND";
-formFieldRules1.triggers = formFieldRules1Triggers;
-formFieldRules1.actions = formFieldRules1Actions;
+const formFieldRules1: models.SubFormFieldRule = {
+  id: "rule_1",
+  triggerOperator: "AND",
+  triggers: formFieldRules1Triggers,
+  actions: formFieldRules1Actions,
+};
 
 const formFieldRules = [
   formFieldRules1,
 ];
 
-const mergeFields1 = new models.SubMergeField();
-mergeFields1.name = "Full Name";
-mergeFields1.type = models.SubMergeField.TypeEnum.Text;
+const mergeFields1: models.SubMergeField = {
+  name: "Full Name",
+  type: models.SubMergeField.TypeEnum.Text,
+};
 
-const mergeFields2 = new models.SubMergeField();
-mergeFields2.name = "Is Registered?";
-mergeFields2.type = models.SubMergeField.TypeEnum.Checkbox;
+const mergeFields2: models.SubMergeField = {
+  name: "Is Registered?",
+  type: models.SubMergeField.TypeEnum.Checkbox,
+};
 
 const mergeFields = [
   mergeFields1,
   mergeFields2,
 ];
 
-const templateCreateRequest = new models.TemplateCreateRequest();
-templateCreateRequest.clientId = "37dee8d8440c66d54cfa05d92c160882";
-templateCreateRequest.message = "For your approval";
-templateCreateRequest.subject = "Please sign this document";
-templateCreateRequest.testMode = true;
-templateCreateRequest.title = "Test Template";
-templateCreateRequest.fileUrls = [
-  "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
-];
-templateCreateRequest.ccRoles = [
-  "Manager",
-];
-templateCreateRequest.fieldOptions = fieldOptions;
-templateCreateRequest.signerRoles = signerRoles;
-templateCreateRequest.formFieldsPerDocument = formFieldsPerDocument;
-templateCreateRequest.formFieldRules = formFieldRules;
-templateCreateRequest.mergeFields = mergeFields;
+const templateCreateRequest: models.TemplateCreateRequest = {
+  clientId: "37dee8d8440c66d54cfa05d92c160882",
+  message: "For your approval",
+  subject: "Please sign this document",
+  testMode: true,
+  title: "Test Template",
+  fileUrls: [
+    "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
+  ],
+  ccRoles: [
+    "Manager",
+  ],
+  fieldOptions: fieldOptions,
+  signerRoles: signerRoles,
+  formFieldsPerDocument: formFieldsPerDocument,
+  formFieldRules: formFieldRules,
+  mergeFields: mergeFields,
+};
 
 apiCaller.templateCreate(
   templateCreateRequest,
diff --git a/examples/TemplateCreateFormFieldsPerDocumentExample.java b/examples/TemplateCreateFormFieldsPerDocumentExample.java
index 397046a78..9873668b7 100644
--- a/examples/TemplateCreateFormFieldsPerDocumentExample.java
+++ b/examples/TemplateCreateFormFieldsPerDocumentExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class TemplateCreateFormFieldsPerDocumentExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var fieldOptions = new SubFieldOptions();
         fieldOptions.dateFormat(SubFieldOptions.DateFormatEnum.DD_MM_YYYY);
diff --git a/examples/TemplateCreateFormFieldsPerDocumentExample.ts b/examples/TemplateCreateFormFieldsPerDocumentExample.ts
index d580e665b..59890f436 100644
--- a/examples/TemplateCreateFormFieldsPerDocumentExample.ts
+++ b/examples/TemplateCreateFormFieldsPerDocumentExample.ts
@@ -6,84 +6,92 @@ const apiCaller = new api.TemplateApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const fieldOptions = new models.SubFieldOptions();
-fieldOptions.dateFormat = models.SubFieldOptions.DateFormatEnum.DD_MM_YYYY;
+const fieldOptions: models.SubFieldOptions = {
+  dateFormat: models.SubFieldOptions.DateFormatEnum.DdMmYyyy,
+};
 
-const signerRoles1 = new models.SubTemplateRole();
-signerRoles1.name = "Client";
-signerRoles1.order = 0;
+const signerRoles1: models.SubTemplateRole = {
+  name: "Client",
+  order: 0,
+};
 
-const signerRoles2 = new models.SubTemplateRole();
-signerRoles2.name = "Witness";
-signerRoles2.order = 1;
+const signerRoles2: models.SubTemplateRole = {
+  name: "Witness",
+  order: 1,
+};
 
 const signerRoles = [
   signerRoles1,
   signerRoles2,
 ];
 
-const formFieldsPerDocument1 = new models.SubFormFieldsPerDocumentText();
-formFieldsPerDocument1.documentIndex = 0;
-formFieldsPerDocument1.apiId = "uniqueIdHere_1";
-formFieldsPerDocument1.type = "text";
-formFieldsPerDocument1.required = true;
-formFieldsPerDocument1.signer = "1";
-formFieldsPerDocument1.width = 100;
-formFieldsPerDocument1.height = 16;
-formFieldsPerDocument1.x = 112;
-formFieldsPerDocument1.y = 328;
-formFieldsPerDocument1.name = "";
-formFieldsPerDocument1.page = 1;
-formFieldsPerDocument1.placeholder = "";
-formFieldsPerDocument1.validationType = models.SubFormFieldsPerDocumentText.ValidationTypeEnum.NumbersOnly;
+const formFieldsPerDocument1: models.SubFormFieldsPerDocumentText = {
+  documentIndex: 0,
+  apiId: "uniqueIdHere_1",
+  type: "text",
+  required: true,
+  signer: "1",
+  width: 100,
+  height: 16,
+  x: 112,
+  y: 328,
+  name: "",
+  page: 1,
+  placeholder: "",
+  validationType: models.SubFormFieldsPerDocumentText.ValidationTypeEnum.NumbersOnly,
+};
 
-const formFieldsPerDocument2 = new models.SubFormFieldsPerDocumentSignature();
-formFieldsPerDocument2.documentIndex = 0;
-formFieldsPerDocument2.apiId = "uniqueIdHere_2";
-formFieldsPerDocument2.type = "signature";
-formFieldsPerDocument2.required = true;
-formFieldsPerDocument2.signer = "0";
-formFieldsPerDocument2.width = 120;
-formFieldsPerDocument2.height = 30;
-formFieldsPerDocument2.x = 530;
-formFieldsPerDocument2.y = 415;
-formFieldsPerDocument2.name = "";
-formFieldsPerDocument2.page = 1;
+const formFieldsPerDocument2: models.SubFormFieldsPerDocumentSignature = {
+  documentIndex: 0,
+  apiId: "uniqueIdHere_2",
+  type: "signature",
+  required: true,
+  signer: "0",
+  width: 120,
+  height: 30,
+  x: 530,
+  y: 415,
+  name: "",
+  page: 1,
+};
 
 const formFieldsPerDocument = [
   formFieldsPerDocument1,
   formFieldsPerDocument2,
 ];
 
-const mergeFields1 = new models.SubMergeField();
-mergeFields1.name = "Full Name";
-mergeFields1.type = models.SubMergeField.TypeEnum.Text;
+const mergeFields1: models.SubMergeField = {
+  name: "Full Name",
+  type: models.SubMergeField.TypeEnum.Text,
+};
 
-const mergeFields2 = new models.SubMergeField();
-mergeFields2.name = "Is Registered?";
-mergeFields2.type = models.SubMergeField.TypeEnum.Checkbox;
+const mergeFields2: models.SubMergeField = {
+  name: "Is Registered?",
+  type: models.SubMergeField.TypeEnum.Checkbox,
+};
 
 const mergeFields = [
   mergeFields1,
   mergeFields2,
 ];
 
-const templateCreateRequest = new models.TemplateCreateRequest();
-templateCreateRequest.clientId = "37dee8d8440c66d54cfa05d92c160882";
-templateCreateRequest.message = "For your approval";
-templateCreateRequest.subject = "Please sign this document";
-templateCreateRequest.testMode = true;
-templateCreateRequest.title = "Test Template";
-templateCreateRequest.fileUrls = [
-  "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
-];
-templateCreateRequest.ccRoles = [
-  "Manager",
-];
-templateCreateRequest.fieldOptions = fieldOptions;
-templateCreateRequest.signerRoles = signerRoles;
-templateCreateRequest.formFieldsPerDocument = formFieldsPerDocument;
-templateCreateRequest.mergeFields = mergeFields;
+const templateCreateRequest: models.TemplateCreateRequest = {
+  clientId: "37dee8d8440c66d54cfa05d92c160882",
+  message: "For your approval",
+  subject: "Please sign this document",
+  testMode: true,
+  title: "Test Template",
+  fileUrls: [
+    "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
+  ],
+  ccRoles: [
+    "Manager",
+  ],
+  fieldOptions: fieldOptions,
+  signerRoles: signerRoles,
+  formFieldsPerDocument: formFieldsPerDocument,
+  mergeFields: mergeFields,
+};
 
 apiCaller.templateCreate(
   templateCreateRequest,
diff --git a/examples/TemplateDeleteExample.java b/examples/TemplateDeleteExample.java
index b9d0b77ad..6ca874681 100644
--- a/examples/TemplateDeleteExample.java
+++ b/examples/TemplateDeleteExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class TemplateDeleteExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
diff --git a/examples/TemplateFilesAsDataUriExample.java b/examples/TemplateFilesAsDataUriExample.java
index 6ef950fe3..02c9b69ca 100644
--- a/examples/TemplateFilesAsDataUriExample.java
+++ b/examples/TemplateFilesAsDataUriExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class TemplateFilesAsDataUriExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
diff --git a/examples/TemplateFilesAsFileUrlExample.java b/examples/TemplateFilesAsFileUrlExample.java
index 3ac688da1..2b316f92b 100644
--- a/examples/TemplateFilesAsFileUrlExample.java
+++ b/examples/TemplateFilesAsFileUrlExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class TemplateFilesAsFileUrlExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
diff --git a/examples/TemplateFilesExample.cs b/examples/TemplateFilesExample.cs
index 96e9237ee..0cf55f3a6 100644
--- a/examples/TemplateFilesExample.cs
+++ b/examples/TemplateFilesExample.cs
@@ -20,8 +20,7 @@ public static void Run()
         try
         {
             var response = new TemplateApi(config).TemplateFiles(
-                templateId: "f57db65d3f933b5316d398057a36176831451a35",
-                fileType: null
+                templateId: "f57db65d3f933b5316d398057a36176831451a35"
             );
             var fileStream = File.Create("./file_response");
             response.Seek(0, SeekOrigin.Begin);
diff --git a/examples/TemplateFilesExample.java b/examples/TemplateFilesExample.java
index 90c2975b2..d003de835 100644
--- a/examples/TemplateFilesExample.java
+++ b/examples/TemplateFilesExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class TemplateFilesExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
diff --git a/examples/TemplateFilesExample.php b/examples/TemplateFilesExample.php
index c9d7d5307..2e2f46f74 100644
--- a/examples/TemplateFilesExample.php
+++ b/examples/TemplateFilesExample.php
@@ -14,7 +14,6 @@
 try {
     $response = (new Dropbox\Sign\Api\TemplateApi(config: $config))->templateFiles(
         template_id: "f57db65d3f933b5316d398057a36176831451a35",
-        file_type: null,
     );
 
     copy($response->getRealPath(), __DIR__ . '/file_response');
diff --git a/examples/TemplateFilesExample.py b/examples/TemplateFilesExample.py
index 712642766..d1f056a90 100644
--- a/examples/TemplateFilesExample.py
+++ b/examples/TemplateFilesExample.py
@@ -13,7 +13,6 @@
     try:
         response = api.TemplateApi(api_client).template_files(
             template_id="f57db65d3f933b5316d398057a36176831451a35",
-            file_type=None,
         )
 
         open("./file_response", "wb").write(response.read())
diff --git a/examples/TemplateGetExample.java b/examples/TemplateGetExample.java
index affbf4d04..2aabdc6bc 100644
--- a/examples/TemplateGetExample.java
+++ b/examples/TemplateGetExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class TemplateGetExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
diff --git a/examples/TemplateListExample.cs b/examples/TemplateListExample.cs
index b41f357ce..4d0b900bf 100644
--- a/examples/TemplateListExample.cs
+++ b/examples/TemplateListExample.cs
@@ -20,10 +20,8 @@ public static void Run()
         try
         {
             var response = new TemplateApi(config).TemplateList(
-                accountId: null,
                 page: 1,
-                pageSize: 20,
-                query: null
+                pageSize: 20
             );
 
             Console.WriteLine(response);
diff --git a/examples/TemplateListExample.java b/examples/TemplateListExample.java
index 45250a456..29e115b74 100644
--- a/examples/TemplateListExample.java
+++ b/examples/TemplateListExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class TemplateListExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
diff --git a/examples/TemplateListExample.php b/examples/TemplateListExample.php
index 536c2a630..eafde32da 100644
--- a/examples/TemplateListExample.php
+++ b/examples/TemplateListExample.php
@@ -13,10 +13,8 @@
 
 try {
     $response = (new Dropbox\Sign\Api\TemplateApi(config: $config))->templateList(
-        account_id: null,
         page: 1,
         page_size: 20,
-        query: null,
     );
 
     print_r($response);
diff --git a/examples/TemplateListExample.py b/examples/TemplateListExample.py
index 6b96ea19c..429531ec6 100644
--- a/examples/TemplateListExample.py
+++ b/examples/TemplateListExample.py
@@ -12,10 +12,8 @@
 with ApiClient(configuration) as api_client:
     try:
         response = api.TemplateApi(api_client).template_list(
-            account_id=None,
             page=1,
             page_size=20,
-            query=None,
         )
 
         pprint(response)
diff --git a/examples/TemplateRemoveUserExample.java b/examples/TemplateRemoveUserExample.java
index d3d157b24..7d29ffac9 100644
--- a/examples/TemplateRemoveUserExample.java
+++ b/examples/TemplateRemoveUserExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class TemplateRemoveUserExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var templateRemoveUserRequest = new TemplateRemoveUserRequest();
         templateRemoveUserRequest.emailAddress("george@dropboxsign.com");
diff --git a/examples/TemplateRemoveUserExample.ts b/examples/TemplateRemoveUserExample.ts
index f896f81e1..2d40a2f3f 100644
--- a/examples/TemplateRemoveUserExample.ts
+++ b/examples/TemplateRemoveUserExample.ts
@@ -6,8 +6,9 @@ const apiCaller = new api.TemplateApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const templateRemoveUserRequest = new models.TemplateRemoveUserRequest();
-templateRemoveUserRequest.emailAddress = "george@dropboxsign.com";
+const templateRemoveUserRequest: models.TemplateRemoveUserRequest = {
+  emailAddress: "george@dropboxsign.com",
+};
 
 apiCaller.templateRemoveUser(
   "f57db65d3f933b5316d398057a36176831451a35", // templateId
diff --git a/examples/TemplateUpdateFilesExample.java b/examples/TemplateUpdateFilesExample.java
index 865668461..8f36d7626 100644
--- a/examples/TemplateUpdateFilesExample.java
+++ b/examples/TemplateUpdateFilesExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class TemplateUpdateFilesExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var templateUpdateFilesRequest = new TemplateUpdateFilesRequest();
         templateUpdateFilesRequest.files(List.of (
diff --git a/examples/TemplateUpdateFilesExample.ts b/examples/TemplateUpdateFilesExample.ts
index 139a53fff..fe21c563d 100644
--- a/examples/TemplateUpdateFilesExample.ts
+++ b/examples/TemplateUpdateFilesExample.ts
@@ -6,10 +6,11 @@ const apiCaller = new api.TemplateApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const templateUpdateFilesRequest = new models.TemplateUpdateFilesRequest();
-templateUpdateFilesRequest.files = [
-  fs.createReadStream("./example_signature_request.pdf"),
-];
+const templateUpdateFilesRequest: models.TemplateUpdateFilesRequest = {
+  files: [
+    fs.createReadStream("./example_signature_request.pdf"),
+  ],
+};
 
 apiCaller.templateUpdateFiles(
   "f57db65d3f933b5316d398057a36176831451a35", // templateId
diff --git a/examples/UnclaimedDraftCreateEmbeddedExample.java b/examples/UnclaimedDraftCreateEmbeddedExample.java
index 0dfd50d88..e6bc38ff1 100644
--- a/examples/UnclaimedDraftCreateEmbeddedExample.java
+++ b/examples/UnclaimedDraftCreateEmbeddedExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class UnclaimedDraftCreateEmbeddedExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var unclaimedDraftCreateEmbeddedRequest = new UnclaimedDraftCreateEmbeddedRequest();
         unclaimedDraftCreateEmbeddedRequest.clientId("b6b8e7deaf8f0b95c029dca049356d4a2cf9710a");
diff --git a/examples/UnclaimedDraftCreateEmbeddedExample.ts b/examples/UnclaimedDraftCreateEmbeddedExample.ts
index d17be1564..7b99e7d60 100644
--- a/examples/UnclaimedDraftCreateEmbeddedExample.ts
+++ b/examples/UnclaimedDraftCreateEmbeddedExample.ts
@@ -6,13 +6,14 @@ const apiCaller = new api.UnclaimedDraftApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const unclaimedDraftCreateEmbeddedRequest = new models.UnclaimedDraftCreateEmbeddedRequest();
-unclaimedDraftCreateEmbeddedRequest.clientId = "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a";
-unclaimedDraftCreateEmbeddedRequest.requesterEmailAddress = "jack@dropboxsign.com";
-unclaimedDraftCreateEmbeddedRequest.testMode = true;
-unclaimedDraftCreateEmbeddedRequest.files = [
-  fs.createReadStream("./example_signature_request.pdf"),
-];
+const unclaimedDraftCreateEmbeddedRequest: models.UnclaimedDraftCreateEmbeddedRequest = {
+  clientId: "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a",
+  requesterEmailAddress: "jack@dropboxsign.com",
+  testMode: true,
+  files: [
+    fs.createReadStream("./example_signature_request.pdf"),
+  ],
+};
 
 apiCaller.unclaimedDraftCreateEmbedded(
   unclaimedDraftCreateEmbeddedRequest,
diff --git a/examples/UnclaimedDraftCreateEmbeddedFormFieldGroupsExample.java b/examples/UnclaimedDraftCreateEmbeddedFormFieldGroupsExample.java
index f597e3e18..b9918381a 100644
--- a/examples/UnclaimedDraftCreateEmbeddedFormFieldGroupsExample.java
+++ b/examples/UnclaimedDraftCreateEmbeddedFormFieldGroupsExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class UnclaimedDraftCreateEmbeddedFormFieldGroupsExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var formFieldGroups1 = new SubFormFieldGroup();
         formFieldGroups1.groupId("RadioItemGroup1");
diff --git a/examples/UnclaimedDraftCreateEmbeddedFormFieldGroupsExample.ts b/examples/UnclaimedDraftCreateEmbeddedFormFieldGroupsExample.ts
index bb10352f4..f7953d6c4 100644
--- a/examples/UnclaimedDraftCreateEmbeddedFormFieldGroupsExample.ts
+++ b/examples/UnclaimedDraftCreateEmbeddedFormFieldGroupsExample.ts
@@ -6,59 +6,63 @@ const apiCaller = new api.UnclaimedDraftApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const formFieldGroups1 = new models.SubFormFieldGroup();
-formFieldGroups1.groupId = "RadioItemGroup1";
-formFieldGroups1.groupLabel = "Radio Item Group 1";
-formFieldGroups1.requirement = "require_0-1";
+const formFieldGroups1: models.SubFormFieldGroup = {
+  groupId: "RadioItemGroup1",
+  groupLabel: "Radio Item Group 1",
+  requirement: "require_0-1",
+};
 
 const formFieldGroups = [
   formFieldGroups1,
 ];
 
-const formFieldsPerDocument1 = new models.SubFormFieldsPerDocumentRadio();
-formFieldsPerDocument1.documentIndex = 0;
-formFieldsPerDocument1.apiId = "uniqueIdHere_1";
-formFieldsPerDocument1.type = "radio";
-formFieldsPerDocument1.required = false;
-formFieldsPerDocument1.signer = "0";
-formFieldsPerDocument1.width = 18;
-formFieldsPerDocument1.height = 18;
-formFieldsPerDocument1.x = 112;
-formFieldsPerDocument1.y = 328;
-formFieldsPerDocument1.group = "RadioItemGroup1";
-formFieldsPerDocument1.isChecked = true;
-formFieldsPerDocument1.name = "";
-formFieldsPerDocument1.page = 1;
+const formFieldsPerDocument1: models.SubFormFieldsPerDocumentRadio = {
+  documentIndex: 0,
+  apiId: "uniqueIdHere_1",
+  type: "radio",
+  required: false,
+  signer: "0",
+  width: 18,
+  height: 18,
+  x: 112,
+  y: 328,
+  group: "RadioItemGroup1",
+  isChecked: true,
+  name: "",
+  page: 1,
+};
 
-const formFieldsPerDocument2 = new models.SubFormFieldsPerDocumentRadio();
-formFieldsPerDocument2.documentIndex = 0;
-formFieldsPerDocument2.apiId = "uniqueIdHere_2";
-formFieldsPerDocument2.type = "radio";
-formFieldsPerDocument2.required = false;
-formFieldsPerDocument2.signer = "0";
-formFieldsPerDocument2.width = 18;
-formFieldsPerDocument2.height = 18;
-formFieldsPerDocument2.x = 112;
-formFieldsPerDocument2.y = 370;
-formFieldsPerDocument2.group = "RadioItemGroup1";
-formFieldsPerDocument2.isChecked = false;
-formFieldsPerDocument2.name = "";
-formFieldsPerDocument2.page = 1;
+const formFieldsPerDocument2: models.SubFormFieldsPerDocumentRadio = {
+  documentIndex: 0,
+  apiId: "uniqueIdHere_2",
+  type: "radio",
+  required: false,
+  signer: "0",
+  width: 18,
+  height: 18,
+  x: 112,
+  y: 370,
+  group: "RadioItemGroup1",
+  isChecked: false,
+  name: "",
+  page: 1,
+};
 
 const formFieldsPerDocument = [
   formFieldsPerDocument1,
   formFieldsPerDocument2,
 ];
 
-const unclaimedDraftCreateEmbeddedRequest = new models.UnclaimedDraftCreateEmbeddedRequest();
-unclaimedDraftCreateEmbeddedRequest.clientId = "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a";
-unclaimedDraftCreateEmbeddedRequest.requesterEmailAddress = "jack@dropboxsign.com";
-unclaimedDraftCreateEmbeddedRequest.testMode = false;
-unclaimedDraftCreateEmbeddedRequest.fileUrls = [
-  "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
-];
-unclaimedDraftCreateEmbeddedRequest.formFieldGroups = formFieldGroups;
-unclaimedDraftCreateEmbeddedRequest.formFieldsPerDocument = formFieldsPerDocument;
+const unclaimedDraftCreateEmbeddedRequest: models.UnclaimedDraftCreateEmbeddedRequest = {
+  clientId: "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a",
+  requesterEmailAddress: "jack@dropboxsign.com",
+  testMode: false,
+  fileUrls: [
+    "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
+  ],
+  formFieldGroups: formFieldGroups,
+  formFieldsPerDocument: formFieldsPerDocument,
+};
 
 apiCaller.unclaimedDraftCreateEmbedded(
   unclaimedDraftCreateEmbeddedRequest,
diff --git a/examples/UnclaimedDraftCreateEmbeddedFormFieldRulesExample.java b/examples/UnclaimedDraftCreateEmbeddedFormFieldRulesExample.java
index d2483f32f..f3ce4c53c 100644
--- a/examples/UnclaimedDraftCreateEmbeddedFormFieldRulesExample.java
+++ b/examples/UnclaimedDraftCreateEmbeddedFormFieldRulesExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class UnclaimedDraftCreateEmbeddedFormFieldRulesExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var formFieldRules1Triggers1 = new SubFormFieldRuleTrigger();
         formFieldRules1Triggers1.id("uniqueIdHere_1");
diff --git a/examples/UnclaimedDraftCreateEmbeddedFormFieldRulesExample.ts b/examples/UnclaimedDraftCreateEmbeddedFormFieldRulesExample.ts
index 8223f693e..e7050b603 100644
--- a/examples/UnclaimedDraftCreateEmbeddedFormFieldRulesExample.ts
+++ b/examples/UnclaimedDraftCreateEmbeddedFormFieldRulesExample.ts
@@ -6,75 +6,81 @@ const apiCaller = new api.UnclaimedDraftApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const formFieldRules1Triggers1 = new models.SubFormFieldRuleTrigger();
-formFieldRules1Triggers1.id = "uniqueIdHere_1";
-formFieldRules1Triggers1.operator = models.SubFormFieldRuleTrigger.OperatorEnum.Is;
-formFieldRules1Triggers1.value = "foo";
+const formFieldRules1Triggers1: models.SubFormFieldRuleTrigger = {
+  id: "uniqueIdHere_1",
+  operator: models.SubFormFieldRuleTrigger.OperatorEnum.Is,
+  value: "foo",
+};
 
 const formFieldRules1Triggers = [
   formFieldRules1Triggers1,
 ];
 
-const formFieldRules1Actions1 = new models.SubFormFieldRuleAction();
-formFieldRules1Actions1.hidden = true;
-formFieldRules1Actions1.type = models.SubFormFieldRuleAction.TypeEnum.FieldVisibility;
-formFieldRules1Actions1.fieldId = "uniqueIdHere_2";
+const formFieldRules1Actions1: models.SubFormFieldRuleAction = {
+  hidden: true,
+  type: models.SubFormFieldRuleAction.TypeEnum.FieldVisibility,
+  fieldId: "uniqueIdHere_2",
+};
 
 const formFieldRules1Actions = [
   formFieldRules1Actions1,
 ];
 
-const formFieldRules1 = new models.SubFormFieldRule();
-formFieldRules1.id = "rule_1";
-formFieldRules1.triggerOperator = "AND";
-formFieldRules1.triggers = formFieldRules1Triggers;
-formFieldRules1.actions = formFieldRules1Actions;
+const formFieldRules1: models.SubFormFieldRule = {
+  id: "rule_1",
+  triggerOperator: "AND",
+  triggers: formFieldRules1Triggers,
+  actions: formFieldRules1Actions,
+};
 
 const formFieldRules = [
   formFieldRules1,
 ];
 
-const formFieldsPerDocument1 = new models.SubFormFieldsPerDocumentText();
-formFieldsPerDocument1.documentIndex = 0;
-formFieldsPerDocument1.apiId = "uniqueIdHere_1";
-formFieldsPerDocument1.type = "text";
-formFieldsPerDocument1.required = true;
-formFieldsPerDocument1.signer = "0";
-formFieldsPerDocument1.width = 100;
-formFieldsPerDocument1.height = 16;
-formFieldsPerDocument1.x = 112;
-formFieldsPerDocument1.y = 328;
-formFieldsPerDocument1.name = "";
-formFieldsPerDocument1.page = 1;
-formFieldsPerDocument1.validationType = models.SubFormFieldsPerDocumentText.ValidationTypeEnum.NumbersOnly;
+const formFieldsPerDocument1: models.SubFormFieldsPerDocumentText = {
+  documentIndex: 0,
+  apiId: "uniqueIdHere_1",
+  type: "text",
+  required: true,
+  signer: "0",
+  width: 100,
+  height: 16,
+  x: 112,
+  y: 328,
+  name: "",
+  page: 1,
+  validationType: models.SubFormFieldsPerDocumentText.ValidationTypeEnum.NumbersOnly,
+};
 
-const formFieldsPerDocument2 = new models.SubFormFieldsPerDocumentSignature();
-formFieldsPerDocument2.documentIndex = 0;
-formFieldsPerDocument2.apiId = "uniqueIdHere_2";
-formFieldsPerDocument2.type = "signature";
-formFieldsPerDocument2.required = true;
-formFieldsPerDocument2.signer = "0";
-formFieldsPerDocument2.width = 120;
-formFieldsPerDocument2.height = 30;
-formFieldsPerDocument2.x = 530;
-formFieldsPerDocument2.y = 415;
-formFieldsPerDocument2.name = "";
-formFieldsPerDocument2.page = 1;
+const formFieldsPerDocument2: models.SubFormFieldsPerDocumentSignature = {
+  documentIndex: 0,
+  apiId: "uniqueIdHere_2",
+  type: "signature",
+  required: true,
+  signer: "0",
+  width: 120,
+  height: 30,
+  x: 530,
+  y: 415,
+  name: "",
+  page: 1,
+};
 
 const formFieldsPerDocument = [
   formFieldsPerDocument1,
   formFieldsPerDocument2,
 ];
 
-const unclaimedDraftCreateEmbeddedRequest = new models.UnclaimedDraftCreateEmbeddedRequest();
-unclaimedDraftCreateEmbeddedRequest.clientId = "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a";
-unclaimedDraftCreateEmbeddedRequest.requesterEmailAddress = "jack@dropboxsign.com";
-unclaimedDraftCreateEmbeddedRequest.testMode = false;
-unclaimedDraftCreateEmbeddedRequest.fileUrls = [
-  "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
-];
-unclaimedDraftCreateEmbeddedRequest.formFieldRules = formFieldRules;
-unclaimedDraftCreateEmbeddedRequest.formFieldsPerDocument = formFieldsPerDocument;
+const unclaimedDraftCreateEmbeddedRequest: models.UnclaimedDraftCreateEmbeddedRequest = {
+  clientId: "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a",
+  requesterEmailAddress: "jack@dropboxsign.com",
+  testMode: false,
+  fileUrls: [
+    "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
+  ],
+  formFieldRules: formFieldRules,
+  formFieldsPerDocument: formFieldsPerDocument,
+};
 
 apiCaller.unclaimedDraftCreateEmbedded(
   unclaimedDraftCreateEmbeddedRequest,
diff --git a/examples/UnclaimedDraftCreateEmbeddedFormFieldsPerDocumentExample.java b/examples/UnclaimedDraftCreateEmbeddedFormFieldsPerDocumentExample.java
index f425a3d36..2ec3a17e9 100644
--- a/examples/UnclaimedDraftCreateEmbeddedFormFieldsPerDocumentExample.java
+++ b/examples/UnclaimedDraftCreateEmbeddedFormFieldsPerDocumentExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class UnclaimedDraftCreateEmbeddedFormFieldsPerDocumentExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var formFieldsPerDocument1 = new SubFormFieldsPerDocumentText();
         formFieldsPerDocument1.documentIndex(0);
diff --git a/examples/UnclaimedDraftCreateEmbeddedFormFieldsPerDocumentExample.ts b/examples/UnclaimedDraftCreateEmbeddedFormFieldsPerDocumentExample.ts
index 66efc0596..dcdee5d3b 100644
--- a/examples/UnclaimedDraftCreateEmbeddedFormFieldsPerDocumentExample.ts
+++ b/examples/UnclaimedDraftCreateEmbeddedFormFieldsPerDocumentExample.ts
@@ -6,47 +6,50 @@ const apiCaller = new api.UnclaimedDraftApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const formFieldsPerDocument1 = new models.SubFormFieldsPerDocumentText();
-formFieldsPerDocument1.documentIndex = 0;
-formFieldsPerDocument1.apiId = "uniqueIdHere_1";
-formFieldsPerDocument1.type = "text";
-formFieldsPerDocument1.required = true;
-formFieldsPerDocument1.signer = "1";
-formFieldsPerDocument1.width = 100;
-formFieldsPerDocument1.height = 16;
-formFieldsPerDocument1.x = 112;
-formFieldsPerDocument1.y = 328;
-formFieldsPerDocument1.name = "";
-formFieldsPerDocument1.page = 1;
-formFieldsPerDocument1.placeholder = "";
-formFieldsPerDocument1.validationType = models.SubFormFieldsPerDocumentText.ValidationTypeEnum.NumbersOnly;
+const formFieldsPerDocument1: models.SubFormFieldsPerDocumentText = {
+  documentIndex: 0,
+  apiId: "uniqueIdHere_1",
+  type: "text",
+  required: true,
+  signer: "1",
+  width: 100,
+  height: 16,
+  x: 112,
+  y: 328,
+  name: "",
+  page: 1,
+  placeholder: "",
+  validationType: models.SubFormFieldsPerDocumentText.ValidationTypeEnum.NumbersOnly,
+};
 
-const formFieldsPerDocument2 = new models.SubFormFieldsPerDocumentSignature();
-formFieldsPerDocument2.documentIndex = 0;
-formFieldsPerDocument2.apiId = "uniqueIdHere_2";
-formFieldsPerDocument2.type = "signature";
-formFieldsPerDocument2.required = true;
-formFieldsPerDocument2.signer = "0";
-formFieldsPerDocument2.width = 120;
-formFieldsPerDocument2.height = 30;
-formFieldsPerDocument2.x = 530;
-formFieldsPerDocument2.y = 415;
-formFieldsPerDocument2.name = "";
-formFieldsPerDocument2.page = 1;
+const formFieldsPerDocument2: models.SubFormFieldsPerDocumentSignature = {
+  documentIndex: 0,
+  apiId: "uniqueIdHere_2",
+  type: "signature",
+  required: true,
+  signer: "0",
+  width: 120,
+  height: 30,
+  x: 530,
+  y: 415,
+  name: "",
+  page: 1,
+};
 
 const formFieldsPerDocument = [
   formFieldsPerDocument1,
   formFieldsPerDocument2,
 ];
 
-const unclaimedDraftCreateEmbeddedRequest = new models.UnclaimedDraftCreateEmbeddedRequest();
-unclaimedDraftCreateEmbeddedRequest.clientId = "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a";
-unclaimedDraftCreateEmbeddedRequest.requesterEmailAddress = "jack@dropboxsign.com";
-unclaimedDraftCreateEmbeddedRequest.testMode = false;
-unclaimedDraftCreateEmbeddedRequest.fileUrls = [
-  "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
-];
-unclaimedDraftCreateEmbeddedRequest.formFieldsPerDocument = formFieldsPerDocument;
+const unclaimedDraftCreateEmbeddedRequest: models.UnclaimedDraftCreateEmbeddedRequest = {
+  clientId: "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a",
+  requesterEmailAddress: "jack@dropboxsign.com",
+  testMode: false,
+  fileUrls: [
+    "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
+  ],
+  formFieldsPerDocument: formFieldsPerDocument,
+};
 
 apiCaller.unclaimedDraftCreateEmbedded(
   unclaimedDraftCreateEmbeddedRequest,
diff --git a/examples/UnclaimedDraftCreateEmbeddedWithTemplateExample.java b/examples/UnclaimedDraftCreateEmbeddedWithTemplateExample.java
index 174c678a4..1b888876a 100644
--- a/examples/UnclaimedDraftCreateEmbeddedWithTemplateExample.java
+++ b/examples/UnclaimedDraftCreateEmbeddedWithTemplateExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class UnclaimedDraftCreateEmbeddedWithTemplateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var ccs1 = new SubCC();
         ccs1.role("Accounting");
diff --git a/examples/UnclaimedDraftCreateEmbeddedWithTemplateExample.ts b/examples/UnclaimedDraftCreateEmbeddedWithTemplateExample.ts
index 8e78741d8..a326c3679 100644
--- a/examples/UnclaimedDraftCreateEmbeddedWithTemplateExample.ts
+++ b/examples/UnclaimedDraftCreateEmbeddedWithTemplateExample.ts
@@ -6,32 +6,35 @@ const apiCaller = new api.UnclaimedDraftApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const ccs1 = new models.SubCC();
-ccs1.role = "Accounting";
-ccs1.emailAddress = "accounting@dropboxsign.com";
+const ccs1: models.SubCC = {
+  role: "Accounting",
+  emailAddress: "accounting@dropboxsign.com",
+};
 
 const ccs = [
   ccs1,
 ];
 
-const signers1 = new models.SubUnclaimedDraftTemplateSigner();
-signers1.role = "Client";
-signers1.name = "George";
-signers1.emailAddress = "george@example.com";
+const signers1: models.SubUnclaimedDraftTemplateSigner = {
+  role: "Client",
+  name: "George",
+  emailAddress: "george@example.com",
+};
 
 const signers = [
   signers1,
 ];
 
-const unclaimedDraftCreateEmbeddedWithTemplateRequest = new models.UnclaimedDraftCreateEmbeddedWithTemplateRequest();
-unclaimedDraftCreateEmbeddedWithTemplateRequest.clientId = "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a";
-unclaimedDraftCreateEmbeddedWithTemplateRequest.requesterEmailAddress = "jack@dropboxsign.com";
-unclaimedDraftCreateEmbeddedWithTemplateRequest.templateIds = [
-  "61a832ff0d8423f91d503e76bfbcc750f7417c78",
-];
-unclaimedDraftCreateEmbeddedWithTemplateRequest.testMode = false;
-unclaimedDraftCreateEmbeddedWithTemplateRequest.ccs = ccs;
-unclaimedDraftCreateEmbeddedWithTemplateRequest.signers = signers;
+const unclaimedDraftCreateEmbeddedWithTemplateRequest: models.UnclaimedDraftCreateEmbeddedWithTemplateRequest = {
+  clientId: "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a",
+  requesterEmailAddress: "jack@dropboxsign.com",
+  templateIds: [
+    "61a832ff0d8423f91d503e76bfbcc750f7417c78",
+  ],
+  testMode: false,
+  ccs: ccs,
+  signers: signers,
+};
 
 apiCaller.unclaimedDraftCreateEmbeddedWithTemplate(
   unclaimedDraftCreateEmbeddedWithTemplateRequest,
diff --git a/examples/UnclaimedDraftCreateExample.java b/examples/UnclaimedDraftCreateExample.java
index 219de1f5a..770bc0520 100644
--- a/examples/UnclaimedDraftCreateExample.java
+++ b/examples/UnclaimedDraftCreateExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class UnclaimedDraftCreateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var signers1 = new SubUnclaimedDraftSigner();
         signers1.name("Jack");
diff --git a/examples/UnclaimedDraftCreateExample.ts b/examples/UnclaimedDraftCreateExample.ts
index dc23f50d2..aa94b5d77 100644
--- a/examples/UnclaimedDraftCreateExample.ts
+++ b/examples/UnclaimedDraftCreateExample.ts
@@ -6,22 +6,24 @@ const apiCaller = new api.UnclaimedDraftApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const signers1 = new models.SubUnclaimedDraftSigner();
-signers1.name = "Jack";
-signers1.emailAddress = "jack@example.com";
-signers1.order = 0;
+const signers1: models.SubUnclaimedDraftSigner = {
+  name: "Jack",
+  emailAddress: "jack@example.com",
+  order: 0,
+};
 
 const signers = [
   signers1,
 ];
 
-const unclaimedDraftCreateRequest = new models.UnclaimedDraftCreateRequest();
-unclaimedDraftCreateRequest.type = models.UnclaimedDraftCreateRequest.TypeEnum.RequestSignature;
-unclaimedDraftCreateRequest.testMode = true;
-unclaimedDraftCreateRequest.files = [
-  fs.createReadStream("./example_signature_request.pdf"),
-];
-unclaimedDraftCreateRequest.signers = signers;
+const unclaimedDraftCreateRequest: models.UnclaimedDraftCreateRequest = {
+  type: models.UnclaimedDraftCreateRequest.TypeEnum.RequestSignature,
+  testMode: true,
+  files: [
+    fs.createReadStream("./example_signature_request.pdf"),
+  ],
+  signers: signers,
+};
 
 apiCaller.unclaimedDraftCreate(
   unclaimedDraftCreateRequest,
diff --git a/examples/UnclaimedDraftCreateFormFieldGroupsExample.java b/examples/UnclaimedDraftCreateFormFieldGroupsExample.java
index e30a749bb..1daa8d594 100644
--- a/examples/UnclaimedDraftCreateFormFieldGroupsExample.java
+++ b/examples/UnclaimedDraftCreateFormFieldGroupsExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class UnclaimedDraftCreateFormFieldGroupsExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var formFieldGroups1 = new SubFormFieldGroup();
         formFieldGroups1.groupId("RadioItemGroup1");
diff --git a/examples/UnclaimedDraftCreateFormFieldGroupsExample.ts b/examples/UnclaimedDraftCreateFormFieldGroupsExample.ts
index f3e47da2c..f6e079f42 100644
--- a/examples/UnclaimedDraftCreateFormFieldGroupsExample.ts
+++ b/examples/UnclaimedDraftCreateFormFieldGroupsExample.ts
@@ -6,58 +6,62 @@ const apiCaller = new api.UnclaimedDraftApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const formFieldGroups1 = new models.SubFormFieldGroup();
-formFieldGroups1.groupId = "RadioItemGroup1";
-formFieldGroups1.groupLabel = "Radio Item Group 1";
-formFieldGroups1.requirement = "require_0-1";
+const formFieldGroups1: models.SubFormFieldGroup = {
+  groupId: "RadioItemGroup1",
+  groupLabel: "Radio Item Group 1",
+  requirement: "require_0-1",
+};
 
 const formFieldGroups = [
   formFieldGroups1,
 ];
 
-const formFieldsPerDocument1 = new models.SubFormFieldsPerDocumentRadio();
-formFieldsPerDocument1.documentIndex = 0;
-formFieldsPerDocument1.apiId = "uniqueIdHere_1";
-formFieldsPerDocument1.type = "radio";
-formFieldsPerDocument1.required = false;
-formFieldsPerDocument1.signer = "0";
-formFieldsPerDocument1.width = 18;
-formFieldsPerDocument1.height = 18;
-formFieldsPerDocument1.x = 112;
-formFieldsPerDocument1.y = 328;
-formFieldsPerDocument1.group = "RadioItemGroup1";
-formFieldsPerDocument1.isChecked = true;
-formFieldsPerDocument1.name = "";
-formFieldsPerDocument1.page = 1;
+const formFieldsPerDocument1: models.SubFormFieldsPerDocumentRadio = {
+  documentIndex: 0,
+  apiId: "uniqueIdHere_1",
+  type: "radio",
+  required: false,
+  signer: "0",
+  width: 18,
+  height: 18,
+  x: 112,
+  y: 328,
+  group: "RadioItemGroup1",
+  isChecked: true,
+  name: "",
+  page: 1,
+};
 
-const formFieldsPerDocument2 = new models.SubFormFieldsPerDocumentRadio();
-formFieldsPerDocument2.documentIndex = 0;
-formFieldsPerDocument2.apiId = "uniqueIdHere_2";
-formFieldsPerDocument2.type = "radio";
-formFieldsPerDocument2.required = false;
-formFieldsPerDocument2.signer = "0";
-formFieldsPerDocument2.width = 18;
-formFieldsPerDocument2.height = 18;
-formFieldsPerDocument2.x = 112;
-formFieldsPerDocument2.y = 370;
-formFieldsPerDocument2.group = "RadioItemGroup1";
-formFieldsPerDocument2.isChecked = false;
-formFieldsPerDocument2.name = "";
-formFieldsPerDocument2.page = 1;
+const formFieldsPerDocument2: models.SubFormFieldsPerDocumentRadio = {
+  documentIndex: 0,
+  apiId: "uniqueIdHere_2",
+  type: "radio",
+  required: false,
+  signer: "0",
+  width: 18,
+  height: 18,
+  x: 112,
+  y: 370,
+  group: "RadioItemGroup1",
+  isChecked: false,
+  name: "",
+  page: 1,
+};
 
 const formFieldsPerDocument = [
   formFieldsPerDocument1,
   formFieldsPerDocument2,
 ];
 
-const unclaimedDraftCreateRequest = new models.UnclaimedDraftCreateRequest();
-unclaimedDraftCreateRequest.type = models.UnclaimedDraftCreateRequest.TypeEnum.RequestSignature;
-unclaimedDraftCreateRequest.testMode = false;
-unclaimedDraftCreateRequest.fileUrls = [
-  "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
-];
-unclaimedDraftCreateRequest.formFieldGroups = formFieldGroups;
-unclaimedDraftCreateRequest.formFieldsPerDocument = formFieldsPerDocument;
+const unclaimedDraftCreateRequest: models.UnclaimedDraftCreateRequest = {
+  type: models.UnclaimedDraftCreateRequest.TypeEnum.RequestSignature,
+  testMode: false,
+  fileUrls: [
+    "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
+  ],
+  formFieldGroups: formFieldGroups,
+  formFieldsPerDocument: formFieldsPerDocument,
+};
 
 apiCaller.unclaimedDraftCreate(
   unclaimedDraftCreateRequest,
diff --git a/examples/UnclaimedDraftCreateFormFieldRulesExample.java b/examples/UnclaimedDraftCreateFormFieldRulesExample.java
index 49de71fbe..87fb33735 100644
--- a/examples/UnclaimedDraftCreateFormFieldRulesExample.java
+++ b/examples/UnclaimedDraftCreateFormFieldRulesExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class UnclaimedDraftCreateFormFieldRulesExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var formFieldRules1Triggers1 = new SubFormFieldRuleTrigger();
         formFieldRules1Triggers1.id("uniqueIdHere_1");
diff --git a/examples/UnclaimedDraftCreateFormFieldRulesExample.ts b/examples/UnclaimedDraftCreateFormFieldRulesExample.ts
index c4abba3b1..8b41bbd5a 100644
--- a/examples/UnclaimedDraftCreateFormFieldRulesExample.ts
+++ b/examples/UnclaimedDraftCreateFormFieldRulesExample.ts
@@ -6,74 +6,80 @@ const apiCaller = new api.UnclaimedDraftApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const formFieldRules1Triggers1 = new models.SubFormFieldRuleTrigger();
-formFieldRules1Triggers1.id = "uniqueIdHere_1";
-formFieldRules1Triggers1.operator = models.SubFormFieldRuleTrigger.OperatorEnum.Is;
-formFieldRules1Triggers1.value = "foo";
+const formFieldRules1Triggers1: models.SubFormFieldRuleTrigger = {
+  id: "uniqueIdHere_1",
+  operator: models.SubFormFieldRuleTrigger.OperatorEnum.Is,
+  value: "foo",
+};
 
 const formFieldRules1Triggers = [
   formFieldRules1Triggers1,
 ];
 
-const formFieldRules1Actions1 = new models.SubFormFieldRuleAction();
-formFieldRules1Actions1.hidden = true;
-formFieldRules1Actions1.type = models.SubFormFieldRuleAction.TypeEnum.FieldVisibility;
-formFieldRules1Actions1.fieldId = "uniqueIdHere_2";
+const formFieldRules1Actions1: models.SubFormFieldRuleAction = {
+  hidden: true,
+  type: models.SubFormFieldRuleAction.TypeEnum.FieldVisibility,
+  fieldId: "uniqueIdHere_2",
+};
 
 const formFieldRules1Actions = [
   formFieldRules1Actions1,
 ];
 
-const formFieldRules1 = new models.SubFormFieldRule();
-formFieldRules1.id = "rule_1";
-formFieldRules1.triggerOperator = "AND";
-formFieldRules1.triggers = formFieldRules1Triggers;
-formFieldRules1.actions = formFieldRules1Actions;
+const formFieldRules1: models.SubFormFieldRule = {
+  id: "rule_1",
+  triggerOperator: "AND",
+  triggers: formFieldRules1Triggers,
+  actions: formFieldRules1Actions,
+};
 
 const formFieldRules = [
   formFieldRules1,
 ];
 
-const formFieldsPerDocument1 = new models.SubFormFieldsPerDocumentText();
-formFieldsPerDocument1.documentIndex = 0;
-formFieldsPerDocument1.apiId = "uniqueIdHere_1";
-formFieldsPerDocument1.type = "text";
-formFieldsPerDocument1.required = true;
-formFieldsPerDocument1.signer = "0";
-formFieldsPerDocument1.width = 100;
-formFieldsPerDocument1.height = 16;
-formFieldsPerDocument1.x = 112;
-formFieldsPerDocument1.y = 328;
-formFieldsPerDocument1.name = "";
-formFieldsPerDocument1.page = 1;
-formFieldsPerDocument1.validationType = models.SubFormFieldsPerDocumentText.ValidationTypeEnum.NumbersOnly;
+const formFieldsPerDocument1: models.SubFormFieldsPerDocumentText = {
+  documentIndex: 0,
+  apiId: "uniqueIdHere_1",
+  type: "text",
+  required: true,
+  signer: "0",
+  width: 100,
+  height: 16,
+  x: 112,
+  y: 328,
+  name: "",
+  page: 1,
+  validationType: models.SubFormFieldsPerDocumentText.ValidationTypeEnum.NumbersOnly,
+};
 
-const formFieldsPerDocument2 = new models.SubFormFieldsPerDocumentSignature();
-formFieldsPerDocument2.documentIndex = 0;
-formFieldsPerDocument2.apiId = "uniqueIdHere_2";
-formFieldsPerDocument2.type = "signature";
-formFieldsPerDocument2.required = true;
-formFieldsPerDocument2.signer = "0";
-formFieldsPerDocument2.width = 120;
-formFieldsPerDocument2.height = 30;
-formFieldsPerDocument2.x = 530;
-formFieldsPerDocument2.y = 415;
-formFieldsPerDocument2.name = "";
-formFieldsPerDocument2.page = 1;
+const formFieldsPerDocument2: models.SubFormFieldsPerDocumentSignature = {
+  documentIndex: 0,
+  apiId: "uniqueIdHere_2",
+  type: "signature",
+  required: true,
+  signer: "0",
+  width: 120,
+  height: 30,
+  x: 530,
+  y: 415,
+  name: "",
+  page: 1,
+};
 
 const formFieldsPerDocument = [
   formFieldsPerDocument1,
   formFieldsPerDocument2,
 ];
 
-const unclaimedDraftCreateRequest = new models.UnclaimedDraftCreateRequest();
-unclaimedDraftCreateRequest.type = models.UnclaimedDraftCreateRequest.TypeEnum.RequestSignature;
-unclaimedDraftCreateRequest.testMode = false;
-unclaimedDraftCreateRequest.fileUrls = [
-  "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
-];
-unclaimedDraftCreateRequest.formFieldRules = formFieldRules;
-unclaimedDraftCreateRequest.formFieldsPerDocument = formFieldsPerDocument;
+const unclaimedDraftCreateRequest: models.UnclaimedDraftCreateRequest = {
+  type: models.UnclaimedDraftCreateRequest.TypeEnum.RequestSignature,
+  testMode: false,
+  fileUrls: [
+    "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
+  ],
+  formFieldRules: formFieldRules,
+  formFieldsPerDocument: formFieldsPerDocument,
+};
 
 apiCaller.unclaimedDraftCreate(
   unclaimedDraftCreateRequest,
diff --git a/examples/UnclaimedDraftCreateFormFieldsPerDocumentExample.java b/examples/UnclaimedDraftCreateFormFieldsPerDocumentExample.java
index b048a8ba9..5fb0e7514 100644
--- a/examples/UnclaimedDraftCreateFormFieldsPerDocumentExample.java
+++ b/examples/UnclaimedDraftCreateFormFieldsPerDocumentExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class UnclaimedDraftCreateFormFieldsPerDocumentExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var formFieldsPerDocument1 = new SubFormFieldsPerDocumentText();
         formFieldsPerDocument1.documentIndex(0);
diff --git a/examples/UnclaimedDraftCreateFormFieldsPerDocumentExample.ts b/examples/UnclaimedDraftCreateFormFieldsPerDocumentExample.ts
index b5e61ab5a..d010996de 100644
--- a/examples/UnclaimedDraftCreateFormFieldsPerDocumentExample.ts
+++ b/examples/UnclaimedDraftCreateFormFieldsPerDocumentExample.ts
@@ -6,46 +6,49 @@ const apiCaller = new api.UnclaimedDraftApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const formFieldsPerDocument1 = new models.SubFormFieldsPerDocumentText();
-formFieldsPerDocument1.documentIndex = 0;
-formFieldsPerDocument1.apiId = "uniqueIdHere_1";
-formFieldsPerDocument1.type = "text";
-formFieldsPerDocument1.required = true;
-formFieldsPerDocument1.signer = "1";
-formFieldsPerDocument1.width = 100;
-formFieldsPerDocument1.height = 16;
-formFieldsPerDocument1.x = 112;
-formFieldsPerDocument1.y = 328;
-formFieldsPerDocument1.name = "";
-formFieldsPerDocument1.page = 1;
-formFieldsPerDocument1.placeholder = "";
-formFieldsPerDocument1.validationType = models.SubFormFieldsPerDocumentText.ValidationTypeEnum.NumbersOnly;
+const formFieldsPerDocument1: models.SubFormFieldsPerDocumentText = {
+  documentIndex: 0,
+  apiId: "uniqueIdHere_1",
+  type: "text",
+  required: true,
+  signer: "1",
+  width: 100,
+  height: 16,
+  x: 112,
+  y: 328,
+  name: "",
+  page: 1,
+  placeholder: "",
+  validationType: models.SubFormFieldsPerDocumentText.ValidationTypeEnum.NumbersOnly,
+};
 
-const formFieldsPerDocument2 = new models.SubFormFieldsPerDocumentSignature();
-formFieldsPerDocument2.documentIndex = 0;
-formFieldsPerDocument2.apiId = "uniqueIdHere_2";
-formFieldsPerDocument2.type = "signature";
-formFieldsPerDocument2.required = true;
-formFieldsPerDocument2.signer = "0";
-formFieldsPerDocument2.width = 120;
-formFieldsPerDocument2.height = 30;
-formFieldsPerDocument2.x = 530;
-formFieldsPerDocument2.y = 415;
-formFieldsPerDocument2.name = "";
-formFieldsPerDocument2.page = 1;
+const formFieldsPerDocument2: models.SubFormFieldsPerDocumentSignature = {
+  documentIndex: 0,
+  apiId: "uniqueIdHere_2",
+  type: "signature",
+  required: true,
+  signer: "0",
+  width: 120,
+  height: 30,
+  x: 530,
+  y: 415,
+  name: "",
+  page: 1,
+};
 
 const formFieldsPerDocument = [
   formFieldsPerDocument1,
   formFieldsPerDocument2,
 ];
 
-const unclaimedDraftCreateRequest = new models.UnclaimedDraftCreateRequest();
-unclaimedDraftCreateRequest.type = models.UnclaimedDraftCreateRequest.TypeEnum.RequestSignature;
-unclaimedDraftCreateRequest.testMode = false;
-unclaimedDraftCreateRequest.fileUrls = [
-  "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
-];
-unclaimedDraftCreateRequest.formFieldsPerDocument = formFieldsPerDocument;
+const unclaimedDraftCreateRequest: models.UnclaimedDraftCreateRequest = {
+  type: models.UnclaimedDraftCreateRequest.TypeEnum.RequestSignature,
+  testMode: false,
+  fileUrls: [
+    "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
+  ],
+  formFieldsPerDocument: formFieldsPerDocument,
+};
 
 apiCaller.unclaimedDraftCreate(
   unclaimedDraftCreateRequest,
diff --git a/examples/UnclaimedDraftEditAndResendExample.java b/examples/UnclaimedDraftEditAndResendExample.java
index 4866e6524..23ebe38ea 100644
--- a/examples/UnclaimedDraftEditAndResendExample.java
+++ b/examples/UnclaimedDraftEditAndResendExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class UnclaimedDraftEditAndResendExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var unclaimedDraftEditAndResendRequest = new UnclaimedDraftEditAndResendRequest();
         unclaimedDraftEditAndResendRequest.clientId("b6b8e7deaf8f0b95c029dca049356d4a2cf9710a");
diff --git a/examples/UnclaimedDraftEditAndResendExample.ts b/examples/UnclaimedDraftEditAndResendExample.ts
index 16a998390..04a04f15f 100644
--- a/examples/UnclaimedDraftEditAndResendExample.ts
+++ b/examples/UnclaimedDraftEditAndResendExample.ts
@@ -6,9 +6,10 @@ const apiCaller = new api.UnclaimedDraftApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const unclaimedDraftEditAndResendRequest = new models.UnclaimedDraftEditAndResendRequest();
-unclaimedDraftEditAndResendRequest.clientId = "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a";
-unclaimedDraftEditAndResendRequest.testMode = false;
+const unclaimedDraftEditAndResendRequest: models.UnclaimedDraftEditAndResendRequest = {
+  clientId: "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a",
+  testMode: false,
+};
 
 apiCaller.unclaimedDraftEditAndResend(
   "fa5c8a0b0f492d768749333ad6fcc214c111e967", // signatureRequestId
diff --git a/sandbox/dotnet/src/Dropbox.SignSandbox/FaxLineAreaCodeGetExample.cs b/sandbox/dotnet/src/Dropbox.SignSandbox/FaxLineAreaCodeGetExample.cs
index b2b60876b..403591924 100644
--- a/sandbox/dotnet/src/Dropbox.SignSandbox/FaxLineAreaCodeGetExample.cs
+++ b/sandbox/dotnet/src/Dropbox.SignSandbox/FaxLineAreaCodeGetExample.cs
@@ -19,10 +19,7 @@ public static void Run()
         try
         {
             var response = new FaxLineApi(config).FaxLineAreaCodeGet(
-                country: "US",
-                state: null,
-                province: null,
-                city: null
+                country: "US"
             );
 
             Console.WriteLine(response);
diff --git a/sandbox/dotnet/src/Dropbox.SignSandbox/FaxLineListExample.cs b/sandbox/dotnet/src/Dropbox.SignSandbox/FaxLineListExample.cs
index cbd75903e..278eeea74 100644
--- a/sandbox/dotnet/src/Dropbox.SignSandbox/FaxLineListExample.cs
+++ b/sandbox/dotnet/src/Dropbox.SignSandbox/FaxLineListExample.cs
@@ -21,8 +21,7 @@ public static void Run()
             var response = new FaxLineApi(config).FaxLineList(
                 accountId: "ab55cd14a97219e36b5ff5fe23f2f9329b0c1e97",
                 page: 1,
-                pageSize: 20,
-                showTeamLines: null
+                pageSize: 20
             );
 
             Console.WriteLine(response);
diff --git a/sandbox/dotnet/src/Dropbox.SignSandbox/SignatureRequestListExample.cs b/sandbox/dotnet/src/Dropbox.SignSandbox/SignatureRequestListExample.cs
index d5b2bfb9d..8092e5330 100644
--- a/sandbox/dotnet/src/Dropbox.SignSandbox/SignatureRequestListExample.cs
+++ b/sandbox/dotnet/src/Dropbox.SignSandbox/SignatureRequestListExample.cs
@@ -20,10 +20,8 @@ public static void Run()
         try
         {
             var response = new SignatureRequestApi(config).SignatureRequestList(
-                accountId: null,
                 page: 1,
-                pageSize: 20,
-                query: null
+                pageSize: 20
             );
 
             Console.WriteLine(response);
diff --git a/sandbox/dotnet/src/Dropbox.SignSandbox/TemplateFilesExample.cs b/sandbox/dotnet/src/Dropbox.SignSandbox/TemplateFilesExample.cs
index 96e9237ee..0cf55f3a6 100644
--- a/sandbox/dotnet/src/Dropbox.SignSandbox/TemplateFilesExample.cs
+++ b/sandbox/dotnet/src/Dropbox.SignSandbox/TemplateFilesExample.cs
@@ -20,8 +20,7 @@ public static void Run()
         try
         {
             var response = new TemplateApi(config).TemplateFiles(
-                templateId: "f57db65d3f933b5316d398057a36176831451a35",
-                fileType: null
+                templateId: "f57db65d3f933b5316d398057a36176831451a35"
             );
             var fileStream = File.Create("./file_response");
             response.Seek(0, SeekOrigin.Begin);
diff --git a/sandbox/dotnet/src/Dropbox.SignSandbox/TemplateListExample.cs b/sandbox/dotnet/src/Dropbox.SignSandbox/TemplateListExample.cs
index b41f357ce..4d0b900bf 100644
--- a/sandbox/dotnet/src/Dropbox.SignSandbox/TemplateListExample.cs
+++ b/sandbox/dotnet/src/Dropbox.SignSandbox/TemplateListExample.cs
@@ -20,10 +20,8 @@ public static void Run()
         try
         {
             var response = new TemplateApi(config).TemplateList(
-                accountId: null,
                 page: 1,
-                pageSize: 20,
-                query: null
+                pageSize: 20
             );
 
             Console.WriteLine(response);
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/AccountCreateExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/AccountCreateExample.java
index a9b8c52d2..2743ffa13 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/AccountCreateExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/AccountCreateExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class AccountCreateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var accountCreateRequest = new AccountCreateRequest();
         accountCreateRequest.emailAddress("newuser@dropboxsign.com");
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/AccountCreateOauthExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/AccountCreateOauthExample.java
index 5cfc13531..e6ae95b94 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/AccountCreateOauthExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/AccountCreateOauthExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class AccountCreateOauthExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var accountCreateRequest = new AccountCreateRequest();
         accountCreateRequest.emailAddress("newuser@dropboxsign.com");
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/AccountGetExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/AccountGetExample.java
index 3a90b0375..b1f712ace 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/AccountGetExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/AccountGetExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,12 +20,15 @@ public class AccountGetExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
-            var response = new AccountApi(config).accountGet();
+            var response = new AccountApi(config).accountGet(
+                null, // accountId
+                null // emailAddress
+            );
 
             System.out.println(response);
         } catch (ApiException e) {
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/AccountUpdateExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/AccountUpdateExample.java
index ac9c0d227..c1d2f1ca2 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/AccountUpdateExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/AccountUpdateExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class AccountUpdateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var accountUpdateRequest = new AccountUpdateRequest();
         accountUpdateRequest.callbackUrl("https://www.example.com/callback");
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/AccountVerifyExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/AccountVerifyExample.java
index 6d6f22f72..5180f6772 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/AccountVerifyExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/AccountVerifyExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class AccountVerifyExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var accountVerifyRequest = new AccountVerifyRequest();
         accountVerifyRequest.emailAddress("some_user@dropboxsign.com");
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/ApiAppCreateExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/ApiAppCreateExample.java
index 9422376ae..2d81a97b1 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/ApiAppCreateExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/ApiAppCreateExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class ApiAppCreateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var oauth = new SubOAuth();
         oauth.callbackUrl("https://example.com/oauth");
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/ApiAppDeleteExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/ApiAppDeleteExample.java
index f9f7c5c9f..aa23b5f0c 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/ApiAppDeleteExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/ApiAppDeleteExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class ApiAppDeleteExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/ApiAppGetExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/ApiAppGetExample.java
index 6a8330449..6ad075b4b 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/ApiAppGetExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/ApiAppGetExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class ApiAppGetExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/ApiAppListExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/ApiAppListExample.java
index 5f023c890..073756800 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/ApiAppListExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/ApiAppListExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class ApiAppListExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/ApiAppUpdateExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/ApiAppUpdateExample.java
index 19eb17192..ee6290b5e 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/ApiAppUpdateExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/ApiAppUpdateExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class ApiAppUpdateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var oauth = new SubOAuth();
         oauth.callbackUrl("https://example.com/oauth");
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/BulkSendJobGetExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/BulkSendJobGetExample.java
index a90b43560..da4680b15 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/BulkSendJobGetExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/BulkSendJobGetExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class BulkSendJobGetExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/BulkSendJobListExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/BulkSendJobListExample.java
index fc5d223e3..9c9b835e5 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/BulkSendJobListExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/BulkSendJobListExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class BulkSendJobListExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/EmbeddedEditUrlExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/EmbeddedEditUrlExample.java
index 81139263b..a1097bd5c 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/EmbeddedEditUrlExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/EmbeddedEditUrlExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class EmbeddedEditUrlExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var mergeFields = new ArrayList<SubMergeField>(List.of ());
 
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/EmbeddedSignUrlExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/EmbeddedSignUrlExample.java
index 8b58ba353..45b7f5040 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/EmbeddedSignUrlExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/EmbeddedSignUrlExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class EmbeddedSignUrlExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/FaxDeleteExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/FaxDeleteExample.java
index ac5fc888d..f31f0ea99 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/FaxDeleteExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/FaxDeleteExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,7 +20,7 @@ public class FaxDeleteExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
 
         try
         {
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/FaxFilesExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/FaxFilesExample.java
index 1d2e62fac..a9e1f1728 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/FaxFilesExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/FaxFilesExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,7 +20,7 @@ public class FaxFilesExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
 
         try
         {
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/FaxGetExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/FaxGetExample.java
index 3db05bd4b..1500980aa 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/FaxGetExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/FaxGetExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,7 +20,7 @@ public class FaxGetExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
 
         try
         {
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/FaxLineAddUserExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/FaxLineAddUserExample.java
index f3883223f..d18bd73f6 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/FaxLineAddUserExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/FaxLineAddUserExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,7 +20,7 @@ public class FaxLineAddUserExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
 
         var faxLineAddUserRequest = new FaxLineAddUserRequest();
         faxLineAddUserRequest.number("[FAX_NUMBER]");
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/FaxLineAreaCodeGetExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/FaxLineAreaCodeGetExample.java
index 0f2055863..57d64b40b 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/FaxLineAreaCodeGetExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/FaxLineAreaCodeGetExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,7 +20,7 @@ public class FaxLineAreaCodeGetExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
 
         try
         {
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/FaxLineCreateExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/FaxLineCreateExample.java
index d1a1fa689..1c765fc97 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/FaxLineCreateExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/FaxLineCreateExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,7 +20,7 @@ public class FaxLineCreateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
 
         var faxLineCreateRequest = new FaxLineCreateRequest();
         faxLineCreateRequest.areaCode(209);
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/FaxLineDeleteExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/FaxLineDeleteExample.java
index 348833fba..8516f8f63 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/FaxLineDeleteExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/FaxLineDeleteExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,7 +20,7 @@ public class FaxLineDeleteExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
 
         var faxLineDeleteRequest = new FaxLineDeleteRequest();
         faxLineDeleteRequest.number("[FAX_NUMBER]");
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/FaxLineGetExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/FaxLineGetExample.java
index 8f9cd3169..5784253bb 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/FaxLineGetExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/FaxLineGetExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,7 +20,7 @@ public class FaxLineGetExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
 
         try
         {
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/FaxLineListExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/FaxLineListExample.java
index 7ce8cf1cf..0facd7cfe 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/FaxLineListExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/FaxLineListExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,7 +20,7 @@ public class FaxLineListExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
 
         try
         {
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/FaxLineRemoveUserExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/FaxLineRemoveUserExample.java
index 568d08d5d..f815f362b 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/FaxLineRemoveUserExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/FaxLineRemoveUserExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,7 +20,7 @@ public class FaxLineRemoveUserExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
 
         var faxLineRemoveUserRequest = new FaxLineRemoveUserRequest();
         faxLineRemoveUserRequest.number("[FAX_NUMBER]");
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/FaxListExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/FaxListExample.java
index 1ca7c0a54..c44f536b9 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/FaxListExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/FaxListExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,7 +20,7 @@ public class FaxListExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
 
         try
         {
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/FaxSendExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/FaxSendExample.java
index 62696b80d..9648b871a 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/FaxSendExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/FaxSendExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,7 +20,7 @@ public class FaxSendExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
 
         var faxSendRequest = new FaxSendRequest();
         faxSendRequest.recipient("16690000001");
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/OauthTokenGenerateExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/OauthTokenGenerateExample.java
index 7c51af01f..24bbb65c6 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/OauthTokenGenerateExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/OauthTokenGenerateExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/OauthTokenRefreshExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/OauthTokenRefreshExample.java
index 5b2133b0e..f79562e02 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/OauthTokenRefreshExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/OauthTokenRefreshExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/ReportCreateExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/ReportCreateExample.java
index ecd726bcb..2f0013c1a 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/ReportCreateExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/ReportCreateExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,7 +20,7 @@ public class ReportCreateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
 
         var reportCreateRequest = new ReportCreateRequest();
         reportCreateRequest.startDate("09/01/2020");
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestBulkCreateEmbeddedWithTemplateExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestBulkCreateEmbeddedWithTemplateExample.java
index fcfbef591..a5bec1fb9 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestBulkCreateEmbeddedWithTemplateExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestBulkCreateEmbeddedWithTemplateExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,7 +20,7 @@ public class SignatureRequestBulkCreateEmbeddedWithTemplateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
 
         var signerList2CustomFields1 = new SubBulkSignerListCustomField();
         signerList2CustomFields1.name("company");
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestBulkSendWithTemplateExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestBulkSendWithTemplateExample.java
index fb9baba01..b539626e0 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestBulkSendWithTemplateExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestBulkSendWithTemplateExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class SignatureRequestBulkSendWithTemplateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var signerList2CustomFields1 = new SubBulkSignerListCustomField();
         signerList2CustomFields1.name("company");
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestCancelExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestCancelExample.java
index a1e436802..076a73d1d 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestCancelExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestCancelExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class SignatureRequestCancelExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestCreateEmbeddedExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestCreateEmbeddedExample.java
index ee5f5bb2a..5193cee20 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestCreateEmbeddedExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestCreateEmbeddedExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class SignatureRequestCreateEmbeddedExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var signingOptions = new SubSigningOptions();
         signingOptions.defaultType(SubSigningOptions.DefaultTypeEnum.DRAW);
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestCreateEmbeddedGroupedSignersExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestCreateEmbeddedGroupedSignersExample.java
index 0228be4a6..b069e2001 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestCreateEmbeddedGroupedSignersExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestCreateEmbeddedGroupedSignersExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class SignatureRequestCreateEmbeddedGroupedSignersExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var groupedSigners2Signers1 = new SubSignatureRequestSigner();
         groupedSigners2Signers1.name("Bob");
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestCreateEmbeddedWithTemplateExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestCreateEmbeddedWithTemplateExample.java
index 5957ccba0..309d422ee 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestCreateEmbeddedWithTemplateExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestCreateEmbeddedWithTemplateExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class SignatureRequestCreateEmbeddedWithTemplateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var signingOptions = new SubSigningOptions();
         signingOptions.defaultType(SubSigningOptions.DefaultTypeEnum.DRAW);
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestEditEmbeddedExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestEditEmbeddedExample.java
index 8370a232e..c69cc85e4 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestEditEmbeddedExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestEditEmbeddedExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class SignatureRequestEditEmbeddedExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var signingOptions = new SubSigningOptions();
         signingOptions.defaultType(SubSigningOptions.DefaultTypeEnum.DRAW);
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestEditEmbeddedGroupedSignersExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestEditEmbeddedGroupedSignersExample.java
index 8859b04f8..d526e3d88 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestEditEmbeddedGroupedSignersExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestEditEmbeddedGroupedSignersExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class SignatureRequestEditEmbeddedGroupedSignersExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var groupedSigners2Signers1 = new SubSignatureRequestSigner();
         groupedSigners2Signers1.name("Bob");
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestEditEmbeddedWithTemplateExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestEditEmbeddedWithTemplateExample.java
index 77c294dea..b0c034f3b 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestEditEmbeddedWithTemplateExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestEditEmbeddedWithTemplateExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class SignatureRequestEditEmbeddedWithTemplateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var signingOptions = new SubSigningOptions();
         signingOptions.defaultType(SubSigningOptions.DefaultTypeEnum.DRAW);
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestEditExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestEditExample.java
index c0423f9b9..ee628deef 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestEditExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestEditExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class SignatureRequestEditExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var fieldOptions = new SubFieldOptions();
         fieldOptions.dateFormat(SubFieldOptions.DateFormatEnum.DD_MM_YYYY);
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestEditGroupedSignersExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestEditGroupedSignersExample.java
index 693b72c6c..934764bdd 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestEditGroupedSignersExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestEditGroupedSignersExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class SignatureRequestEditGroupedSignersExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var groupedSigners2Signers1 = new SubSignatureRequestSigner();
         groupedSigners2Signers1.name("Bob");
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestEditWithTemplateExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestEditWithTemplateExample.java
index bcb4128d6..d755e4e03 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestEditWithTemplateExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestEditWithTemplateExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class SignatureRequestEditWithTemplateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var signingOptions = new SubSigningOptions();
         signingOptions.defaultType(SubSigningOptions.DefaultTypeEnum.DRAW);
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestFilesAsDataUriExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestFilesAsDataUriExample.java
index 765fb93ce..a7e5a36e8 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestFilesAsDataUriExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestFilesAsDataUriExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class SignatureRequestFilesAsDataUriExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestFilesAsFileUrlExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestFilesAsFileUrlExample.java
index 62e253779..2a024ee7d 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestFilesAsFileUrlExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestFilesAsFileUrlExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class SignatureRequestFilesAsFileUrlExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestFilesExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestFilesExample.java
index 758d2997b..53e828103 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestFilesExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestFilesExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class SignatureRequestFilesExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestGetExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestGetExample.java
index b93d099d6..dc912723d 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestGetExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestGetExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class SignatureRequestGetExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestListExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestListExample.java
index 76f018548..72048a036 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestListExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestListExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class SignatureRequestListExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestReleaseHoldExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestReleaseHoldExample.java
index 521794ef1..a7fd42c40 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestReleaseHoldExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestReleaseHoldExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class SignatureRequestReleaseHoldExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestRemindExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestRemindExample.java
index 23830d9d3..ce292ba16 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestRemindExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestRemindExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class SignatureRequestRemindExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var signatureRequestRemindRequest = new SignatureRequestRemindRequest();
         signatureRequestRemindRequest.emailAddress("john@example.com");
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestRemoveExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestRemoveExample.java
index d205e388a..e9b030a26 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestRemoveExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestRemoveExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,7 +20,7 @@ public class SignatureRequestRemoveExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
 
         try
         {
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestSendExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestSendExample.java
index 2a57da157..313b895b7 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestSendExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestSendExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class SignatureRequestSendExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var fieldOptions = new SubFieldOptions();
         fieldOptions.dateFormat(SubFieldOptions.DateFormatEnum.DD_MM_YYYY);
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestSendGroupedSignersExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestSendGroupedSignersExample.java
index 14d6d0fba..ba078573a 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestSendGroupedSignersExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestSendGroupedSignersExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class SignatureRequestSendGroupedSignersExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var groupedSigners2Signers1 = new SubSignatureRequestSigner();
         groupedSigners2Signers1.name("Bob");
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestSendWithTemplateExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestSendWithTemplateExample.java
index fe3a4ce83..f44a67ed9 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestSendWithTemplateExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestSendWithTemplateExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class SignatureRequestSendWithTemplateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var signingOptions = new SubSigningOptions();
         signingOptions.defaultType(SubSigningOptions.DefaultTypeEnum.DRAW);
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestUpdateExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestUpdateExample.java
index ef9873326..3500c76c5 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestUpdateExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/SignatureRequestUpdateExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class SignatureRequestUpdateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var signatureRequestUpdateRequest = new SignatureRequestUpdateRequest();
         signatureRequestUpdateRequest.signatureId("2f9781e1a8e2045224d808c153c2e1d3df6f8f2f");
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TeamAddMemberAccountIdExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TeamAddMemberAccountIdExample.java
index cdeea5ec5..1aea5849a 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TeamAddMemberAccountIdExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TeamAddMemberAccountIdExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class TeamAddMemberAccountIdExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var teamAddMemberRequest = new TeamAddMemberRequest();
         teamAddMemberRequest.accountId("f57db65d3f933b5316d398057a36176831451a35");
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TeamAddMemberExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TeamAddMemberExample.java
index 788cc3bd0..6e3af4073 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TeamAddMemberExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TeamAddMemberExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class TeamAddMemberExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var teamAddMemberRequest = new TeamAddMemberRequest();
         teamAddMemberRequest.emailAddress("george@example.com");
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TeamCreateExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TeamCreateExample.java
index 0b72d53e2..ecfe2329d 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TeamCreateExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TeamCreateExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class TeamCreateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var teamCreateRequest = new TeamCreateRequest();
         teamCreateRequest.name("New Team Name");
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TeamDeleteExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TeamDeleteExample.java
index f39d1324c..076a2e520 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TeamDeleteExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TeamDeleteExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class TeamDeleteExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TeamGetExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TeamGetExample.java
index 4356bb8a9..8ab6d7468 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TeamGetExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TeamGetExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class TeamGetExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TeamInfoExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TeamInfoExample.java
index 8b5718628..6f2c882a0 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TeamInfoExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TeamInfoExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class TeamInfoExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TeamInvitesExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TeamInvitesExample.java
index 204109825..f6d2b55c1 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TeamInvitesExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TeamInvitesExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,12 +20,14 @@ public class TeamInvitesExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
-            var response = new TeamApi(config).teamInvites();
+            var response = new TeamApi(config).teamInvites(
+                null // emailAddress
+            );
 
             System.out.println(response);
         } catch (ApiException e) {
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TeamMembersExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TeamMembersExample.java
index bc709c951..74999477f 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TeamMembersExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TeamMembersExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class TeamMembersExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TeamRemoveMemberAccountIdExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TeamRemoveMemberAccountIdExample.java
index 85c46ee65..d2d4dede2 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TeamRemoveMemberAccountIdExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TeamRemoveMemberAccountIdExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class TeamRemoveMemberAccountIdExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var teamRemoveMemberRequest = new TeamRemoveMemberRequest();
         teamRemoveMemberRequest.accountId("f57db65d3f933b5316d398057a36176831451a35");
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TeamRemoveMemberExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TeamRemoveMemberExample.java
index 40938583f..e68187a2f 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TeamRemoveMemberExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TeamRemoveMemberExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class TeamRemoveMemberExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var teamRemoveMemberRequest = new TeamRemoveMemberRequest();
         teamRemoveMemberRequest.emailAddress("teammate@dropboxsign.com");
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TeamSubTeamsExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TeamSubTeamsExample.java
index f0ee98cf1..4ab0bc0d7 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TeamSubTeamsExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TeamSubTeamsExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class TeamSubTeamsExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TeamUpdateExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TeamUpdateExample.java
index 54f6bf2a1..e81903238 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TeamUpdateExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TeamUpdateExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class TeamUpdateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var teamUpdateRequest = new TeamUpdateRequest();
         teamUpdateRequest.name("New Team Name");
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateAddUserExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateAddUserExample.java
index 144cb00ef..3649e46f4 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateAddUserExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateAddUserExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class TemplateAddUserExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var templateAddUserRequest = new TemplateAddUserRequest();
         templateAddUserRequest.emailAddress("george@dropboxsign.com");
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateCreateEmbeddedDraftExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateCreateEmbeddedDraftExample.java
index cb8c9ce12..bf7c9720d 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateCreateEmbeddedDraftExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateCreateEmbeddedDraftExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class TemplateCreateEmbeddedDraftExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var fieldOptions = new SubFieldOptions();
         fieldOptions.dateFormat(SubFieldOptions.DateFormatEnum.DD_MM_YYYY);
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateCreateEmbeddedDraftFormFieldGroupsExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateCreateEmbeddedDraftFormFieldGroupsExample.java
index 61c6fc967..1a7ff9bb4 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateCreateEmbeddedDraftFormFieldGroupsExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateCreateEmbeddedDraftFormFieldGroupsExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class TemplateCreateEmbeddedDraftFormFieldGroupsExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var fieldOptions = new SubFieldOptions();
         fieldOptions.dateFormat(SubFieldOptions.DateFormatEnum.DD_MM_YYYY);
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateCreateEmbeddedDraftFormFieldRulesExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateCreateEmbeddedDraftFormFieldRulesExample.java
index 7bb877263..71b441944 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateCreateEmbeddedDraftFormFieldRulesExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateCreateEmbeddedDraftFormFieldRulesExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class TemplateCreateEmbeddedDraftFormFieldRulesExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var formFieldRules1Triggers1 = new SubFormFieldRuleTrigger();
         formFieldRules1Triggers1.id("uniqueIdHere_1");
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateCreateEmbeddedDraftFormFieldsPerDocumentExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateCreateEmbeddedDraftFormFieldsPerDocumentExample.java
index 38e8fccbc..8ac9bae17 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateCreateEmbeddedDraftFormFieldsPerDocumentExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateCreateEmbeddedDraftFormFieldsPerDocumentExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class TemplateCreateEmbeddedDraftFormFieldsPerDocumentExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var fieldOptions = new SubFieldOptions();
         fieldOptions.dateFormat(SubFieldOptions.DateFormatEnum.DD_MM_YYYY);
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateCreateExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateCreateExample.java
index b8b8e5150..ebf652f91 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateCreateExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateCreateExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class TemplateCreateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var fieldOptions = new SubFieldOptions();
         fieldOptions.dateFormat(SubFieldOptions.DateFormatEnum.DD_MM_YYYY);
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateCreateFormFieldGroupsExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateCreateFormFieldGroupsExample.java
index 08612bd26..62f5094e7 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateCreateFormFieldGroupsExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateCreateFormFieldGroupsExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class TemplateCreateFormFieldGroupsExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var fieldOptions = new SubFieldOptions();
         fieldOptions.dateFormat(SubFieldOptions.DateFormatEnum.DD_MM_YYYY);
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateCreateFormFieldRulesExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateCreateFormFieldRulesExample.java
index a3c621aee..acc954c3e 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateCreateFormFieldRulesExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateCreateFormFieldRulesExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class TemplateCreateFormFieldRulesExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var formFieldRules1Triggers1 = new SubFormFieldRuleTrigger();
         formFieldRules1Triggers1.id("uniqueIdHere_1");
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateCreateFormFieldsPerDocumentExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateCreateFormFieldsPerDocumentExample.java
index 397046a78..9873668b7 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateCreateFormFieldsPerDocumentExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateCreateFormFieldsPerDocumentExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class TemplateCreateFormFieldsPerDocumentExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var fieldOptions = new SubFieldOptions();
         fieldOptions.dateFormat(SubFieldOptions.DateFormatEnum.DD_MM_YYYY);
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateDeleteExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateDeleteExample.java
index b9d0b77ad..6ca874681 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateDeleteExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateDeleteExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class TemplateDeleteExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateFilesAsDataUriExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateFilesAsDataUriExample.java
index 6ef950fe3..02c9b69ca 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateFilesAsDataUriExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateFilesAsDataUriExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class TemplateFilesAsDataUriExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateFilesAsFileUrlExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateFilesAsFileUrlExample.java
index 3ac688da1..2b316f92b 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateFilesAsFileUrlExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateFilesAsFileUrlExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class TemplateFilesAsFileUrlExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateFilesExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateFilesExample.java
index 90c2975b2..d003de835 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateFilesExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateFilesExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class TemplateFilesExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateGetExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateGetExample.java
index affbf4d04..2aabdc6bc 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateGetExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateGetExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class TemplateGetExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateListExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateListExample.java
index 45250a456..29e115b74 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateListExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateListExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class TemplateListExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateRemoveUserExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateRemoveUserExample.java
index d3d157b24..7d29ffac9 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateRemoveUserExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateRemoveUserExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class TemplateRemoveUserExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var templateRemoveUserRequest = new TemplateRemoveUserRequest();
         templateRemoveUserRequest.emailAddress("george@dropboxsign.com");
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateUpdateFilesExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateUpdateFilesExample.java
index 865668461..8f36d7626 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateUpdateFilesExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/TemplateUpdateFilesExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class TemplateUpdateFilesExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var templateUpdateFilesRequest = new TemplateUpdateFilesRequest();
         templateUpdateFilesRequest.files(List.of (
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/UnclaimedDraftCreateEmbeddedExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/UnclaimedDraftCreateEmbeddedExample.java
index 0dfd50d88..e6bc38ff1 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/UnclaimedDraftCreateEmbeddedExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/UnclaimedDraftCreateEmbeddedExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class UnclaimedDraftCreateEmbeddedExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var unclaimedDraftCreateEmbeddedRequest = new UnclaimedDraftCreateEmbeddedRequest();
         unclaimedDraftCreateEmbeddedRequest.clientId("b6b8e7deaf8f0b95c029dca049356d4a2cf9710a");
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/UnclaimedDraftCreateEmbeddedFormFieldGroupsExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/UnclaimedDraftCreateEmbeddedFormFieldGroupsExample.java
index f597e3e18..b9918381a 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/UnclaimedDraftCreateEmbeddedFormFieldGroupsExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/UnclaimedDraftCreateEmbeddedFormFieldGroupsExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class UnclaimedDraftCreateEmbeddedFormFieldGroupsExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var formFieldGroups1 = new SubFormFieldGroup();
         formFieldGroups1.groupId("RadioItemGroup1");
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/UnclaimedDraftCreateEmbeddedFormFieldRulesExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/UnclaimedDraftCreateEmbeddedFormFieldRulesExample.java
index d2483f32f..f3ce4c53c 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/UnclaimedDraftCreateEmbeddedFormFieldRulesExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/UnclaimedDraftCreateEmbeddedFormFieldRulesExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class UnclaimedDraftCreateEmbeddedFormFieldRulesExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var formFieldRules1Triggers1 = new SubFormFieldRuleTrigger();
         formFieldRules1Triggers1.id("uniqueIdHere_1");
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/UnclaimedDraftCreateEmbeddedFormFieldsPerDocumentExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/UnclaimedDraftCreateEmbeddedFormFieldsPerDocumentExample.java
index f425a3d36..2ec3a17e9 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/UnclaimedDraftCreateEmbeddedFormFieldsPerDocumentExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/UnclaimedDraftCreateEmbeddedFormFieldsPerDocumentExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class UnclaimedDraftCreateEmbeddedFormFieldsPerDocumentExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var formFieldsPerDocument1 = new SubFormFieldsPerDocumentText();
         formFieldsPerDocument1.documentIndex(0);
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/UnclaimedDraftCreateEmbeddedWithTemplateExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/UnclaimedDraftCreateEmbeddedWithTemplateExample.java
index 174c678a4..1b888876a 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/UnclaimedDraftCreateEmbeddedWithTemplateExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/UnclaimedDraftCreateEmbeddedWithTemplateExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class UnclaimedDraftCreateEmbeddedWithTemplateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var ccs1 = new SubCC();
         ccs1.role("Accounting");
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/UnclaimedDraftCreateExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/UnclaimedDraftCreateExample.java
index 219de1f5a..770bc0520 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/UnclaimedDraftCreateExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/UnclaimedDraftCreateExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class UnclaimedDraftCreateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var signers1 = new SubUnclaimedDraftSigner();
         signers1.name("Jack");
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/UnclaimedDraftCreateFormFieldGroupsExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/UnclaimedDraftCreateFormFieldGroupsExample.java
index e30a749bb..1daa8d594 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/UnclaimedDraftCreateFormFieldGroupsExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/UnclaimedDraftCreateFormFieldGroupsExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class UnclaimedDraftCreateFormFieldGroupsExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var formFieldGroups1 = new SubFormFieldGroup();
         formFieldGroups1.groupId("RadioItemGroup1");
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/UnclaimedDraftCreateFormFieldRulesExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/UnclaimedDraftCreateFormFieldRulesExample.java
index 49de71fbe..87fb33735 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/UnclaimedDraftCreateFormFieldRulesExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/UnclaimedDraftCreateFormFieldRulesExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class UnclaimedDraftCreateFormFieldRulesExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var formFieldRules1Triggers1 = new SubFormFieldRuleTrigger();
         formFieldRules1Triggers1.id("uniqueIdHere_1");
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/UnclaimedDraftCreateFormFieldsPerDocumentExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/UnclaimedDraftCreateFormFieldsPerDocumentExample.java
index b048a8ba9..5fb0e7514 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/UnclaimedDraftCreateFormFieldsPerDocumentExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/UnclaimedDraftCreateFormFieldsPerDocumentExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class UnclaimedDraftCreateFormFieldsPerDocumentExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var formFieldsPerDocument1 = new SubFormFieldsPerDocumentText();
         formFieldsPerDocument1.documentIndex(0);
diff --git a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/UnclaimedDraftEditAndResendExample.java b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/UnclaimedDraftEditAndResendExample.java
index 4866e6524..23ebe38ea 100644
--- a/sandbox/java/src/main/java/com/dropbox/sign_sandbox/UnclaimedDraftEditAndResendExample.java
+++ b/sandbox/java/src/main/java/com/dropbox/sign_sandbox/UnclaimedDraftEditAndResendExample.java
@@ -8,6 +8,7 @@
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@ public class UnclaimedDraftEditAndResendExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var unclaimedDraftEditAndResendRequest = new UnclaimedDraftEditAndResendRequest();
         unclaimedDraftEditAndResendRequest.clientId("b6b8e7deaf8f0b95c029dca049356d4a2cf9710a");
diff --git a/sandbox/node/src/AccountCreateExample.ts b/sandbox/node/src/AccountCreateExample.ts
index f5b490085..bf8570a02 100644
--- a/sandbox/node/src/AccountCreateExample.ts
+++ b/sandbox/node/src/AccountCreateExample.ts
@@ -6,8 +6,9 @@ const apiCaller = new api.AccountApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const accountCreateRequest = new models.AccountCreateRequest();
-accountCreateRequest.emailAddress = "newuser@dropboxsign.com";
+const accountCreateRequest: models.AccountCreateRequest = {
+  emailAddress: "newuser@dropboxsign.com",
+};
 
 apiCaller.accountCreate(
   accountCreateRequest,
diff --git a/sandbox/node/src/AccountCreateOauthExample.ts b/sandbox/node/src/AccountCreateOauthExample.ts
index 0554d4d79..d77c2e560 100644
--- a/sandbox/node/src/AccountCreateOauthExample.ts
+++ b/sandbox/node/src/AccountCreateOauthExample.ts
@@ -6,10 +6,11 @@ const apiCaller = new api.AccountApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const accountCreateRequest = new models.AccountCreateRequest();
-accountCreateRequest.emailAddress = "newuser@dropboxsign.com";
-accountCreateRequest.clientId = "cc91c61d00f8bb2ece1428035716b";
-accountCreateRequest.clientSecret = "1d14434088507ffa390e6f5528465";
+const accountCreateRequest: models.AccountCreateRequest = {
+  emailAddress: "newuser@dropboxsign.com",
+  clientId: "cc91c61d00f8bb2ece1428035716b",
+  clientSecret: "1d14434088507ffa390e6f5528465",
+};
 
 apiCaller.accountCreate(
   accountCreateRequest,
diff --git a/sandbox/node/src/AccountUpdateExample.ts b/sandbox/node/src/AccountUpdateExample.ts
index 8a546ee0e..3f86ffea0 100644
--- a/sandbox/node/src/AccountUpdateExample.ts
+++ b/sandbox/node/src/AccountUpdateExample.ts
@@ -6,9 +6,10 @@ const apiCaller = new api.AccountApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const accountUpdateRequest = new models.AccountUpdateRequest();
-accountUpdateRequest.callbackUrl = "https://www.example.com/callback";
-accountUpdateRequest.locale = "en-US";
+const accountUpdateRequest: models.AccountUpdateRequest = {
+  callbackUrl: "https://www.example.com/callback",
+  locale: "en-US",
+};
 
 apiCaller.accountUpdate(
   accountUpdateRequest,
diff --git a/sandbox/node/src/AccountVerifyExample.ts b/sandbox/node/src/AccountVerifyExample.ts
index 417ffce6d..8b79bdf00 100644
--- a/sandbox/node/src/AccountVerifyExample.ts
+++ b/sandbox/node/src/AccountVerifyExample.ts
@@ -6,8 +6,9 @@ const apiCaller = new api.AccountApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const accountVerifyRequest = new models.AccountVerifyRequest();
-accountVerifyRequest.emailAddress = "some_user@dropboxsign.com";
+const accountVerifyRequest: models.AccountVerifyRequest = {
+  emailAddress: "some_user@dropboxsign.com",
+};
 
 apiCaller.accountVerify(
   accountVerifyRequest,
diff --git a/sandbox/node/src/ApiAppCreateExample.ts b/sandbox/node/src/ApiAppCreateExample.ts
index be9234816..82890bf18 100644
--- a/sandbox/node/src/ApiAppCreateExample.ts
+++ b/sandbox/node/src/ApiAppCreateExample.ts
@@ -6,25 +6,28 @@ const apiCaller = new api.ApiAppApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const oauth = new models.SubOAuth();
-oauth.callbackUrl = "https://example.com/oauth";
-oauth.scopes = [
-  models.SubOAuth.ScopesEnum.BasicAccountInfo,
-  models.SubOAuth.ScopesEnum.RequestSignature,
-];
+const oauth: models.SubOAuth = {
+  callbackUrl: "https://example.com/oauth",
+  scopes: [
+    models.SubOAuth.ScopesEnum.BasicAccountInfo,
+    models.SubOAuth.ScopesEnum.RequestSignature,
+  ],
+};
 
-const whiteLabelingOptions = new models.SubWhiteLabelingOptions();
-whiteLabelingOptions.primaryButtonColor = "#00b3e6";
-whiteLabelingOptions.primaryButtonTextColor = "#ffffff";
+const whiteLabelingOptions: models.SubWhiteLabelingOptions = {
+  primaryButtonColor: "#00b3e6",
+  primaryButtonTextColor: "#ffffff",
+};
 
-const apiAppCreateRequest = new models.ApiAppCreateRequest();
-apiAppCreateRequest.name = "My Production App";
-apiAppCreateRequest.domains = [
-  "example.com",
-];
-apiAppCreateRequest.customLogoFile = fs.createReadStream("CustomLogoFile.png");
-apiAppCreateRequest.oauth = oauth;
-apiAppCreateRequest.whiteLabelingOptions = whiteLabelingOptions;
+const apiAppCreateRequest: models.ApiAppCreateRequest = {
+  name: "My Production App",
+  domains: [
+    "example.com",
+  ],
+  customLogoFile: fs.createReadStream("CustomLogoFile.png"),
+  oauth: oauth,
+  whiteLabelingOptions: whiteLabelingOptions,
+};
 
 apiCaller.apiAppCreate(
   apiAppCreateRequest,
diff --git a/sandbox/node/src/ApiAppUpdateExample.ts b/sandbox/node/src/ApiAppUpdateExample.ts
index fa8937223..0331942c0 100644
--- a/sandbox/node/src/ApiAppUpdateExample.ts
+++ b/sandbox/node/src/ApiAppUpdateExample.ts
@@ -6,26 +6,29 @@ const apiCaller = new api.ApiAppApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const oauth = new models.SubOAuth();
-oauth.callbackUrl = "https://example.com/oauth";
-oauth.scopes = [
-  models.SubOAuth.ScopesEnum.BasicAccountInfo,
-  models.SubOAuth.ScopesEnum.RequestSignature,
-];
+const oauth: models.SubOAuth = {
+  callbackUrl: "https://example.com/oauth",
+  scopes: [
+    models.SubOAuth.ScopesEnum.BasicAccountInfo,
+    models.SubOAuth.ScopesEnum.RequestSignature,
+  ],
+};
 
-const whiteLabelingOptions = new models.SubWhiteLabelingOptions();
-whiteLabelingOptions.primaryButtonColor = "#00b3e6";
-whiteLabelingOptions.primaryButtonTextColor = "#ffffff";
+const whiteLabelingOptions: models.SubWhiteLabelingOptions = {
+  primaryButtonColor: "#00b3e6",
+  primaryButtonTextColor: "#ffffff",
+};
 
-const apiAppUpdateRequest = new models.ApiAppUpdateRequest();
-apiAppUpdateRequest.callbackUrl = "https://example.com/dropboxsign";
-apiAppUpdateRequest.name = "New Name";
-apiAppUpdateRequest.domains = [
-  "example.com",
-];
-apiAppUpdateRequest.customLogoFile = fs.createReadStream("CustomLogoFile.png");
-apiAppUpdateRequest.oauth = oauth;
-apiAppUpdateRequest.whiteLabelingOptions = whiteLabelingOptions;
+const apiAppUpdateRequest: models.ApiAppUpdateRequest = {
+  callbackUrl: "https://example.com/dropboxsign",
+  name: "New Name",
+  domains: [
+    "example.com",
+  ],
+  customLogoFile: fs.createReadStream("CustomLogoFile.png"),
+  oauth: oauth,
+  whiteLabelingOptions: whiteLabelingOptions,
+};
 
 apiCaller.apiAppUpdate(
   "0dd3b823a682527788c4e40cb7b6f7e9", // clientId
diff --git a/sandbox/node/src/EmbeddedEditUrlExample.ts b/sandbox/node/src/EmbeddedEditUrlExample.ts
index bca3980cf..cdfa90b80 100644
--- a/sandbox/node/src/EmbeddedEditUrlExample.ts
+++ b/sandbox/node/src/EmbeddedEditUrlExample.ts
@@ -9,11 +9,12 @@ apiCaller.username = "YOUR_API_KEY";
 const mergeFields = [
 ];
 
-const embeddedEditUrlRequest = new models.EmbeddedEditUrlRequest();
-embeddedEditUrlRequest.ccRoles = [
-  "",
-];
-embeddedEditUrlRequest.mergeFields = mergeFields;
+const embeddedEditUrlRequest: models.EmbeddedEditUrlRequest = {
+  ccRoles: [
+    "",
+  ],
+  mergeFields: mergeFields,
+};
 
 apiCaller.embeddedEditUrl(
   "f57db65d3f933b5316d398057a36176831451a35", // templateId
diff --git a/sandbox/node/src/FaxLineAddUserExample.ts b/sandbox/node/src/FaxLineAddUserExample.ts
index 468fe36a6..07d056914 100644
--- a/sandbox/node/src/FaxLineAddUserExample.ts
+++ b/sandbox/node/src/FaxLineAddUserExample.ts
@@ -5,9 +5,10 @@ import models from "@dropbox/sign"
 const apiCaller = new api.FaxLineApi();
 apiCaller.username = "YOUR_API_KEY";
 
-const faxLineAddUserRequest = new models.FaxLineAddUserRequest();
-faxLineAddUserRequest.number = "[FAX_NUMBER]";
-faxLineAddUserRequest.emailAddress = "member@dropboxsign.com";
+const faxLineAddUserRequest: models.FaxLineAddUserRequest = {
+  number: "[FAX_NUMBER]",
+  emailAddress: "member@dropboxsign.com",
+};
 
 apiCaller.faxLineAddUser(
   faxLineAddUserRequest,
diff --git a/sandbox/node/src/FaxLineCreateExample.ts b/sandbox/node/src/FaxLineCreateExample.ts
index b9398b2fa..5f1f5e2fd 100644
--- a/sandbox/node/src/FaxLineCreateExample.ts
+++ b/sandbox/node/src/FaxLineCreateExample.ts
@@ -5,9 +5,10 @@ import models from "@dropbox/sign"
 const apiCaller = new api.FaxLineApi();
 apiCaller.username = "YOUR_API_KEY";
 
-const faxLineCreateRequest = new models.FaxLineCreateRequest();
-faxLineCreateRequest.areaCode = 209;
-faxLineCreateRequest.country = models.FaxLineCreateRequest.CountryEnum.Us;
+const faxLineCreateRequest: models.FaxLineCreateRequest = {
+  areaCode: 209,
+  country: models.FaxLineCreateRequest.CountryEnum.Us,
+};
 
 apiCaller.faxLineCreate(
   faxLineCreateRequest,
diff --git a/sandbox/node/src/FaxLineDeleteExample.ts b/sandbox/node/src/FaxLineDeleteExample.ts
index 72b2279a3..834fe8a96 100644
--- a/sandbox/node/src/FaxLineDeleteExample.ts
+++ b/sandbox/node/src/FaxLineDeleteExample.ts
@@ -5,8 +5,9 @@ import models from "@dropbox/sign"
 const apiCaller = new api.FaxLineApi();
 apiCaller.username = "YOUR_API_KEY";
 
-const faxLineDeleteRequest = new models.FaxLineDeleteRequest();
-faxLineDeleteRequest.number = "[FAX_NUMBER]";
+const faxLineDeleteRequest: models.FaxLineDeleteRequest = {
+  number: "[FAX_NUMBER]",
+};
 
 apiCaller.faxLineDelete(
   faxLineDeleteRequest,
diff --git a/sandbox/node/src/FaxLineRemoveUserExample.ts b/sandbox/node/src/FaxLineRemoveUserExample.ts
index e73b8c7c5..6daea08ee 100644
--- a/sandbox/node/src/FaxLineRemoveUserExample.ts
+++ b/sandbox/node/src/FaxLineRemoveUserExample.ts
@@ -5,9 +5,10 @@ import models from "@dropbox/sign"
 const apiCaller = new api.FaxLineApi();
 apiCaller.username = "YOUR_API_KEY";
 
-const faxLineRemoveUserRequest = new models.FaxLineRemoveUserRequest();
-faxLineRemoveUserRequest.number = "[FAX_NUMBER]";
-faxLineRemoveUserRequest.emailAddress = "member@dropboxsign.com";
+const faxLineRemoveUserRequest: models.FaxLineRemoveUserRequest = {
+  number: "[FAX_NUMBER]",
+  emailAddress: "member@dropboxsign.com",
+};
 
 apiCaller.faxLineRemoveUser(
   faxLineRemoveUserRequest,
diff --git a/sandbox/node/src/FaxSendExample.ts b/sandbox/node/src/FaxSendExample.ts
index 0b39faee5..190caf070 100644
--- a/sandbox/node/src/FaxSendExample.ts
+++ b/sandbox/node/src/FaxSendExample.ts
@@ -5,17 +5,18 @@ import models from "@dropbox/sign"
 const apiCaller = new api.FaxApi();
 apiCaller.username = "YOUR_API_KEY";
 
-const faxSendRequest = new models.FaxSendRequest();
-faxSendRequest.recipient = "16690000001";
-faxSendRequest.sender = "16690000000";
-faxSendRequest.testMode = true;
-faxSendRequest.coverPageTo = "Jill Fax";
-faxSendRequest.coverPageFrom = "Faxer Faxerson";
-faxSendRequest.coverPageMessage = "I'm sending you a fax!";
-faxSendRequest.title = "This is what the fax is about!";
-faxSendRequest.files = [
-  fs.createReadStream("./example_fax.pdf"),
-];
+const faxSendRequest: models.FaxSendRequest = {
+  recipient: "16690000001",
+  sender: "16690000000",
+  testMode: true,
+  coverPageTo: "Jill Fax",
+  coverPageFrom: "Faxer Faxerson",
+  coverPageMessage: "I'm sending you a fax!",
+  title: "This is what the fax is about!",
+  files: [
+    fs.createReadStream("./example_fax.pdf"),
+  ],
+};
 
 apiCaller.faxSend(
   faxSendRequest,
diff --git a/sandbox/node/src/OauthTokenGenerateExample.ts b/sandbox/node/src/OauthTokenGenerateExample.ts
index ace0df01d..80e6adf5e 100644
--- a/sandbox/node/src/OauthTokenGenerateExample.ts
+++ b/sandbox/node/src/OauthTokenGenerateExample.ts
@@ -4,12 +4,13 @@ import models from "@dropbox/sign"
 
 const apiCaller = new api.OAuthApi();
 
-const oAuthTokenGenerateRequest = new models.OAuthTokenGenerateRequest();
-oAuthTokenGenerateRequest.clientId = "cc91c61d00f8bb2ece1428035716b";
-oAuthTokenGenerateRequest.clientSecret = "1d14434088507ffa390e6f5528465";
-oAuthTokenGenerateRequest.code = "1b0d28d90c86c141";
-oAuthTokenGenerateRequest.state = "900e06e2";
-oAuthTokenGenerateRequest.grantType = "authorization_code";
+const oAuthTokenGenerateRequest: models.OAuthTokenGenerateRequest = {
+  clientId: "cc91c61d00f8bb2ece1428035716b",
+  clientSecret: "1d14434088507ffa390e6f5528465",
+  code: "1b0d28d90c86c141",
+  state: "900e06e2",
+  grantType: "authorization_code",
+};
 
 apiCaller.oauthTokenGenerate(
   oAuthTokenGenerateRequest,
diff --git a/sandbox/node/src/OauthTokenRefreshExample.ts b/sandbox/node/src/OauthTokenRefreshExample.ts
index fa9973e6f..351d689e0 100644
--- a/sandbox/node/src/OauthTokenRefreshExample.ts
+++ b/sandbox/node/src/OauthTokenRefreshExample.ts
@@ -4,9 +4,10 @@ import models from "@dropbox/sign"
 
 const apiCaller = new api.OAuthApi();
 
-const oAuthTokenRefreshRequest = new models.OAuthTokenRefreshRequest();
-oAuthTokenRefreshRequest.grantType = "refresh_token";
-oAuthTokenRefreshRequest.refreshToken = "hNTI2MTFmM2VmZDQxZTZjOWRmZmFjZmVmMGMyNGFjMzI2MGI5YzgzNmE3";
+const oAuthTokenRefreshRequest: models.OAuthTokenRefreshRequest = {
+  grantType: "refresh_token",
+  refreshToken: "hNTI2MTFmM2VmZDQxZTZjOWRmZmFjZmVmMGMyNGFjMzI2MGI5YzgzNmE3",
+};
 
 apiCaller.oauthTokenRefresh(
   oAuthTokenRefreshRequest,
diff --git a/sandbox/node/src/ReportCreateExample.ts b/sandbox/node/src/ReportCreateExample.ts
index 57bf8127d..7195512ab 100644
--- a/sandbox/node/src/ReportCreateExample.ts
+++ b/sandbox/node/src/ReportCreateExample.ts
@@ -5,13 +5,14 @@ import models from "@dropbox/sign"
 const apiCaller = new api.ReportApi();
 apiCaller.username = "YOUR_API_KEY";
 
-const reportCreateRequest = new models.ReportCreateRequest();
-reportCreateRequest.startDate = "09/01/2020";
-reportCreateRequest.endDate = "09/01/2020";
-reportCreateRequest.reportType = [
-  models.ReportCreateRequest.ReportTypeEnum.UserActivity,
-  models.ReportCreateRequest.ReportTypeEnum.DocumentStatus,
-];
+const reportCreateRequest: models.ReportCreateRequest = {
+  startDate: "09/01/2020",
+  endDate: "09/01/2020",
+  reportType: [
+    models.ReportCreateRequest.ReportTypeEnum.UserActivity,
+    models.ReportCreateRequest.ReportTypeEnum.DocumentStatus,
+  ],
+};
 
 apiCaller.reportCreate(
   reportCreateRequest,
diff --git a/sandbox/node/src/SignatureRequestBulkCreateEmbeddedWithTemplateExample.ts b/sandbox/node/src/SignatureRequestBulkCreateEmbeddedWithTemplateExample.ts
index d8b5b2ef9..9c95521ee 100644
--- a/sandbox/node/src/SignatureRequestBulkCreateEmbeddedWithTemplateExample.ts
+++ b/sandbox/node/src/SignatureRequestBulkCreateEmbeddedWithTemplateExample.ts
@@ -5,73 +5,81 @@ import models from "@dropbox/sign"
 const apiCaller = new api.SignatureRequestApi();
 apiCaller.username = "YOUR_API_KEY";
 
-const signerList2CustomFields1 = new models.SubBulkSignerListCustomField();
-signerList2CustomFields1.name = "company";
-signerList2CustomFields1.value = "123 LLC";
+const signerList2CustomFields1: models.SubBulkSignerListCustomField = {
+  name: "company",
+  value: "123 LLC",
+};
 
 const signerList2CustomFields = [
   signerList2CustomFields1,
 ];
 
-const signerList2Signers1 = new models.SubSignatureRequestTemplateSigner();
-signerList2Signers1.role = "Client";
-signerList2Signers1.name = "Mary";
-signerList2Signers1.emailAddress = "mary@example.com";
-signerList2Signers1.pin = "gd9as5b";
+const signerList2Signers1: models.SubSignatureRequestTemplateSigner = {
+  role: "Client",
+  name: "Mary",
+  emailAddress: "mary@example.com",
+  pin: "gd9as5b",
+};
 
 const signerList2Signers = [
   signerList2Signers1,
 ];
 
-const signerList1CustomFields1 = new models.SubBulkSignerListCustomField();
-signerList1CustomFields1.name = "company";
-signerList1CustomFields1.value = "ABC Corp";
+const signerList1CustomFields1: models.SubBulkSignerListCustomField = {
+  name: "company",
+  value: "ABC Corp",
+};
 
 const signerList1CustomFields = [
   signerList1CustomFields1,
 ];
 
-const signerList1Signers1 = new models.SubSignatureRequestTemplateSigner();
-signerList1Signers1.role = "Client";
-signerList1Signers1.name = "George";
-signerList1Signers1.emailAddress = "george@example.com";
-signerList1Signers1.pin = "d79a3td";
+const signerList1Signers1: models.SubSignatureRequestTemplateSigner = {
+  role: "Client",
+  name: "George",
+  emailAddress: "george@example.com",
+  pin: "d79a3td",
+};
 
 const signerList1Signers = [
   signerList1Signers1,
 ];
 
-const signerList1 = new models.SubBulkSignerList();
-signerList1.customFields = signerList1CustomFields;
-signerList1.signers = signerList1Signers;
+const signerList1: models.SubBulkSignerList = {
+  customFields: signerList1CustomFields,
+  signers: signerList1Signers,
+};
 
-const signerList2 = new models.SubBulkSignerList();
-signerList2.customFields = signerList2CustomFields;
-signerList2.signers = signerList2Signers;
+const signerList2: models.SubBulkSignerList = {
+  customFields: signerList2CustomFields,
+  signers: signerList2Signers,
+};
 
 const signerList = [
   signerList1,
   signerList2,
 ];
 
-const ccs1 = new models.SubCC();
-ccs1.role = "Accounting";
-ccs1.emailAddress = "accounting@example.com";
+const ccs1: models.SubCC = {
+  role: "Accounting",
+  emailAddress: "accounting@example.com",
+};
 
 const ccs = [
   ccs1,
 ];
 
-const signatureRequestBulkCreateEmbeddedWithTemplateRequest = new models.SignatureRequestBulkCreateEmbeddedWithTemplateRequest();
-signatureRequestBulkCreateEmbeddedWithTemplateRequest.clientId = "1a659d9ad95bccd307ecad78d72192f8";
-signatureRequestBulkCreateEmbeddedWithTemplateRequest.templateIds = [
-  "c26b8a16784a872da37ea946b9ddec7c1e11dff6",
-];
-signatureRequestBulkCreateEmbeddedWithTemplateRequest.message = "Glad we could come to an agreement.";
-signatureRequestBulkCreateEmbeddedWithTemplateRequest.subject = "Purchase Order";
-signatureRequestBulkCreateEmbeddedWithTemplateRequest.testMode = true;
-signatureRequestBulkCreateEmbeddedWithTemplateRequest.signerList = signerList;
-signatureRequestBulkCreateEmbeddedWithTemplateRequest.ccs = ccs;
+const signatureRequestBulkCreateEmbeddedWithTemplateRequest: models.SignatureRequestBulkCreateEmbeddedWithTemplateRequest = {
+  clientId: "1a659d9ad95bccd307ecad78d72192f8",
+  templateIds: [
+    "c26b8a16784a872da37ea946b9ddec7c1e11dff6",
+  ],
+  message: "Glad we could come to an agreement.",
+  subject: "Purchase Order",
+  testMode: true,
+  signerList: signerList,
+  ccs: ccs,
+};
 
 apiCaller.signatureRequestBulkCreateEmbeddedWithTemplate(
   signatureRequestBulkCreateEmbeddedWithTemplateRequest,
diff --git a/sandbox/node/src/SignatureRequestBulkSendWithTemplateExample.ts b/sandbox/node/src/SignatureRequestBulkSendWithTemplateExample.ts
index f2fff90b1..a8c7d7bbd 100644
--- a/sandbox/node/src/SignatureRequestBulkSendWithTemplateExample.ts
+++ b/sandbox/node/src/SignatureRequestBulkSendWithTemplateExample.ts
@@ -6,72 +6,80 @@ const apiCaller = new api.SignatureRequestApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const signerList2CustomFields1 = new models.SubBulkSignerListCustomField();
-signerList2CustomFields1.name = "company";
-signerList2CustomFields1.value = "123 LLC";
+const signerList2CustomFields1: models.SubBulkSignerListCustomField = {
+  name: "company",
+  value: "123 LLC",
+};
 
 const signerList2CustomFields = [
   signerList2CustomFields1,
 ];
 
-const signerList2Signers1 = new models.SubSignatureRequestTemplateSigner();
-signerList2Signers1.role = "Client";
-signerList2Signers1.name = "Mary";
-signerList2Signers1.emailAddress = "mary@example.com";
-signerList2Signers1.pin = "gd9as5b";
+const signerList2Signers1: models.SubSignatureRequestTemplateSigner = {
+  role: "Client",
+  name: "Mary",
+  emailAddress: "mary@example.com",
+  pin: "gd9as5b",
+};
 
 const signerList2Signers = [
   signerList2Signers1,
 ];
 
-const signerList1CustomFields1 = new models.SubBulkSignerListCustomField();
-signerList1CustomFields1.name = "company";
-signerList1CustomFields1.value = "ABC Corp";
+const signerList1CustomFields1: models.SubBulkSignerListCustomField = {
+  name: "company",
+  value: "ABC Corp",
+};
 
 const signerList1CustomFields = [
   signerList1CustomFields1,
 ];
 
-const signerList1Signers1 = new models.SubSignatureRequestTemplateSigner();
-signerList1Signers1.role = "Client";
-signerList1Signers1.name = "George";
-signerList1Signers1.emailAddress = "george@example.com";
-signerList1Signers1.pin = "d79a3td";
+const signerList1Signers1: models.SubSignatureRequestTemplateSigner = {
+  role: "Client",
+  name: "George",
+  emailAddress: "george@example.com",
+  pin: "d79a3td",
+};
 
 const signerList1Signers = [
   signerList1Signers1,
 ];
 
-const signerList1 = new models.SubBulkSignerList();
-signerList1.customFields = signerList1CustomFields;
-signerList1.signers = signerList1Signers;
+const signerList1: models.SubBulkSignerList = {
+  customFields: signerList1CustomFields,
+  signers: signerList1Signers,
+};
 
-const signerList2 = new models.SubBulkSignerList();
-signerList2.customFields = signerList2CustomFields;
-signerList2.signers = signerList2Signers;
+const signerList2: models.SubBulkSignerList = {
+  customFields: signerList2CustomFields,
+  signers: signerList2Signers,
+};
 
 const signerList = [
   signerList1,
   signerList2,
 ];
 
-const ccs1 = new models.SubCC();
-ccs1.role = "Accounting";
-ccs1.emailAddress = "accounting@example.com";
+const ccs1: models.SubCC = {
+  role: "Accounting",
+  emailAddress: "accounting@example.com",
+};
 
 const ccs = [
   ccs1,
 ];
 
-const signatureRequestBulkSendWithTemplateRequest = new models.SignatureRequestBulkSendWithTemplateRequest();
-signatureRequestBulkSendWithTemplateRequest.templateIds = [
-  "c26b8a16784a872da37ea946b9ddec7c1e11dff6",
-];
-signatureRequestBulkSendWithTemplateRequest.message = "Glad we could come to an agreement.";
-signatureRequestBulkSendWithTemplateRequest.subject = "Purchase Order";
-signatureRequestBulkSendWithTemplateRequest.testMode = true;
-signatureRequestBulkSendWithTemplateRequest.signerList = signerList;
-signatureRequestBulkSendWithTemplateRequest.ccs = ccs;
+const signatureRequestBulkSendWithTemplateRequest: models.SignatureRequestBulkSendWithTemplateRequest = {
+  templateIds: [
+    "c26b8a16784a872da37ea946b9ddec7c1e11dff6",
+  ],
+  message: "Glad we could come to an agreement.",
+  subject: "Purchase Order",
+  testMode: true,
+  signerList: signerList,
+  ccs: ccs,
+};
 
 apiCaller.signatureRequestBulkSendWithTemplate(
   signatureRequestBulkSendWithTemplateRequest,
diff --git a/sandbox/node/src/SignatureRequestCreateEmbeddedExample.ts b/sandbox/node/src/SignatureRequestCreateEmbeddedExample.ts
index 15c30c113..a2c620a2e 100644
--- a/sandbox/node/src/SignatureRequestCreateEmbeddedExample.ts
+++ b/sandbox/node/src/SignatureRequestCreateEmbeddedExample.ts
@@ -6,43 +6,47 @@ const apiCaller = new api.SignatureRequestApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const signingOptions = new models.SubSigningOptions();
-signingOptions.defaultType = models.SubSigningOptions.DefaultTypeEnum.Draw;
-signingOptions.draw = true;
-signingOptions.phone = false;
-signingOptions.type = true;
-signingOptions.upload = true;
+const signingOptions: models.SubSigningOptions = {
+  defaultType: models.SubSigningOptions.DefaultTypeEnum.Draw,
+  draw: true,
+  phone: false,
+  type: true,
+  upload: true,
+};
 
-const signers1 = new models.SubSignatureRequestSigner();
-signers1.name = "Jack";
-signers1.emailAddress = "jack@example.com";
-signers1.order = 0;
+const signers1: models.SubSignatureRequestSigner = {
+  name: "Jack",
+  emailAddress: "jack@example.com",
+  order: 0,
+};
 
-const signers2 = new models.SubSignatureRequestSigner();
-signers2.name = "Jill";
-signers2.emailAddress = "jill@example.com";
-signers2.order = 1;
+const signers2: models.SubSignatureRequestSigner = {
+  name: "Jill",
+  emailAddress: "jill@example.com",
+  order: 1,
+};
 
 const signers = [
   signers1,
   signers2,
 ];
 
-const signatureRequestCreateEmbeddedRequest = new models.SignatureRequestCreateEmbeddedRequest();
-signatureRequestCreateEmbeddedRequest.clientId = "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a";
-signatureRequestCreateEmbeddedRequest.message = "Please sign this NDA and then we can discuss more. Let me know if you\nhave any questions.";
-signatureRequestCreateEmbeddedRequest.subject = "The NDA we talked about";
-signatureRequestCreateEmbeddedRequest.testMode = true;
-signatureRequestCreateEmbeddedRequest.title = "NDA with Acme Co.";
-signatureRequestCreateEmbeddedRequest.ccEmailAddresses = [
-  "lawyer1@dropboxsign.com",
-  "lawyer2@dropboxsign.com",
-];
-signatureRequestCreateEmbeddedRequest.files = [
-  fs.createReadStream("./example_signature_request.pdf"),
-];
-signatureRequestCreateEmbeddedRequest.signingOptions = signingOptions;
-signatureRequestCreateEmbeddedRequest.signers = signers;
+const signatureRequestCreateEmbeddedRequest: models.SignatureRequestCreateEmbeddedRequest = {
+  clientId: "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a",
+  message: "Please sign this NDA and then we can discuss more. Let me know if you\nhave any questions.",
+  subject: "The NDA we talked about",
+  testMode: true,
+  title: "NDA with Acme Co.",
+  ccEmailAddresses: [
+    "lawyer1@dropboxsign.com",
+    "lawyer2@dropboxsign.com",
+  ],
+  files: [
+    fs.createReadStream("./example_signature_request.pdf"),
+  ],
+  signingOptions: signingOptions,
+  signers: signers,
+};
 
 apiCaller.signatureRequestCreateEmbedded(
   signatureRequestCreateEmbeddedRequest,
diff --git a/sandbox/node/src/SignatureRequestCreateEmbeddedGroupedSignersExample.ts b/sandbox/node/src/SignatureRequestCreateEmbeddedGroupedSignersExample.ts
index 6fcc1bab3..a79b117ad 100644
--- a/sandbox/node/src/SignatureRequestCreateEmbeddedGroupedSignersExample.ts
+++ b/sandbox/node/src/SignatureRequestCreateEmbeddedGroupedSignersExample.ts
@@ -6,69 +6,77 @@ const apiCaller = new api.SignatureRequestApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const groupedSigners2Signers1 = new models.SubSignatureRequestSigner();
-groupedSigners2Signers1.name = "Bob";
-groupedSigners2Signers1.emailAddress = "bob@example.com";
+const groupedSigners2Signers1: models.SubSignatureRequestSigner = {
+  name: "Bob",
+  emailAddress: "bob@example.com",
+};
 
-const groupedSigners2Signers2 = new models.SubSignatureRequestSigner();
-groupedSigners2Signers2.name = "Charlie";
-groupedSigners2Signers2.emailAddress = "charlie@example.com";
+const groupedSigners2Signers2: models.SubSignatureRequestSigner = {
+  name: "Charlie",
+  emailAddress: "charlie@example.com",
+};
 
 const groupedSigners2Signers = [
   groupedSigners2Signers1,
   groupedSigners2Signers2,
 ];
 
-const groupedSigners1Signers1 = new models.SubSignatureRequestSigner();
-groupedSigners1Signers1.name = "Jack";
-groupedSigners1Signers1.emailAddress = "jack@example.com";
+const groupedSigners1Signers1: models.SubSignatureRequestSigner = {
+  name: "Jack",
+  emailAddress: "jack@example.com",
+};
 
-const groupedSigners1Signers2 = new models.SubSignatureRequestSigner();
-groupedSigners1Signers2.name = "Jill";
-groupedSigners1Signers2.emailAddress = "jill@example.com";
+const groupedSigners1Signers2: models.SubSignatureRequestSigner = {
+  name: "Jill",
+  emailAddress: "jill@example.com",
+};
 
 const groupedSigners1Signers = [
   groupedSigners1Signers1,
   groupedSigners1Signers2,
 ];
 
-const signingOptions = new models.SubSigningOptions();
-signingOptions.defaultType = models.SubSigningOptions.DefaultTypeEnum.Draw;
-signingOptions.draw = true;
-signingOptions.phone = false;
-signingOptions.type = true;
-signingOptions.upload = true;
+const signingOptions: models.SubSigningOptions = {
+  defaultType: models.SubSigningOptions.DefaultTypeEnum.Draw,
+  draw: true,
+  phone: false,
+  type: true,
+  upload: true,
+};
 
-const groupedSigners1 = new models.SubSignatureRequestGroupedSigners();
-groupedSigners1.group = "Group #1";
-groupedSigners1.order = 0;
-groupedSigners1.signers = groupedSigners1Signers;
+const groupedSigners1: models.SubSignatureRequestGroupedSigners = {
+  group: "Group #1",
+  order: 0,
+  signers: groupedSigners1Signers,
+};
 
-const groupedSigners2 = new models.SubSignatureRequestGroupedSigners();
-groupedSigners2.group = "Group #2";
-groupedSigners2.order = 1;
-groupedSigners2.signers = groupedSigners2Signers;
+const groupedSigners2: models.SubSignatureRequestGroupedSigners = {
+  group: "Group #2",
+  order: 1,
+  signers: groupedSigners2Signers,
+};
 
 const groupedSigners = [
   groupedSigners1,
   groupedSigners2,
 ];
 
-const signatureRequestCreateEmbeddedRequest = new models.SignatureRequestCreateEmbeddedRequest();
-signatureRequestCreateEmbeddedRequest.clientId = "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a";
-signatureRequestCreateEmbeddedRequest.message = "Please sign this NDA and then we can discuss more. Let me know if you\nhave any questions.";
-signatureRequestCreateEmbeddedRequest.subject = "The NDA we talked about";
-signatureRequestCreateEmbeddedRequest.testMode = true;
-signatureRequestCreateEmbeddedRequest.title = "NDA with Acme Co.";
-signatureRequestCreateEmbeddedRequest.fileUrls = [
-  "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
-];
-signatureRequestCreateEmbeddedRequest.ccEmailAddresses = [
-  "lawyer1@dropboxsign.com",
-  "lawyer2@dropboxsign.com",
-];
-signatureRequestCreateEmbeddedRequest.signingOptions = signingOptions;
-signatureRequestCreateEmbeddedRequest.groupedSigners = groupedSigners;
+const signatureRequestCreateEmbeddedRequest: models.SignatureRequestCreateEmbeddedRequest = {
+  clientId: "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a",
+  message: "Please sign this NDA and then we can discuss more. Let me know if you\nhave any questions.",
+  subject: "The NDA we talked about",
+  testMode: true,
+  title: "NDA with Acme Co.",
+  fileUrls: [
+    "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
+  ],
+  ccEmailAddresses: [
+    "lawyer1@dropboxsign.com",
+    "lawyer2@dropboxsign.com",
+  ],
+  signingOptions: signingOptions,
+  groupedSigners: groupedSigners,
+};
 
 apiCaller.signatureRequestCreateEmbedded(
   signatureRequestCreateEmbeddedRequest,
diff --git a/sandbox/node/src/SignatureRequestCreateEmbeddedWithTemplateExample.ts b/sandbox/node/src/SignatureRequestCreateEmbeddedWithTemplateExample.ts
index 399f0c491..a2ee15e46 100644
--- a/sandbox/node/src/SignatureRequestCreateEmbeddedWithTemplateExample.ts
+++ b/sandbox/node/src/SignatureRequestCreateEmbeddedWithTemplateExample.ts
@@ -6,32 +6,35 @@ const apiCaller = new api.SignatureRequestApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const signingOptions = new models.SubSigningOptions();
-signingOptions.defaultType = models.SubSigningOptions.DefaultTypeEnum.Draw;
-signingOptions.draw = true;
-signingOptions.phone = false;
-signingOptions.type = true;
-signingOptions.upload = true;
+const signingOptions: models.SubSigningOptions = {
+  defaultType: models.SubSigningOptions.DefaultTypeEnum.Draw,
+  draw: true,
+  phone: false,
+  type: true,
+  upload: true,
+};
 
-const signers1 = new models.SubSignatureRequestTemplateSigner();
-signers1.role = "Client";
-signers1.name = "George";
-signers1.emailAddress = "george@example.com";
+const signers1: models.SubSignatureRequestTemplateSigner = {
+  role: "Client",
+  name: "George",
+  emailAddress: "george@example.com",
+};
 
 const signers = [
   signers1,
 ];
 
-const signatureRequestCreateEmbeddedWithTemplateRequest = new models.SignatureRequestCreateEmbeddedWithTemplateRequest();
-signatureRequestCreateEmbeddedWithTemplateRequest.clientId = "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a";
-signatureRequestCreateEmbeddedWithTemplateRequest.templateIds = [
-  "c26b8a16784a872da37ea946b9ddec7c1e11dff6",
-];
-signatureRequestCreateEmbeddedWithTemplateRequest.message = "Glad we could come to an agreement.";
-signatureRequestCreateEmbeddedWithTemplateRequest.subject = "Purchase Order";
-signatureRequestCreateEmbeddedWithTemplateRequest.testMode = true;
-signatureRequestCreateEmbeddedWithTemplateRequest.signingOptions = signingOptions;
-signatureRequestCreateEmbeddedWithTemplateRequest.signers = signers;
+const signatureRequestCreateEmbeddedWithTemplateRequest: models.SignatureRequestCreateEmbeddedWithTemplateRequest = {
+  clientId: "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a",
+  templateIds: [
+    "c26b8a16784a872da37ea946b9ddec7c1e11dff6",
+  ],
+  message: "Glad we could come to an agreement.",
+  subject: "Purchase Order",
+  testMode: true,
+  signingOptions: signingOptions,
+  signers: signers,
+};
 
 apiCaller.signatureRequestCreateEmbeddedWithTemplate(
   signatureRequestCreateEmbeddedWithTemplateRequest,
diff --git a/sandbox/node/src/SignatureRequestEditEmbeddedExample.ts b/sandbox/node/src/SignatureRequestEditEmbeddedExample.ts
index 6affce8fb..f0f7580cc 100644
--- a/sandbox/node/src/SignatureRequestEditEmbeddedExample.ts
+++ b/sandbox/node/src/SignatureRequestEditEmbeddedExample.ts
@@ -6,43 +6,47 @@ const apiCaller = new api.SignatureRequestApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const signingOptions = new models.SubSigningOptions();
-signingOptions.defaultType = models.SubSigningOptions.DefaultTypeEnum.Draw;
-signingOptions.draw = true;
-signingOptions.phone = false;
-signingOptions.type = true;
-signingOptions.upload = true;
+const signingOptions: models.SubSigningOptions = {
+  defaultType: models.SubSigningOptions.DefaultTypeEnum.Draw,
+  draw: true,
+  phone: false,
+  type: true,
+  upload: true,
+};
 
-const signers1 = new models.SubSignatureRequestSigner();
-signers1.name = "Jack";
-signers1.emailAddress = "jack@example.com";
-signers1.order = 0;
+const signers1: models.SubSignatureRequestSigner = {
+  name: "Jack",
+  emailAddress: "jack@example.com",
+  order: 0,
+};
 
-const signers2 = new models.SubSignatureRequestSigner();
-signers2.name = "Jill";
-signers2.emailAddress = "jill@example.com";
-signers2.order = 1;
+const signers2: models.SubSignatureRequestSigner = {
+  name: "Jill",
+  emailAddress: "jill@example.com",
+  order: 1,
+};
 
 const signers = [
   signers1,
   signers2,
 ];
 
-const signatureRequestEditEmbeddedRequest = new models.SignatureRequestEditEmbeddedRequest();
-signatureRequestEditEmbeddedRequest.clientId = "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a";
-signatureRequestEditEmbeddedRequest.message = "Please sign this NDA and then we can discuss more. Let me know if you\nhave any questions.";
-signatureRequestEditEmbeddedRequest.subject = "The NDA we talked about";
-signatureRequestEditEmbeddedRequest.testMode = true;
-signatureRequestEditEmbeddedRequest.title = "NDA with Acme Co.";
-signatureRequestEditEmbeddedRequest.ccEmailAddresses = [
-  "lawyer1@dropboxsign.com",
-  "lawyer2@dropboxsign.com",
-];
-signatureRequestEditEmbeddedRequest.files = [
-  fs.createReadStream("./example_signature_request.pdf"),
-];
-signatureRequestEditEmbeddedRequest.signingOptions = signingOptions;
-signatureRequestEditEmbeddedRequest.signers = signers;
+const signatureRequestEditEmbeddedRequest: models.SignatureRequestEditEmbeddedRequest = {
+  clientId: "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a",
+  message: "Please sign this NDA and then we can discuss more. Let me know if you\nhave any questions.",
+  subject: "The NDA we talked about",
+  testMode: true,
+  title: "NDA with Acme Co.",
+  ccEmailAddresses: [
+    "lawyer1@dropboxsign.com",
+    "lawyer2@dropboxsign.com",
+  ],
+  files: [
+    fs.createReadStream("./example_signature_request.pdf"),
+  ],
+  signingOptions: signingOptions,
+  signers: signers,
+};
 
 apiCaller.signatureRequestEditEmbedded(
   "fa5c8a0b0f492d768749333ad6fcc214c111e967", // signatureRequestId
diff --git a/sandbox/node/src/SignatureRequestEditEmbeddedGroupedSignersExample.ts b/sandbox/node/src/SignatureRequestEditEmbeddedGroupedSignersExample.ts
index c65767fed..3d828dbf8 100644
--- a/sandbox/node/src/SignatureRequestEditEmbeddedGroupedSignersExample.ts
+++ b/sandbox/node/src/SignatureRequestEditEmbeddedGroupedSignersExample.ts
@@ -6,69 +6,77 @@ const apiCaller = new api.SignatureRequestApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const groupedSigners2Signers1 = new models.SubSignatureRequestSigner();
-groupedSigners2Signers1.name = "Bob";
-groupedSigners2Signers1.emailAddress = "bob@example.com";
+const groupedSigners2Signers1: models.SubSignatureRequestSigner = {
+  name: "Bob",
+  emailAddress: "bob@example.com",
+};
 
-const groupedSigners2Signers2 = new models.SubSignatureRequestSigner();
-groupedSigners2Signers2.name = "Charlie";
-groupedSigners2Signers2.emailAddress = "charlie@example.com";
+const groupedSigners2Signers2: models.SubSignatureRequestSigner = {
+  name: "Charlie",
+  emailAddress: "charlie@example.com",
+};
 
 const groupedSigners2Signers = [
   groupedSigners2Signers1,
   groupedSigners2Signers2,
 ];
 
-const groupedSigners1Signers1 = new models.SubSignatureRequestSigner();
-groupedSigners1Signers1.name = "Jack";
-groupedSigners1Signers1.emailAddress = "jack@example.com";
+const groupedSigners1Signers1: models.SubSignatureRequestSigner = {
+  name: "Jack",
+  emailAddress: "jack@example.com",
+};
 
-const groupedSigners1Signers2 = new models.SubSignatureRequestSigner();
-groupedSigners1Signers2.name = "Jill";
-groupedSigners1Signers2.emailAddress = "jill@example.com";
+const groupedSigners1Signers2: models.SubSignatureRequestSigner = {
+  name: "Jill",
+  emailAddress: "jill@example.com",
+};
 
 const groupedSigners1Signers = [
   groupedSigners1Signers1,
   groupedSigners1Signers2,
 ];
 
-const signingOptions = new models.SubSigningOptions();
-signingOptions.defaultType = models.SubSigningOptions.DefaultTypeEnum.Draw;
-signingOptions.draw = true;
-signingOptions.phone = false;
-signingOptions.type = true;
-signingOptions.upload = true;
+const signingOptions: models.SubSigningOptions = {
+  defaultType: models.SubSigningOptions.DefaultTypeEnum.Draw,
+  draw: true,
+  phone: false,
+  type: true,
+  upload: true,
+};
 
-const groupedSigners1 = new models.SubSignatureRequestGroupedSigners();
-groupedSigners1.group = "Group #1";
-groupedSigners1.order = 0;
-groupedSigners1.signers = groupedSigners1Signers;
+const groupedSigners1: models.SubSignatureRequestGroupedSigners = {
+  group: "Group #1",
+  order: 0,
+  signers: groupedSigners1Signers,
+};
 
-const groupedSigners2 = new models.SubSignatureRequestGroupedSigners();
-groupedSigners2.group = "Group #2";
-groupedSigners2.order = 1;
-groupedSigners2.signers = groupedSigners2Signers;
+const groupedSigners2: models.SubSignatureRequestGroupedSigners = {
+  group: "Group #2",
+  order: 1,
+  signers: groupedSigners2Signers,
+};
 
 const groupedSigners = [
   groupedSigners1,
   groupedSigners2,
 ];
 
-const signatureRequestEditEmbeddedRequest = new models.SignatureRequestEditEmbeddedRequest();
-signatureRequestEditEmbeddedRequest.clientId = "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a";
-signatureRequestEditEmbeddedRequest.message = "Please sign this NDA and then we can discuss more. Let me know if you\nhave any questions.";
-signatureRequestEditEmbeddedRequest.subject = "The NDA we talked about";
-signatureRequestEditEmbeddedRequest.testMode = true;
-signatureRequestEditEmbeddedRequest.title = "NDA with Acme Co.";
-signatureRequestEditEmbeddedRequest.fileUrls = [
-  "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
-];
-signatureRequestEditEmbeddedRequest.ccEmailAddresses = [
-  "lawyer1@dropboxsign.com",
-  "lawyer2@dropboxsign.com",
-];
-signatureRequestEditEmbeddedRequest.signingOptions = signingOptions;
-signatureRequestEditEmbeddedRequest.groupedSigners = groupedSigners;
+const signatureRequestEditEmbeddedRequest: models.SignatureRequestEditEmbeddedRequest = {
+  clientId: "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a",
+  message: "Please sign this NDA and then we can discuss more. Let me know if you\nhave any questions.",
+  subject: "The NDA we talked about",
+  testMode: true,
+  title: "NDA with Acme Co.",
+  fileUrls: [
+    "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
+  ],
+  ccEmailAddresses: [
+    "lawyer1@dropboxsign.com",
+    "lawyer2@dropboxsign.com",
+  ],
+  signingOptions: signingOptions,
+  groupedSigners: groupedSigners,
+};
 
 apiCaller.signatureRequestEditEmbedded(
   "fa5c8a0b0f492d768749333ad6fcc214c111e967", // signatureRequestId
diff --git a/sandbox/node/src/SignatureRequestEditEmbeddedWithTemplateExample.ts b/sandbox/node/src/SignatureRequestEditEmbeddedWithTemplateExample.ts
index 6da9e8e05..0deff76bc 100644
--- a/sandbox/node/src/SignatureRequestEditEmbeddedWithTemplateExample.ts
+++ b/sandbox/node/src/SignatureRequestEditEmbeddedWithTemplateExample.ts
@@ -6,32 +6,35 @@ const apiCaller = new api.SignatureRequestApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const signingOptions = new models.SubSigningOptions();
-signingOptions.defaultType = models.SubSigningOptions.DefaultTypeEnum.Draw;
-signingOptions.draw = true;
-signingOptions.phone = false;
-signingOptions.type = true;
-signingOptions.upload = true;
+const signingOptions: models.SubSigningOptions = {
+  defaultType: models.SubSigningOptions.DefaultTypeEnum.Draw,
+  draw: true,
+  phone: false,
+  type: true,
+  upload: true,
+};
 
-const signers1 = new models.SubSignatureRequestTemplateSigner();
-signers1.role = "Client";
-signers1.name = "George";
-signers1.emailAddress = "george@example.com";
+const signers1: models.SubSignatureRequestTemplateSigner = {
+  role: "Client",
+  name: "George",
+  emailAddress: "george@example.com",
+};
 
 const signers = [
   signers1,
 ];
 
-const signatureRequestEditEmbeddedWithTemplateRequest = new models.SignatureRequestEditEmbeddedWithTemplateRequest();
-signatureRequestEditEmbeddedWithTemplateRequest.clientId = "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a";
-signatureRequestEditEmbeddedWithTemplateRequest.templateIds = [
-  "c26b8a16784a872da37ea946b9ddec7c1e11dff6",
-];
-signatureRequestEditEmbeddedWithTemplateRequest.message = "Glad we could come to an agreement.";
-signatureRequestEditEmbeddedWithTemplateRequest.subject = "Purchase Order";
-signatureRequestEditEmbeddedWithTemplateRequest.testMode = true;
-signatureRequestEditEmbeddedWithTemplateRequest.signingOptions = signingOptions;
-signatureRequestEditEmbeddedWithTemplateRequest.signers = signers;
+const signatureRequestEditEmbeddedWithTemplateRequest: models.SignatureRequestEditEmbeddedWithTemplateRequest = {
+  clientId: "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a",
+  templateIds: [
+    "c26b8a16784a872da37ea946b9ddec7c1e11dff6",
+  ],
+  message: "Glad we could come to an agreement.",
+  subject: "Purchase Order",
+  testMode: true,
+  signingOptions: signingOptions,
+  signers: signers,
+};
 
 apiCaller.signatureRequestEditEmbeddedWithTemplate(
   "fa5c8a0b0f492d768749333ad6fcc214c111e967", // signatureRequestId
diff --git a/sandbox/node/src/SignatureRequestEditExample.ts b/sandbox/node/src/SignatureRequestEditExample.ts
index 43aca782d..86e3fd1b6 100644
--- a/sandbox/node/src/SignatureRequestEditExample.ts
+++ b/sandbox/node/src/SignatureRequestEditExample.ts
@@ -6,50 +6,55 @@ const apiCaller = new api.SignatureRequestApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const fieldOptions = new models.SubFieldOptions();
-fieldOptions.dateFormat = models.SubFieldOptions.DateFormatEnum.DD_MM_YYYY;
-
-const signingOptions = new models.SubSigningOptions();
-signingOptions.defaultType = models.SubSigningOptions.DefaultTypeEnum.Draw;
-signingOptions.draw = true;
-signingOptions.phone = false;
-signingOptions.type = true;
-signingOptions.upload = true;
-
-const signers1 = new models.SubSignatureRequestSigner();
-signers1.name = "Jack";
-signers1.emailAddress = "jack@example.com";
-signers1.order = 0;
-
-const signers2 = new models.SubSignatureRequestSigner();
-signers2.name = "Jill";
-signers2.emailAddress = "jill@example.com";
-signers2.order = 1;
+const fieldOptions: models.SubFieldOptions = {
+  dateFormat: models.SubFieldOptions.DateFormatEnum.DdMmYyyy,
+};
+
+const signingOptions: models.SubSigningOptions = {
+  defaultType: models.SubSigningOptions.DefaultTypeEnum.Draw,
+  draw: true,
+  phone: false,
+  type: true,
+  upload: true,
+};
+
+const signers1: models.SubSignatureRequestSigner = {
+  name: "Jack",
+  emailAddress: "jack@example.com",
+  order: 0,
+};
+
+const signers2: models.SubSignatureRequestSigner = {
+  name: "Jill",
+  emailAddress: "jill@example.com",
+  order: 1,
+};
 
 const signers = [
   signers1,
   signers2,
 ];
 
-const signatureRequestEditRequest = new models.SignatureRequestEditRequest();
-signatureRequestEditRequest.message = "Please sign this NDA and then we can discuss more. Let me know if you\nhave any questions.";
-signatureRequestEditRequest.subject = "The NDA we talked about";
-signatureRequestEditRequest.testMode = true;
-signatureRequestEditRequest.title = "NDA with Acme Co.";
-signatureRequestEditRequest.ccEmailAddresses = [
-  "lawyer1@dropboxsign.com",
-  "lawyer2@dropboxsign.com",
-];
-signatureRequestEditRequest.files = [
-  fs.createReadStream("./example_signature_request.pdf"),
-];
-signatureRequestEditRequest.metadata =   {
-  "custom_id": 1234,
-  "custom_text": "NDA #9"
+const signatureRequestEditRequest: models.SignatureRequestEditRequest = {
+  message: "Please sign this NDA and then we can discuss more. Let me know if you\nhave any questions.",
+  subject: "The NDA we talked about",
+  testMode: true,
+  title: "NDA with Acme Co.",
+  ccEmailAddresses: [
+    "lawyer1@dropboxsign.com",
+    "lawyer2@dropboxsign.com",
+  ],
+  files: [
+    fs.createReadStream("./example_signature_request.pdf"),
+  ],
+  metadata: {
+    "custom_id": 1234,
+    "custom_text": "NDA #9"
+  },
+  fieldOptions: fieldOptions,
+  signingOptions: signingOptions,
+  signers: signers,
 };
-signatureRequestEditRequest.fieldOptions = fieldOptions;
-signatureRequestEditRequest.signingOptions = signingOptions;
-signatureRequestEditRequest.signers = signers;
 
 apiCaller.signatureRequestEdit(
   "fa5c8a0b0f492d768749333ad6fcc214c111e967", // signatureRequestId
diff --git a/sandbox/node/src/SignatureRequestEditGroupedSignersExample.ts b/sandbox/node/src/SignatureRequestEditGroupedSignersExample.ts
index fe5e19645..7b300f742 100644
--- a/sandbox/node/src/SignatureRequestEditGroupedSignersExample.ts
+++ b/sandbox/node/src/SignatureRequestEditGroupedSignersExample.ts
@@ -6,76 +6,85 @@ const apiCaller = new api.SignatureRequestApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const groupedSigners2Signers1 = new models.SubSignatureRequestSigner();
-groupedSigners2Signers1.name = "Bob";
-groupedSigners2Signers1.emailAddress = "bob@example.com";
+const groupedSigners2Signers1: models.SubSignatureRequestSigner = {
+  name: "Bob",
+  emailAddress: "bob@example.com",
+};
 
-const groupedSigners2Signers2 = new models.SubSignatureRequestSigner();
-groupedSigners2Signers2.name = "Charlie";
-groupedSigners2Signers2.emailAddress = "charlie@example.com";
+const groupedSigners2Signers2: models.SubSignatureRequestSigner = {
+  name: "Charlie",
+  emailAddress: "charlie@example.com",
+};
 
 const groupedSigners2Signers = [
   groupedSigners2Signers1,
   groupedSigners2Signers2,
 ];
 
-const groupedSigners1Signers1 = new models.SubSignatureRequestSigner();
-groupedSigners1Signers1.name = "Jack";
-groupedSigners1Signers1.emailAddress = "jack@example.com";
+const groupedSigners1Signers1: models.SubSignatureRequestSigner = {
+  name: "Jack",
+  emailAddress: "jack@example.com",
+};
 
-const groupedSigners1Signers2 = new models.SubSignatureRequestSigner();
-groupedSigners1Signers2.name = "Jill";
-groupedSigners1Signers2.emailAddress = "jill@example.com";
+const groupedSigners1Signers2: models.SubSignatureRequestSigner = {
+  name: "Jill",
+  emailAddress: "jill@example.com",
+};
 
 const groupedSigners1Signers = [
   groupedSigners1Signers1,
   groupedSigners1Signers2,
 ];
 
-const fieldOptions = new models.SubFieldOptions();
-fieldOptions.dateFormat = models.SubFieldOptions.DateFormatEnum.DD_MM_YYYY;
+const fieldOptions: models.SubFieldOptions = {
+  dateFormat: models.SubFieldOptions.DateFormatEnum.DdMmYyyy,
+};
 
-const signingOptions = new models.SubSigningOptions();
-signingOptions.defaultType = models.SubSigningOptions.DefaultTypeEnum.Draw;
-signingOptions.draw = true;
-signingOptions.phone = false;
-signingOptions.type = true;
-signingOptions.upload = true;
+const signingOptions: models.SubSigningOptions = {
+  defaultType: models.SubSigningOptions.DefaultTypeEnum.Draw,
+  draw: true,
+  phone: false,
+  type: true,
+  upload: true,
+};
 
-const groupedSigners1 = new models.SubSignatureRequestGroupedSigners();
-groupedSigners1.group = "Group #1";
-groupedSigners1.order = 0;
-groupedSigners1.signers = groupedSigners1Signers;
+const groupedSigners1: models.SubSignatureRequestGroupedSigners = {
+  group: "Group #1",
+  order: 0,
+  signers: groupedSigners1Signers,
+};
 
-const groupedSigners2 = new models.SubSignatureRequestGroupedSigners();
-groupedSigners2.group = "Group #2";
-groupedSigners2.order = 1;
-groupedSigners2.signers = groupedSigners2Signers;
+const groupedSigners2: models.SubSignatureRequestGroupedSigners = {
+  group: "Group #2",
+  order: 1,
+  signers: groupedSigners2Signers,
+};
 
 const groupedSigners = [
   groupedSigners1,
   groupedSigners2,
 ];
 
-const signatureRequestEditRequest = new models.SignatureRequestEditRequest();
-signatureRequestEditRequest.message = "Please sign this NDA and then we can discuss more. Let me know if you\nhave any questions.";
-signatureRequestEditRequest.subject = "The NDA we talked about";
-signatureRequestEditRequest.testMode = true;
-signatureRequestEditRequest.title = "NDA with Acme Co.";
-signatureRequestEditRequest.fileUrls = [
-  "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
-];
-signatureRequestEditRequest.ccEmailAddresses = [
-  "lawyer1@dropboxsign.com",
-  "lawyer2@dropboxsign.com",
-];
-signatureRequestEditRequest.metadata =   {
-  "custom_id": 1234,
-  "custom_text": "NDA #9"
+const signatureRequestEditRequest: models.SignatureRequestEditRequest = {
+  message: "Please sign this NDA and then we can discuss more. Let me know if you\nhave any questions.",
+  subject: "The NDA we talked about",
+  testMode: true,
+  title: "NDA with Acme Co.",
+  fileUrls: [
+    "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
+  ],
+  ccEmailAddresses: [
+    "lawyer1@dropboxsign.com",
+    "lawyer2@dropboxsign.com",
+  ],
+  metadata: {
+    "custom_id": 1234,
+    "custom_text": "NDA #9"
+  },
+  fieldOptions: fieldOptions,
+  signingOptions: signingOptions,
+  groupedSigners: groupedSigners,
 };
-signatureRequestEditRequest.fieldOptions = fieldOptions;
-signatureRequestEditRequest.signingOptions = signingOptions;
-signatureRequestEditRequest.groupedSigners = groupedSigners;
 
 apiCaller.signatureRequestEdit(
   "fa5c8a0b0f492d768749333ad6fcc214c111e967", // signatureRequestId
diff --git a/sandbox/node/src/SignatureRequestEditWithTemplateExample.ts b/sandbox/node/src/SignatureRequestEditWithTemplateExample.ts
index 650ce2ff1..f8e8cd074 100644
--- a/sandbox/node/src/SignatureRequestEditWithTemplateExample.ts
+++ b/sandbox/node/src/SignatureRequestEditWithTemplateExample.ts
@@ -6,51 +6,56 @@ const apiCaller = new api.SignatureRequestApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const signingOptions = new models.SubSigningOptions();
-signingOptions.defaultType = models.SubSigningOptions.DefaultTypeEnum.Draw;
-signingOptions.draw = true;
-signingOptions.phone = false;
-signingOptions.type = true;
-signingOptions.upload = true;
-
-const signers1 = new models.SubSignatureRequestTemplateSigner();
-signers1.role = "Client";
-signers1.name = "George";
-signers1.emailAddress = "george@example.com";
+const signingOptions: models.SubSigningOptions = {
+  defaultType: models.SubSigningOptions.DefaultTypeEnum.Draw,
+  draw: true,
+  phone: false,
+  type: true,
+  upload: true,
+};
+
+const signers1: models.SubSignatureRequestTemplateSigner = {
+  role: "Client",
+  name: "George",
+  emailAddress: "george@example.com",
+};
 
 const signers = [
   signers1,
 ];
 
-const ccs1 = new models.SubCC();
-ccs1.role = "Accounting";
-ccs1.emailAddress = "accounting@example.com";
+const ccs1: models.SubCC = {
+  role: "Accounting",
+  emailAddress: "accounting@example.com",
+};
 
 const ccs = [
   ccs1,
 ];
 
-const customFields1 = new models.SubCustomField();
-customFields1.name = "Cost";
-customFields1.editor = "Client";
-customFields1.required = true;
-customFields1.value = "$20,000";
+const customFields1: models.SubCustomField = {
+  name: "Cost",
+  editor: "Client",
+  required: true,
+  value: "$20,000",
+};
 
 const customFields = [
   customFields1,
 ];
 
-const signatureRequestEditWithTemplateRequest = new models.SignatureRequestEditWithTemplateRequest();
-signatureRequestEditWithTemplateRequest.templateIds = [
-  "61a832ff0d8423f91d503e76bfbcc750f7417c78",
-];
-signatureRequestEditWithTemplateRequest.message = "Glad we could come to an agreement.";
-signatureRequestEditWithTemplateRequest.subject = "Purchase Order";
-signatureRequestEditWithTemplateRequest.testMode = true;
-signatureRequestEditWithTemplateRequest.signingOptions = signingOptions;
-signatureRequestEditWithTemplateRequest.signers = signers;
-signatureRequestEditWithTemplateRequest.ccs = ccs;
-signatureRequestEditWithTemplateRequest.customFields = customFields;
+const signatureRequestEditWithTemplateRequest: models.SignatureRequestEditWithTemplateRequest = {
+  templateIds: [
+    "61a832ff0d8423f91d503e76bfbcc750f7417c78",
+  ],
+  message: "Glad we could come to an agreement.",
+  subject: "Purchase Order",
+  testMode: true,
+  signingOptions: signingOptions,
+  signers: signers,
+  ccs: ccs,
+  customFields: customFields,
+};
 
 apiCaller.signatureRequestEditWithTemplate(
   "fa5c8a0b0f492d768749333ad6fcc214c111e967", // signatureRequestId
diff --git a/sandbox/node/src/SignatureRequestRemindExample.ts b/sandbox/node/src/SignatureRequestRemindExample.ts
index fa558c1d6..4801d7087 100644
--- a/sandbox/node/src/SignatureRequestRemindExample.ts
+++ b/sandbox/node/src/SignatureRequestRemindExample.ts
@@ -6,8 +6,9 @@ const apiCaller = new api.SignatureRequestApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const signatureRequestRemindRequest = new models.SignatureRequestRemindRequest();
-signatureRequestRemindRequest.emailAddress = "john@example.com";
+const signatureRequestRemindRequest: models.SignatureRequestRemindRequest = {
+  emailAddress: "john@example.com",
+};
 
 apiCaller.signatureRequestRemind(
   "fa5c8a0b0f492d768749333ad6fcc214c111e967", // signatureRequestId
diff --git a/sandbox/node/src/SignatureRequestSendExample.ts b/sandbox/node/src/SignatureRequestSendExample.ts
index c742336fa..910a66743 100644
--- a/sandbox/node/src/SignatureRequestSendExample.ts
+++ b/sandbox/node/src/SignatureRequestSendExample.ts
@@ -6,50 +6,55 @@ const apiCaller = new api.SignatureRequestApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const fieldOptions = new models.SubFieldOptions();
-fieldOptions.dateFormat = models.SubFieldOptions.DateFormatEnum.DD_MM_YYYY;
-
-const signingOptions = new models.SubSigningOptions();
-signingOptions.defaultType = models.SubSigningOptions.DefaultTypeEnum.Draw;
-signingOptions.draw = true;
-signingOptions.phone = false;
-signingOptions.type = true;
-signingOptions.upload = true;
-
-const signers1 = new models.SubSignatureRequestSigner();
-signers1.name = "Jack";
-signers1.emailAddress = "jack@example.com";
-signers1.order = 0;
-
-const signers2 = new models.SubSignatureRequestSigner();
-signers2.name = "Jill";
-signers2.emailAddress = "jill@example.com";
-signers2.order = 1;
+const fieldOptions: models.SubFieldOptions = {
+  dateFormat: models.SubFieldOptions.DateFormatEnum.DdMmYyyy,
+};
+
+const signingOptions: models.SubSigningOptions = {
+  defaultType: models.SubSigningOptions.DefaultTypeEnum.Draw,
+  draw: true,
+  phone: false,
+  type: true,
+  upload: true,
+};
+
+const signers1: models.SubSignatureRequestSigner = {
+  name: "Jack",
+  emailAddress: "jack@example.com",
+  order: 0,
+};
+
+const signers2: models.SubSignatureRequestSigner = {
+  name: "Jill",
+  emailAddress: "jill@example.com",
+  order: 1,
+};
 
 const signers = [
   signers1,
   signers2,
 ];
 
-const signatureRequestSendRequest = new models.SignatureRequestSendRequest();
-signatureRequestSendRequest.message = "Please sign this NDA and then we can discuss more. Let me know if you\nhave any questions.";
-signatureRequestSendRequest.subject = "The NDA we talked about";
-signatureRequestSendRequest.testMode = true;
-signatureRequestSendRequest.title = "NDA with Acme Co.";
-signatureRequestSendRequest.ccEmailAddresses = [
-  "lawyer1@dropboxsign.com",
-  "lawyer2@dropboxsign.com",
-];
-signatureRequestSendRequest.files = [
-  fs.createReadStream("./example_signature_request.pdf"),
-];
-signatureRequestSendRequest.metadata =   {
-  "custom_id": 1234,
-  "custom_text": "NDA #9"
+const signatureRequestSendRequest: models.SignatureRequestSendRequest = {
+  message: "Please sign this NDA and then we can discuss more. Let me know if you\nhave any questions.",
+  subject: "The NDA we talked about",
+  testMode: true,
+  title: "NDA with Acme Co.",
+  ccEmailAddresses: [
+    "lawyer1@dropboxsign.com",
+    "lawyer2@dropboxsign.com",
+  ],
+  files: [
+    fs.createReadStream("./example_signature_request.pdf"),
+  ],
+  metadata: {
+    "custom_id": 1234,
+    "custom_text": "NDA #9"
+  },
+  fieldOptions: fieldOptions,
+  signingOptions: signingOptions,
+  signers: signers,
 };
-signatureRequestSendRequest.fieldOptions = fieldOptions;
-signatureRequestSendRequest.signingOptions = signingOptions;
-signatureRequestSendRequest.signers = signers;
 
 apiCaller.signatureRequestSend(
   signatureRequestSendRequest,
diff --git a/sandbox/node/src/SignatureRequestSendGroupedSignersExample.ts b/sandbox/node/src/SignatureRequestSendGroupedSignersExample.ts
index d7414588a..110567251 100644
--- a/sandbox/node/src/SignatureRequestSendGroupedSignersExample.ts
+++ b/sandbox/node/src/SignatureRequestSendGroupedSignersExample.ts
@@ -6,76 +6,85 @@ const apiCaller = new api.SignatureRequestApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const groupedSigners2Signers1 = new models.SubSignatureRequestSigner();
-groupedSigners2Signers1.name = "Bob";
-groupedSigners2Signers1.emailAddress = "bob@example.com";
+const groupedSigners2Signers1: models.SubSignatureRequestSigner = {
+  name: "Bob",
+  emailAddress: "bob@example.com",
+};
 
-const groupedSigners2Signers2 = new models.SubSignatureRequestSigner();
-groupedSigners2Signers2.name = "Charlie";
-groupedSigners2Signers2.emailAddress = "charlie@example.com";
+const groupedSigners2Signers2: models.SubSignatureRequestSigner = {
+  name: "Charlie",
+  emailAddress: "charlie@example.com",
+};
 
 const groupedSigners2Signers = [
   groupedSigners2Signers1,
   groupedSigners2Signers2,
 ];
 
-const groupedSigners1Signers1 = new models.SubSignatureRequestSigner();
-groupedSigners1Signers1.name = "Jack";
-groupedSigners1Signers1.emailAddress = "jack@example.com";
+const groupedSigners1Signers1: models.SubSignatureRequestSigner = {
+  name: "Jack",
+  emailAddress: "jack@example.com",
+};
 
-const groupedSigners1Signers2 = new models.SubSignatureRequestSigner();
-groupedSigners1Signers2.name = "Jill";
-groupedSigners1Signers2.emailAddress = "jill@example.com";
+const groupedSigners1Signers2: models.SubSignatureRequestSigner = {
+  name: "Jill",
+  emailAddress: "jill@example.com",
+};
 
 const groupedSigners1Signers = [
   groupedSigners1Signers1,
   groupedSigners1Signers2,
 ];
 
-const fieldOptions = new models.SubFieldOptions();
-fieldOptions.dateFormat = models.SubFieldOptions.DateFormatEnum.DD_MM_YYYY;
+const fieldOptions: models.SubFieldOptions = {
+  dateFormat: models.SubFieldOptions.DateFormatEnum.DdMmYyyy,
+};
 
-const signingOptions = new models.SubSigningOptions();
-signingOptions.defaultType = models.SubSigningOptions.DefaultTypeEnum.Draw;
-signingOptions.draw = true;
-signingOptions.phone = false;
-signingOptions.type = true;
-signingOptions.upload = true;
+const signingOptions: models.SubSigningOptions = {
+  defaultType: models.SubSigningOptions.DefaultTypeEnum.Draw,
+  draw: true,
+  phone: false,
+  type: true,
+  upload: true,
+};
 
-const groupedSigners1 = new models.SubSignatureRequestGroupedSigners();
-groupedSigners1.group = "Group #1";
-groupedSigners1.order = 0;
-groupedSigners1.signers = groupedSigners1Signers;
+const groupedSigners1: models.SubSignatureRequestGroupedSigners = {
+  group: "Group #1",
+  order: 0,
+  signers: groupedSigners1Signers,
+};
 
-const groupedSigners2 = new models.SubSignatureRequestGroupedSigners();
-groupedSigners2.group = "Group #2";
-groupedSigners2.order = 1;
-groupedSigners2.signers = groupedSigners2Signers;
+const groupedSigners2: models.SubSignatureRequestGroupedSigners = {
+  group: "Group #2",
+  order: 1,
+  signers: groupedSigners2Signers,
+};
 
 const groupedSigners = [
   groupedSigners1,
   groupedSigners2,
 ];
 
-const signatureRequestSendRequest = new models.SignatureRequestSendRequest();
-signatureRequestSendRequest.message = "Please sign this NDA and then we can discuss more. Let me know if you\nhave any questions.";
-signatureRequestSendRequest.subject = "The NDA we talked about";
-signatureRequestSendRequest.testMode = true;
-signatureRequestSendRequest.title = "NDA with Acme Co.";
-signatureRequestSendRequest.fileUrls = [
-  "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
-];
-signatureRequestSendRequest.ccEmailAddresses = [
-  "lawyer1@dropboxsign.com",
-  "lawyer2@dropboxsign.com",
-];
-signatureRequestSendRequest.metadata =   {
-  "custom_id": 1234,
-  "custom_text": "NDA #9"
+const signatureRequestSendRequest: models.SignatureRequestSendRequest = {
+  message: "Please sign this NDA and then we can discuss more. Let me know if you\nhave any questions.",
+  subject: "The NDA we talked about",
+  testMode: true,
+  title: "NDA with Acme Co.",
+  fileUrls: [
+    "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
+  ],
+  ccEmailAddresses: [
+    "lawyer1@dropboxsign.com",
+    "lawyer2@dropboxsign.com",
+  ],
+  metadata: {
+    "custom_id": 1234,
+    "custom_text": "NDA #9"
+  },
+  fieldOptions: fieldOptions,
+  signingOptions: signingOptions,
+  groupedSigners: groupedSigners,
 };
-signatureRequestSendRequest.fieldOptions = fieldOptions;
-signatureRequestSendRequest.signingOptions = signingOptions;
-signatureRequestSendRequest.groupedSigners = groupedSigners;
 
 apiCaller.signatureRequestSend(
   signatureRequestSendRequest,
diff --git a/sandbox/node/src/SignatureRequestSendWithTemplateExample.ts b/sandbox/node/src/SignatureRequestSendWithTemplateExample.ts
index 181e37a35..88219107a 100644
--- a/sandbox/node/src/SignatureRequestSendWithTemplateExample.ts
+++ b/sandbox/node/src/SignatureRequestSendWithTemplateExample.ts
@@ -6,51 +6,56 @@ const apiCaller = new api.SignatureRequestApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const signingOptions = new models.SubSigningOptions();
-signingOptions.defaultType = models.SubSigningOptions.DefaultTypeEnum.Draw;
-signingOptions.draw = true;
-signingOptions.phone = false;
-signingOptions.type = true;
-signingOptions.upload = true;
-
-const signers1 = new models.SubSignatureRequestTemplateSigner();
-signers1.role = "Client";
-signers1.name = "George";
-signers1.emailAddress = "george@example.com";
+const signingOptions: models.SubSigningOptions = {
+  defaultType: models.SubSigningOptions.DefaultTypeEnum.Draw,
+  draw: true,
+  phone: false,
+  type: true,
+  upload: true,
+};
+
+const signers1: models.SubSignatureRequestTemplateSigner = {
+  role: "Client",
+  name: "George",
+  emailAddress: "george@example.com",
+};
 
 const signers = [
   signers1,
 ];
 
-const ccs1 = new models.SubCC();
-ccs1.role = "Accounting";
-ccs1.emailAddress = "accounting@example.com";
+const ccs1: models.SubCC = {
+  role: "Accounting",
+  emailAddress: "accounting@example.com",
+};
 
 const ccs = [
   ccs1,
 ];
 
-const customFields1 = new models.SubCustomField();
-customFields1.name = "Cost";
-customFields1.editor = "Client";
-customFields1.required = true;
-customFields1.value = "$20,000";
+const customFields1: models.SubCustomField = {
+  name: "Cost",
+  editor: "Client",
+  required: true,
+  value: "$20,000",
+};
 
 const customFields = [
   customFields1,
 ];
 
-const signatureRequestSendWithTemplateRequest = new models.SignatureRequestSendWithTemplateRequest();
-signatureRequestSendWithTemplateRequest.templateIds = [
-  "61a832ff0d8423f91d503e76bfbcc750f7417c78",
-];
-signatureRequestSendWithTemplateRequest.message = "Glad we could come to an agreement.";
-signatureRequestSendWithTemplateRequest.subject = "Purchase Order";
-signatureRequestSendWithTemplateRequest.testMode = true;
-signatureRequestSendWithTemplateRequest.signingOptions = signingOptions;
-signatureRequestSendWithTemplateRequest.signers = signers;
-signatureRequestSendWithTemplateRequest.ccs = ccs;
-signatureRequestSendWithTemplateRequest.customFields = customFields;
+const signatureRequestSendWithTemplateRequest: models.SignatureRequestSendWithTemplateRequest = {
+  templateIds: [
+    "61a832ff0d8423f91d503e76bfbcc750f7417c78",
+  ],
+  message: "Glad we could come to an agreement.",
+  subject: "Purchase Order",
+  testMode: true,
+  signingOptions: signingOptions,
+  signers: signers,
+  ccs: ccs,
+  customFields: customFields,
+};
 
 apiCaller.signatureRequestSendWithTemplate(
   signatureRequestSendWithTemplateRequest,
diff --git a/sandbox/node/src/SignatureRequestUpdateExample.ts b/sandbox/node/src/SignatureRequestUpdateExample.ts
index fa02e0345..8464618cb 100644
--- a/sandbox/node/src/SignatureRequestUpdateExample.ts
+++ b/sandbox/node/src/SignatureRequestUpdateExample.ts
@@ -6,9 +6,10 @@ const apiCaller = new api.SignatureRequestApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const signatureRequestUpdateRequest = new models.SignatureRequestUpdateRequest();
-signatureRequestUpdateRequest.signatureId = "2f9781e1a8e2045224d808c153c2e1d3df6f8f2f";
-signatureRequestUpdateRequest.emailAddress = "john@example.com";
+const signatureRequestUpdateRequest: models.SignatureRequestUpdateRequest = {
+  signatureId: "2f9781e1a8e2045224d808c153c2e1d3df6f8f2f",
+  emailAddress: "john@example.com",
+};
 
 apiCaller.signatureRequestUpdate(
   "fa5c8a0b0f492d768749333ad6fcc214c111e967", // signatureRequestId
diff --git a/sandbox/node/src/TeamAddMemberAccountIdExample.ts b/sandbox/node/src/TeamAddMemberAccountIdExample.ts
index 6aedbc340..1f2190b26 100644
--- a/sandbox/node/src/TeamAddMemberAccountIdExample.ts
+++ b/sandbox/node/src/TeamAddMemberAccountIdExample.ts
@@ -6,8 +6,9 @@ const apiCaller = new api.TeamApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const teamAddMemberRequest = new models.TeamAddMemberRequest();
-teamAddMemberRequest.accountId = "f57db65d3f933b5316d398057a36176831451a35";
+const teamAddMemberRequest: models.TeamAddMemberRequest = {
+  accountId: "f57db65d3f933b5316d398057a36176831451a35",
+};
 
 apiCaller.teamAddMember(
   teamAddMemberRequest,
diff --git a/sandbox/node/src/TeamAddMemberExample.ts b/sandbox/node/src/TeamAddMemberExample.ts
index 0ffde9292..b781f2967 100644
--- a/sandbox/node/src/TeamAddMemberExample.ts
+++ b/sandbox/node/src/TeamAddMemberExample.ts
@@ -6,8 +6,9 @@ const apiCaller = new api.TeamApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const teamAddMemberRequest = new models.TeamAddMemberRequest();
-teamAddMemberRequest.emailAddress = "george@example.com";
+const teamAddMemberRequest: models.TeamAddMemberRequest = {
+  emailAddress: "george@example.com",
+};
 
 apiCaller.teamAddMember(
   teamAddMemberRequest,
diff --git a/sandbox/node/src/TeamCreateExample.ts b/sandbox/node/src/TeamCreateExample.ts
index 22ad05f83..03431e028 100644
--- a/sandbox/node/src/TeamCreateExample.ts
+++ b/sandbox/node/src/TeamCreateExample.ts
@@ -6,8 +6,9 @@ const apiCaller = new api.TeamApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const teamCreateRequest = new models.TeamCreateRequest();
-teamCreateRequest.name = "New Team Name";
+const teamCreateRequest: models.TeamCreateRequest = {
+  name: "New Team Name",
+};
 
 apiCaller.teamCreate(
   teamCreateRequest,
diff --git a/sandbox/node/src/TeamRemoveMemberAccountIdExample.ts b/sandbox/node/src/TeamRemoveMemberAccountIdExample.ts
index e170817b3..cf5e42a72 100644
--- a/sandbox/node/src/TeamRemoveMemberAccountIdExample.ts
+++ b/sandbox/node/src/TeamRemoveMemberAccountIdExample.ts
@@ -6,8 +6,9 @@ const apiCaller = new api.TeamApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const teamRemoveMemberRequest = new models.TeamRemoveMemberRequest();
-teamRemoveMemberRequest.accountId = "f57db65d3f933b5316d398057a36176831451a35";
+const teamRemoveMemberRequest: models.TeamRemoveMemberRequest = {
+  accountId: "f57db65d3f933b5316d398057a36176831451a35",
+};
 
 apiCaller.teamRemoveMember(
   teamRemoveMemberRequest,
diff --git a/sandbox/node/src/TeamRemoveMemberExample.ts b/sandbox/node/src/TeamRemoveMemberExample.ts
index efd33d694..3f12efc31 100644
--- a/sandbox/node/src/TeamRemoveMemberExample.ts
+++ b/sandbox/node/src/TeamRemoveMemberExample.ts
@@ -6,9 +6,10 @@ const apiCaller = new api.TeamApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const teamRemoveMemberRequest = new models.TeamRemoveMemberRequest();
-teamRemoveMemberRequest.emailAddress = "teammate@dropboxsign.com";
-teamRemoveMemberRequest.newOwnerEmailAddress = "new_teammate@dropboxsign.com";
+const teamRemoveMemberRequest: models.TeamRemoveMemberRequest = {
+  emailAddress: "teammate@dropboxsign.com",
+  newOwnerEmailAddress: "new_teammate@dropboxsign.com",
+};
 
 apiCaller.teamRemoveMember(
   teamRemoveMemberRequest,
diff --git a/sandbox/node/src/TeamUpdateExample.ts b/sandbox/node/src/TeamUpdateExample.ts
index 0e32bcdd4..748a4adbd 100644
--- a/sandbox/node/src/TeamUpdateExample.ts
+++ b/sandbox/node/src/TeamUpdateExample.ts
@@ -6,8 +6,9 @@ const apiCaller = new api.TeamApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const teamUpdateRequest = new models.TeamUpdateRequest();
-teamUpdateRequest.name = "New Team Name";
+const teamUpdateRequest: models.TeamUpdateRequest = {
+  name: "New Team Name",
+};
 
 apiCaller.teamUpdate(
   teamUpdateRequest,
diff --git a/sandbox/node/src/TemplateAddUserExample.ts b/sandbox/node/src/TemplateAddUserExample.ts
index f801c3e65..b8bf1a557 100644
--- a/sandbox/node/src/TemplateAddUserExample.ts
+++ b/sandbox/node/src/TemplateAddUserExample.ts
@@ -6,8 +6,9 @@ const apiCaller = new api.TemplateApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const templateAddUserRequest = new models.TemplateAddUserRequest();
-templateAddUserRequest.emailAddress = "george@dropboxsign.com";
+const templateAddUserRequest: models.TemplateAddUserRequest = {
+  emailAddress: "george@dropboxsign.com",
+};
 
 apiCaller.templateAddUser(
   "f57db65d3f933b5316d398057a36176831451a35", // templateId
diff --git a/sandbox/node/src/TemplateCreateEmbeddedDraftExample.ts b/sandbox/node/src/TemplateCreateEmbeddedDraftExample.ts
index 6371fcd18..300b1f618 100644
--- a/sandbox/node/src/TemplateCreateEmbeddedDraftExample.ts
+++ b/sandbox/node/src/TemplateCreateEmbeddedDraftExample.ts
@@ -6,50 +6,56 @@ const apiCaller = new api.TemplateApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const fieldOptions = new models.SubFieldOptions();
-fieldOptions.dateFormat = models.SubFieldOptions.DateFormatEnum.DD_MM_YYYY;
+const fieldOptions: models.SubFieldOptions = {
+  dateFormat: models.SubFieldOptions.DateFormatEnum.DdMmYyyy,
+};
 
-const mergeFields1 = new models.SubMergeField();
-mergeFields1.name = "Full Name";
-mergeFields1.type = models.SubMergeField.TypeEnum.Text;
+const mergeFields1: models.SubMergeField = {
+  name: "Full Name",
+  type: models.SubMergeField.TypeEnum.Text,
+};
 
-const mergeFields2 = new models.SubMergeField();
-mergeFields2.name = "Is Registered?";
-mergeFields2.type = models.SubMergeField.TypeEnum.Checkbox;
+const mergeFields2: models.SubMergeField = {
+  name: "Is Registered?",
+  type: models.SubMergeField.TypeEnum.Checkbox,
+};
 
 const mergeFields = [
   mergeFields1,
   mergeFields2,
 ];
 
-const signerRoles1 = new models.SubTemplateRole();
-signerRoles1.name = "Client";
-signerRoles1.order = 0;
+const signerRoles1: models.SubTemplateRole = {
+  name: "Client",
+  order: 0,
+};
 
-const signerRoles2 = new models.SubTemplateRole();
-signerRoles2.name = "Witness";
-signerRoles2.order = 1;
+const signerRoles2: models.SubTemplateRole = {
+  name: "Witness",
+  order: 1,
+};
 
 const signerRoles = [
   signerRoles1,
   signerRoles2,
 ];
 
-const templateCreateEmbeddedDraftRequest = new models.TemplateCreateEmbeddedDraftRequest();
-templateCreateEmbeddedDraftRequest.clientId = "37dee8d8440c66d54cfa05d92c160882";
-templateCreateEmbeddedDraftRequest.message = "For your approval";
-templateCreateEmbeddedDraftRequest.subject = "Please sign this document";
-templateCreateEmbeddedDraftRequest.testMode = true;
-templateCreateEmbeddedDraftRequest.title = "Test Template";
-templateCreateEmbeddedDraftRequest.ccRoles = [
-  "Manager",
-];
-templateCreateEmbeddedDraftRequest.files = [
-  fs.createReadStream("./example_signature_request.pdf"),
-];
-templateCreateEmbeddedDraftRequest.fieldOptions = fieldOptions;
-templateCreateEmbeddedDraftRequest.mergeFields = mergeFields;
-templateCreateEmbeddedDraftRequest.signerRoles = signerRoles;
+const templateCreateEmbeddedDraftRequest: models.TemplateCreateEmbeddedDraftRequest = {
+  clientId: "37dee8d8440c66d54cfa05d92c160882",
+  message: "For your approval",
+  subject: "Please sign this document",
+  testMode: true,
+  title: "Test Template",
+  ccRoles: [
+    "Manager",
+  ],
+  files: [
+    fs.createReadStream("./example_signature_request.pdf"),
+  ],
+  fieldOptions: fieldOptions,
+  mergeFields: mergeFields,
+  signerRoles: signerRoles,
+};
 
 apiCaller.templateCreateEmbeddedDraft(
   templateCreateEmbeddedDraftRequest,
diff --git a/sandbox/node/src/TemplateCreateEmbeddedDraftFormFieldGroupsExample.ts b/sandbox/node/src/TemplateCreateEmbeddedDraftFormFieldGroupsExample.ts
index 5bdb6384f..0f21c2209 100644
--- a/sandbox/node/src/TemplateCreateEmbeddedDraftFormFieldGroupsExample.ts
+++ b/sandbox/node/src/TemplateCreateEmbeddedDraftFormFieldGroupsExample.ts
@@ -6,96 +6,105 @@ const apiCaller = new api.TemplateApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const fieldOptions = new models.SubFieldOptions();
-fieldOptions.dateFormat = models.SubFieldOptions.DateFormatEnum.DD_MM_YYYY;
+const fieldOptions: models.SubFieldOptions = {
+  dateFormat: models.SubFieldOptions.DateFormatEnum.DdMmYyyy,
+};
 
-const formFieldGroups1 = new models.SubFormFieldGroup();
-formFieldGroups1.groupId = "RadioItemGroup1";
-formFieldGroups1.groupLabel = "Radio Item Group 1";
-formFieldGroups1.requirement = "require_0-1";
+const formFieldGroups1: models.SubFormFieldGroup = {
+  groupId: "RadioItemGroup1",
+  groupLabel: "Radio Item Group 1",
+  requirement: "require_0-1",
+};
 
 const formFieldGroups = [
   formFieldGroups1,
 ];
 
-const formFieldsPerDocument1 = new models.SubFormFieldsPerDocumentRadio();
-formFieldsPerDocument1.documentIndex = 0;
-formFieldsPerDocument1.apiId = "uniqueIdHere_1";
-formFieldsPerDocument1.type = "radio";
-formFieldsPerDocument1.required = false;
-formFieldsPerDocument1.signer = "0";
-formFieldsPerDocument1.width = 18;
-formFieldsPerDocument1.height = 18;
-formFieldsPerDocument1.x = 112;
-formFieldsPerDocument1.y = 328;
-formFieldsPerDocument1.group = "RadioItemGroup1";
-formFieldsPerDocument1.isChecked = true;
-formFieldsPerDocument1.name = "";
-formFieldsPerDocument1.page = 1;
+const formFieldsPerDocument1: models.SubFormFieldsPerDocumentRadio = {
+  documentIndex: 0,
+  apiId: "uniqueIdHere_1",
+  type: "radio",
+  required: false,
+  signer: "0",
+  width: 18,
+  height: 18,
+  x: 112,
+  y: 328,
+  group: "RadioItemGroup1",
+  isChecked: true,
+  name: "",
+  page: 1,
+};
 
-const formFieldsPerDocument2 = new models.SubFormFieldsPerDocumentRadio();
-formFieldsPerDocument2.documentIndex = 0;
-formFieldsPerDocument2.apiId = "uniqueIdHere_2";
-formFieldsPerDocument2.type = "radio";
-formFieldsPerDocument2.required = false;
-formFieldsPerDocument2.signer = "0";
-formFieldsPerDocument2.width = 18;
-formFieldsPerDocument2.height = 18;
-formFieldsPerDocument2.x = 112;
-formFieldsPerDocument2.y = 370;
-formFieldsPerDocument2.group = "RadioItemGroup1";
-formFieldsPerDocument2.isChecked = false;
-formFieldsPerDocument2.name = "";
-formFieldsPerDocument2.page = 1;
+const formFieldsPerDocument2: models.SubFormFieldsPerDocumentRadio = {
+  documentIndex: 0,
+  apiId: "uniqueIdHere_2",
+  type: "radio",
+  required: false,
+  signer: "0",
+  width: 18,
+  height: 18,
+  x: 112,
+  y: 370,
+  group: "RadioItemGroup1",
+  isChecked: false,
+  name: "",
+  page: 1,
+};
 
 const formFieldsPerDocument = [
   formFieldsPerDocument1,
   formFieldsPerDocument2,
 ];
 
-const mergeFields1 = new models.SubMergeField();
-mergeFields1.name = "Full Name";
-mergeFields1.type = models.SubMergeField.TypeEnum.Text;
+const mergeFields1: models.SubMergeField = {
+  name: "Full Name",
+  type: models.SubMergeField.TypeEnum.Text,
+};
 
-const mergeFields2 = new models.SubMergeField();
-mergeFields2.name = "Is Registered?";
-mergeFields2.type = models.SubMergeField.TypeEnum.Checkbox;
+const mergeFields2: models.SubMergeField = {
+  name: "Is Registered?",
+  type: models.SubMergeField.TypeEnum.Checkbox,
+};
 
 const mergeFields = [
   mergeFields1,
   mergeFields2,
 ];
 
-const signerRoles1 = new models.SubTemplateRole();
-signerRoles1.name = "Client";
-signerRoles1.order = 0;
+const signerRoles1: models.SubTemplateRole = {
+  name: "Client",
+  order: 0,
+};
 
-const signerRoles2 = new models.SubTemplateRole();
-signerRoles2.name = "Witness";
-signerRoles2.order = 1;
+const signerRoles2: models.SubTemplateRole = {
+  name: "Witness",
+  order: 1,
+};
 
 const signerRoles = [
   signerRoles1,
   signerRoles2,
 ];
 
-const templateCreateEmbeddedDraftRequest = new models.TemplateCreateEmbeddedDraftRequest();
-templateCreateEmbeddedDraftRequest.clientId = "37dee8d8440c66d54cfa05d92c160882";
-templateCreateEmbeddedDraftRequest.message = "For your approval";
-templateCreateEmbeddedDraftRequest.subject = "Please sign this document";
-templateCreateEmbeddedDraftRequest.testMode = true;
-templateCreateEmbeddedDraftRequest.title = "Test Template";
-templateCreateEmbeddedDraftRequest.fileUrls = [
-  "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
-];
-templateCreateEmbeddedDraftRequest.ccRoles = [
-  "Manager",
-];
-templateCreateEmbeddedDraftRequest.fieldOptions = fieldOptions;
-templateCreateEmbeddedDraftRequest.formFieldGroups = formFieldGroups;
-templateCreateEmbeddedDraftRequest.formFieldsPerDocument = formFieldsPerDocument;
-templateCreateEmbeddedDraftRequest.mergeFields = mergeFields;
-templateCreateEmbeddedDraftRequest.signerRoles = signerRoles;
+const templateCreateEmbeddedDraftRequest: models.TemplateCreateEmbeddedDraftRequest = {
+  clientId: "37dee8d8440c66d54cfa05d92c160882",
+  message: "For your approval",
+  subject: "Please sign this document",
+  testMode: true,
+  title: "Test Template",
+  fileUrls: [
+    "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
+  ],
+  ccRoles: [
+    "Manager",
+  ],
+  fieldOptions: fieldOptions,
+  formFieldGroups: formFieldGroups,
+  formFieldsPerDocument: formFieldsPerDocument,
+  mergeFields: mergeFields,
+  signerRoles: signerRoles,
+};
 
 apiCaller.templateCreateEmbeddedDraft(
   templateCreateEmbeddedDraftRequest,
diff --git a/sandbox/node/src/TemplateCreateEmbeddedDraftFormFieldRulesExample.ts b/sandbox/node/src/TemplateCreateEmbeddedDraftFormFieldRulesExample.ts
index ce20fc91d..6ff77313f 100644
--- a/sandbox/node/src/TemplateCreateEmbeddedDraftFormFieldRulesExample.ts
+++ b/sandbox/node/src/TemplateCreateEmbeddedDraftFormFieldRulesExample.ts
@@ -6,112 +6,123 @@ const apiCaller = new api.TemplateApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const formFieldRules1Triggers1 = new models.SubFormFieldRuleTrigger();
-formFieldRules1Triggers1.id = "uniqueIdHere_1";
-formFieldRules1Triggers1.operator = models.SubFormFieldRuleTrigger.OperatorEnum.Is;
-formFieldRules1Triggers1.value = "foo";
+const formFieldRules1Triggers1: models.SubFormFieldRuleTrigger = {
+  id: "uniqueIdHere_1",
+  operator: models.SubFormFieldRuleTrigger.OperatorEnum.Is,
+  value: "foo",
+};
 
 const formFieldRules1Triggers = [
   formFieldRules1Triggers1,
 ];
 
-const formFieldRules1Actions1 = new models.SubFormFieldRuleAction();
-formFieldRules1Actions1.hidden = true;
-formFieldRules1Actions1.type = models.SubFormFieldRuleAction.TypeEnum.FieldVisibility;
-formFieldRules1Actions1.fieldId = "uniqueIdHere_2";
+const formFieldRules1Actions1: models.SubFormFieldRuleAction = {
+  hidden: true,
+  type: models.SubFormFieldRuleAction.TypeEnum.FieldVisibility,
+  fieldId: "uniqueIdHere_2",
+};
 
 const formFieldRules1Actions = [
   formFieldRules1Actions1,
 ];
 
-const fieldOptions = new models.SubFieldOptions();
-fieldOptions.dateFormat = models.SubFieldOptions.DateFormatEnum.DD_MM_YYYY;
+const fieldOptions: models.SubFieldOptions = {
+  dateFormat: models.SubFieldOptions.DateFormatEnum.DdMmYyyy,
+};
 
-const formFieldRules1 = new models.SubFormFieldRule();
-formFieldRules1.id = "rule_1";
-formFieldRules1.triggerOperator = "AND";
-formFieldRules1.triggers = formFieldRules1Triggers;
-formFieldRules1.actions = formFieldRules1Actions;
+const formFieldRules1: models.SubFormFieldRule = {
+  id: "rule_1",
+  triggerOperator: "AND",
+  triggers: formFieldRules1Triggers,
+  actions: formFieldRules1Actions,
+};
 
 const formFieldRules = [
   formFieldRules1,
 ];
 
-const formFieldsPerDocument1 = new models.SubFormFieldsPerDocumentText();
-formFieldsPerDocument1.documentIndex = 0;
-formFieldsPerDocument1.apiId = "uniqueIdHere_1";
-formFieldsPerDocument1.type = "text";
-formFieldsPerDocument1.required = true;
-formFieldsPerDocument1.signer = "0";
-formFieldsPerDocument1.width = 100;
-formFieldsPerDocument1.height = 16;
-formFieldsPerDocument1.x = 112;
-formFieldsPerDocument1.y = 328;
-formFieldsPerDocument1.name = "";
-formFieldsPerDocument1.page = 1;
-formFieldsPerDocument1.validationType = models.SubFormFieldsPerDocumentText.ValidationTypeEnum.NumbersOnly;
-
-const formFieldsPerDocument2 = new models.SubFormFieldsPerDocumentSignature();
-formFieldsPerDocument2.documentIndex = 0;
-formFieldsPerDocument2.apiId = "uniqueIdHere_2";
-formFieldsPerDocument2.type = "signature";
-formFieldsPerDocument2.required = true;
-formFieldsPerDocument2.signer = "0";
-formFieldsPerDocument2.width = 120;
-formFieldsPerDocument2.height = 30;
-formFieldsPerDocument2.x = 530;
-formFieldsPerDocument2.y = 415;
-formFieldsPerDocument2.name = "";
-formFieldsPerDocument2.page = 1;
+const formFieldsPerDocument1: models.SubFormFieldsPerDocumentText = {
+  documentIndex: 0,
+  apiId: "uniqueIdHere_1",
+  type: "text",
+  required: true,
+  signer: "0",
+  width: 100,
+  height: 16,
+  x: 112,
+  y: 328,
+  name: "",
+  page: 1,
+  validationType: models.SubFormFieldsPerDocumentText.ValidationTypeEnum.NumbersOnly,
+};
+
+const formFieldsPerDocument2: models.SubFormFieldsPerDocumentSignature = {
+  documentIndex: 0,
+  apiId: "uniqueIdHere_2",
+  type: "signature",
+  required: true,
+  signer: "0",
+  width: 120,
+  height: 30,
+  x: 530,
+  y: 415,
+  name: "",
+  page: 1,
+};
 
 const formFieldsPerDocument = [
   formFieldsPerDocument1,
   formFieldsPerDocument2,
 ];
 
-const mergeFields1 = new models.SubMergeField();
-mergeFields1.name = "Full Name";
-mergeFields1.type = models.SubMergeField.TypeEnum.Text;
+const mergeFields1: models.SubMergeField = {
+  name: "Full Name",
+  type: models.SubMergeField.TypeEnum.Text,
+};
 
-const mergeFields2 = new models.SubMergeField();
-mergeFields2.name = "Is Registered?";
-mergeFields2.type = models.SubMergeField.TypeEnum.Checkbox;
+const mergeFields2: models.SubMergeField = {
+  name: "Is Registered?",
+  type: models.SubMergeField.TypeEnum.Checkbox,
+};
 
 const mergeFields = [
   mergeFields1,
   mergeFields2,
 ];
 
-const signerRoles1 = new models.SubTemplateRole();
-signerRoles1.name = "Client";
-signerRoles1.order = 0;
+const signerRoles1: models.SubTemplateRole = {
+  name: "Client",
+  order: 0,
+};
 
-const signerRoles2 = new models.SubTemplateRole();
-signerRoles2.name = "Witness";
-signerRoles2.order = 1;
+const signerRoles2: models.SubTemplateRole = {
+  name: "Witness",
+  order: 1,
+};
 
 const signerRoles = [
   signerRoles1,
   signerRoles2,
 ];
 
-const templateCreateEmbeddedDraftRequest = new models.TemplateCreateEmbeddedDraftRequest();
-templateCreateEmbeddedDraftRequest.clientId = "37dee8d8440c66d54cfa05d92c160882";
-templateCreateEmbeddedDraftRequest.message = "For your approval";
-templateCreateEmbeddedDraftRequest.subject = "Please sign this document";
-templateCreateEmbeddedDraftRequest.testMode = true;
-templateCreateEmbeddedDraftRequest.title = "Test Template";
-templateCreateEmbeddedDraftRequest.fileUrls = [
-  "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
-];
-templateCreateEmbeddedDraftRequest.ccRoles = [
-  "Manager",
-];
-templateCreateEmbeddedDraftRequest.fieldOptions = fieldOptions;
-templateCreateEmbeddedDraftRequest.formFieldRules = formFieldRules;
-templateCreateEmbeddedDraftRequest.formFieldsPerDocument = formFieldsPerDocument;
-templateCreateEmbeddedDraftRequest.mergeFields = mergeFields;
-templateCreateEmbeddedDraftRequest.signerRoles = signerRoles;
+const templateCreateEmbeddedDraftRequest: models.TemplateCreateEmbeddedDraftRequest = {
+  clientId: "37dee8d8440c66d54cfa05d92c160882",
+  message: "For your approval",
+  subject: "Please sign this document",
+  testMode: true,
+  title: "Test Template",
+  fileUrls: [
+    "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
+  ],
+  ccRoles: [
+    "Manager",
+  ],
+  fieldOptions: fieldOptions,
+  formFieldRules: formFieldRules,
+  formFieldsPerDocument: formFieldsPerDocument,
+  mergeFields: mergeFields,
+  signerRoles: signerRoles,
+};
 
 apiCaller.templateCreateEmbeddedDraft(
   templateCreateEmbeddedDraftRequest,
diff --git a/sandbox/node/src/TemplateCreateEmbeddedDraftFormFieldsPerDocumentExample.ts b/sandbox/node/src/TemplateCreateEmbeddedDraftFormFieldsPerDocumentExample.ts
index 0ce2cbcd4..e78591849 100644
--- a/sandbox/node/src/TemplateCreateEmbeddedDraftFormFieldsPerDocumentExample.ts
+++ b/sandbox/node/src/TemplateCreateEmbeddedDraftFormFieldsPerDocumentExample.ts
@@ -6,84 +6,92 @@ const apiCaller = new api.TemplateApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const fieldOptions = new models.SubFieldOptions();
-fieldOptions.dateFormat = models.SubFieldOptions.DateFormatEnum.DD_MM_YYYY;
+const fieldOptions: models.SubFieldOptions = {
+  dateFormat: models.SubFieldOptions.DateFormatEnum.DdMmYyyy,
+};
 
-const formFieldsPerDocument1 = new models.SubFormFieldsPerDocumentText();
-formFieldsPerDocument1.documentIndex = 0;
-formFieldsPerDocument1.apiId = "uniqueIdHere_1";
-formFieldsPerDocument1.type = "text";
-formFieldsPerDocument1.required = true;
-formFieldsPerDocument1.signer = "1";
-formFieldsPerDocument1.width = 100;
-formFieldsPerDocument1.height = 16;
-formFieldsPerDocument1.x = 112;
-formFieldsPerDocument1.y = 328;
-formFieldsPerDocument1.name = "";
-formFieldsPerDocument1.page = 1;
-formFieldsPerDocument1.placeholder = "";
-formFieldsPerDocument1.validationType = models.SubFormFieldsPerDocumentText.ValidationTypeEnum.NumbersOnly;
+const formFieldsPerDocument1: models.SubFormFieldsPerDocumentText = {
+  documentIndex: 0,
+  apiId: "uniqueIdHere_1",
+  type: "text",
+  required: true,
+  signer: "1",
+  width: 100,
+  height: 16,
+  x: 112,
+  y: 328,
+  name: "",
+  page: 1,
+  placeholder: "",
+  validationType: models.SubFormFieldsPerDocumentText.ValidationTypeEnum.NumbersOnly,
+};
 
-const formFieldsPerDocument2 = new models.SubFormFieldsPerDocumentSignature();
-formFieldsPerDocument2.documentIndex = 0;
-formFieldsPerDocument2.apiId = "uniqueIdHere_2";
-formFieldsPerDocument2.type = "signature";
-formFieldsPerDocument2.required = true;
-formFieldsPerDocument2.signer = "0";
-formFieldsPerDocument2.width = 120;
-formFieldsPerDocument2.height = 30;
-formFieldsPerDocument2.x = 530;
-formFieldsPerDocument2.y = 415;
-formFieldsPerDocument2.name = "";
-formFieldsPerDocument2.page = 1;
+const formFieldsPerDocument2: models.SubFormFieldsPerDocumentSignature = {
+  documentIndex: 0,
+  apiId: "uniqueIdHere_2",
+  type: "signature",
+  required: true,
+  signer: "0",
+  width: 120,
+  height: 30,
+  x: 530,
+  y: 415,
+  name: "",
+  page: 1,
+};
 
 const formFieldsPerDocument = [
   formFieldsPerDocument1,
   formFieldsPerDocument2,
 ];
 
-const mergeFields1 = new models.SubMergeField();
-mergeFields1.name = "Full Name";
-mergeFields1.type = models.SubMergeField.TypeEnum.Text;
+const mergeFields1: models.SubMergeField = {
+  name: "Full Name",
+  type: models.SubMergeField.TypeEnum.Text,
+};
 
-const mergeFields2 = new models.SubMergeField();
-mergeFields2.name = "Is Registered?";
-mergeFields2.type = models.SubMergeField.TypeEnum.Checkbox;
+const mergeFields2: models.SubMergeField = {
+  name: "Is Registered?",
+  type: models.SubMergeField.TypeEnum.Checkbox,
+};
 
 const mergeFields = [
   mergeFields1,
   mergeFields2,
 ];
 
-const signerRoles1 = new models.SubTemplateRole();
-signerRoles1.name = "Client";
-signerRoles1.order = 0;
+const signerRoles1: models.SubTemplateRole = {
+  name: "Client",
+  order: 0,
+};
 
-const signerRoles2 = new models.SubTemplateRole();
-signerRoles2.name = "Witness";
-signerRoles2.order = 1;
+const signerRoles2: models.SubTemplateRole = {
+  name: "Witness",
+  order: 1,
+};
 
 const signerRoles = [
   signerRoles1,
   signerRoles2,
 ];
 
-const templateCreateEmbeddedDraftRequest = new models.TemplateCreateEmbeddedDraftRequest();
-templateCreateEmbeddedDraftRequest.clientId = "37dee8d8440c66d54cfa05d92c160882";
-templateCreateEmbeddedDraftRequest.message = "For your approval";
-templateCreateEmbeddedDraftRequest.subject = "Please sign this document";
-templateCreateEmbeddedDraftRequest.testMode = true;
-templateCreateEmbeddedDraftRequest.title = "Test Template";
-templateCreateEmbeddedDraftRequest.fileUrls = [
-  "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
-];
-templateCreateEmbeddedDraftRequest.ccRoles = [
-  "Manager",
-];
-templateCreateEmbeddedDraftRequest.fieldOptions = fieldOptions;
-templateCreateEmbeddedDraftRequest.formFieldsPerDocument = formFieldsPerDocument;
-templateCreateEmbeddedDraftRequest.mergeFields = mergeFields;
-templateCreateEmbeddedDraftRequest.signerRoles = signerRoles;
+const templateCreateEmbeddedDraftRequest: models.TemplateCreateEmbeddedDraftRequest = {
+  clientId: "37dee8d8440c66d54cfa05d92c160882",
+  message: "For your approval",
+  subject: "Please sign this document",
+  testMode: true,
+  title: "Test Template",
+  fileUrls: [
+    "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
+  ],
+  ccRoles: [
+    "Manager",
+  ],
+  fieldOptions: fieldOptions,
+  formFieldsPerDocument: formFieldsPerDocument,
+  mergeFields: mergeFields,
+  signerRoles: signerRoles,
+};
 
 apiCaller.templateCreateEmbeddedDraft(
   templateCreateEmbeddedDraftRequest,
diff --git a/sandbox/node/src/TemplateCreateExample.ts b/sandbox/node/src/TemplateCreateExample.ts
index c17b780a9..6046df4b5 100644
--- a/sandbox/node/src/TemplateCreateExample.ts
+++ b/sandbox/node/src/TemplateCreateExample.ts
@@ -6,84 +6,92 @@ const apiCaller = new api.TemplateApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const fieldOptions = new models.SubFieldOptions();
-fieldOptions.dateFormat = models.SubFieldOptions.DateFormatEnum.DD_MM_YYYY;
+const fieldOptions: models.SubFieldOptions = {
+  dateFormat: models.SubFieldOptions.DateFormatEnum.DdMmYyyy,
+};
 
-const signerRoles1 = new models.SubTemplateRole();
-signerRoles1.name = "Client";
-signerRoles1.order = 0;
+const signerRoles1: models.SubTemplateRole = {
+  name: "Client",
+  order: 0,
+};
 
-const signerRoles2 = new models.SubTemplateRole();
-signerRoles2.name = "Witness";
-signerRoles2.order = 1;
+const signerRoles2: models.SubTemplateRole = {
+  name: "Witness",
+  order: 1,
+};
 
 const signerRoles = [
   signerRoles1,
   signerRoles2,
 ];
 
-const formFieldsPerDocument1 = new models.SubFormFieldsPerDocumentText();
-formFieldsPerDocument1.documentIndex = 0;
-formFieldsPerDocument1.apiId = "uniqueIdHere_1";
-formFieldsPerDocument1.type = "text";
-formFieldsPerDocument1.required = true;
-formFieldsPerDocument1.signer = "1";
-formFieldsPerDocument1.width = 100;
-formFieldsPerDocument1.height = 16;
-formFieldsPerDocument1.x = 112;
-formFieldsPerDocument1.y = 328;
-formFieldsPerDocument1.name = "";
-formFieldsPerDocument1.page = 1;
-formFieldsPerDocument1.placeholder = "";
-formFieldsPerDocument1.validationType = models.SubFormFieldsPerDocumentText.ValidationTypeEnum.NumbersOnly;
+const formFieldsPerDocument1: models.SubFormFieldsPerDocumentText = {
+  documentIndex: 0,
+  apiId: "uniqueIdHere_1",
+  type: "text",
+  required: true,
+  signer: "1",
+  width: 100,
+  height: 16,
+  x: 112,
+  y: 328,
+  name: "",
+  page: 1,
+  placeholder: "",
+  validationType: models.SubFormFieldsPerDocumentText.ValidationTypeEnum.NumbersOnly,
+};
 
-const formFieldsPerDocument2 = new models.SubFormFieldsPerDocumentSignature();
-formFieldsPerDocument2.documentIndex = 0;
-formFieldsPerDocument2.apiId = "uniqueIdHere_2";
-formFieldsPerDocument2.type = "signature";
-formFieldsPerDocument2.required = true;
-formFieldsPerDocument2.signer = "0";
-formFieldsPerDocument2.width = 120;
-formFieldsPerDocument2.height = 30;
-formFieldsPerDocument2.x = 530;
-formFieldsPerDocument2.y = 415;
-formFieldsPerDocument2.name = "";
-formFieldsPerDocument2.page = 1;
+const formFieldsPerDocument2: models.SubFormFieldsPerDocumentSignature = {
+  documentIndex: 0,
+  apiId: "uniqueIdHere_2",
+  type: "signature",
+  required: true,
+  signer: "0",
+  width: 120,
+  height: 30,
+  x: 530,
+  y: 415,
+  name: "",
+  page: 1,
+};
 
 const formFieldsPerDocument = [
   formFieldsPerDocument1,
   formFieldsPerDocument2,
 ];
 
-const mergeFields1 = new models.SubMergeField();
-mergeFields1.name = "Full Name";
-mergeFields1.type = models.SubMergeField.TypeEnum.Text;
+const mergeFields1: models.SubMergeField = {
+  name: "Full Name",
+  type: models.SubMergeField.TypeEnum.Text,
+};
 
-const mergeFields2 = new models.SubMergeField();
-mergeFields2.name = "Is Registered?";
-mergeFields2.type = models.SubMergeField.TypeEnum.Checkbox;
+const mergeFields2: models.SubMergeField = {
+  name: "Is Registered?",
+  type: models.SubMergeField.TypeEnum.Checkbox,
+};
 
 const mergeFields = [
   mergeFields1,
   mergeFields2,
 ];
 
-const templateCreateRequest = new models.TemplateCreateRequest();
-templateCreateRequest.clientId = "37dee8d8440c66d54cfa05d92c160882";
-templateCreateRequest.message = "For your approval";
-templateCreateRequest.subject = "Please sign this document";
-templateCreateRequest.testMode = true;
-templateCreateRequest.title = "Test Template";
-templateCreateRequest.ccRoles = [
-  "Manager",
-];
-templateCreateRequest.files = [
-  fs.createReadStream("./example_signature_request.pdf"),
-];
-templateCreateRequest.fieldOptions = fieldOptions;
-templateCreateRequest.signerRoles = signerRoles;
-templateCreateRequest.formFieldsPerDocument = formFieldsPerDocument;
-templateCreateRequest.mergeFields = mergeFields;
+const templateCreateRequest: models.TemplateCreateRequest = {
+  clientId: "37dee8d8440c66d54cfa05d92c160882",
+  message: "For your approval",
+  subject: "Please sign this document",
+  testMode: true,
+  title: "Test Template",
+  ccRoles: [
+    "Manager",
+  ],
+  files: [
+    fs.createReadStream("./example_signature_request.pdf"),
+  ],
+  fieldOptions: fieldOptions,
+  signerRoles: signerRoles,
+  formFieldsPerDocument: formFieldsPerDocument,
+  mergeFields: mergeFields,
+};
 
 apiCaller.templateCreate(
   templateCreateRequest,
diff --git a/sandbox/node/src/TemplateCreateFormFieldGroupsExample.ts b/sandbox/node/src/TemplateCreateFormFieldGroupsExample.ts
index e12c74953..845ddaa9b 100644
--- a/sandbox/node/src/TemplateCreateFormFieldGroupsExample.ts
+++ b/sandbox/node/src/TemplateCreateFormFieldGroupsExample.ts
@@ -6,96 +6,105 @@ const apiCaller = new api.TemplateApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const fieldOptions = new models.SubFieldOptions();
-fieldOptions.dateFormat = models.SubFieldOptions.DateFormatEnum.DD_MM_YYYY;
+const fieldOptions: models.SubFieldOptions = {
+  dateFormat: models.SubFieldOptions.DateFormatEnum.DdMmYyyy,
+};
 
-const signerRoles1 = new models.SubTemplateRole();
-signerRoles1.name = "Client";
-signerRoles1.order = 0;
+const signerRoles1: models.SubTemplateRole = {
+  name: "Client",
+  order: 0,
+};
 
-const signerRoles2 = new models.SubTemplateRole();
-signerRoles2.name = "Witness";
-signerRoles2.order = 1;
+const signerRoles2: models.SubTemplateRole = {
+  name: "Witness",
+  order: 1,
+};
 
 const signerRoles = [
   signerRoles1,
   signerRoles2,
 ];
 
-const formFieldsPerDocument1 = new models.SubFormFieldsPerDocumentRadio();
-formFieldsPerDocument1.documentIndex = 0;
-formFieldsPerDocument1.apiId = "uniqueIdHere_1";
-formFieldsPerDocument1.type = "radio";
-formFieldsPerDocument1.required = false;
-formFieldsPerDocument1.signer = "0";
-formFieldsPerDocument1.width = 18;
-formFieldsPerDocument1.height = 18;
-formFieldsPerDocument1.x = 112;
-formFieldsPerDocument1.y = 328;
-formFieldsPerDocument1.group = "RadioItemGroup1";
-formFieldsPerDocument1.isChecked = true;
-formFieldsPerDocument1.name = "";
-formFieldsPerDocument1.page = 1;
+const formFieldsPerDocument1: models.SubFormFieldsPerDocumentRadio = {
+  documentIndex: 0,
+  apiId: "uniqueIdHere_1",
+  type: "radio",
+  required: false,
+  signer: "0",
+  width: 18,
+  height: 18,
+  x: 112,
+  y: 328,
+  group: "RadioItemGroup1",
+  isChecked: true,
+  name: "",
+  page: 1,
+};
 
-const formFieldsPerDocument2 = new models.SubFormFieldsPerDocumentRadio();
-formFieldsPerDocument2.documentIndex = 0;
-formFieldsPerDocument2.apiId = "uniqueIdHere_2";
-formFieldsPerDocument2.type = "radio";
-formFieldsPerDocument2.required = false;
-formFieldsPerDocument2.signer = "0";
-formFieldsPerDocument2.width = 18;
-formFieldsPerDocument2.height = 18;
-formFieldsPerDocument2.x = 112;
-formFieldsPerDocument2.y = 370;
-formFieldsPerDocument2.group = "RadioItemGroup1";
-formFieldsPerDocument2.isChecked = false;
-formFieldsPerDocument2.name = "";
-formFieldsPerDocument2.page = 1;
+const formFieldsPerDocument2: models.SubFormFieldsPerDocumentRadio = {
+  documentIndex: 0,
+  apiId: "uniqueIdHere_2",
+  type: "radio",
+  required: false,
+  signer: "0",
+  width: 18,
+  height: 18,
+  x: 112,
+  y: 370,
+  group: "RadioItemGroup1",
+  isChecked: false,
+  name: "",
+  page: 1,
+};
 
 const formFieldsPerDocument = [
   formFieldsPerDocument1,
   formFieldsPerDocument2,
 ];
 
-const formFieldGroups1 = new models.SubFormFieldGroup();
-formFieldGroups1.groupId = "RadioItemGroup1";
-formFieldGroups1.groupLabel = "Radio Item Group 1";
-formFieldGroups1.requirement = "require_0-1";
+const formFieldGroups1: models.SubFormFieldGroup = {
+  groupId: "RadioItemGroup1",
+  groupLabel: "Radio Item Group 1",
+  requirement: "require_0-1",
+};
 
 const formFieldGroups = [
   formFieldGroups1,
 ];
 
-const mergeFields1 = new models.SubMergeField();
-mergeFields1.name = "Full Name";
-mergeFields1.type = models.SubMergeField.TypeEnum.Text;
+const mergeFields1: models.SubMergeField = {
+  name: "Full Name",
+  type: models.SubMergeField.TypeEnum.Text,
+};
 
-const mergeFields2 = new models.SubMergeField();
-mergeFields2.name = "Is Registered?";
-mergeFields2.type = models.SubMergeField.TypeEnum.Checkbox;
+const mergeFields2: models.SubMergeField = {
+  name: "Is Registered?",
+  type: models.SubMergeField.TypeEnum.Checkbox,
+};
 
 const mergeFields = [
   mergeFields1,
   mergeFields2,
 ];
 
-const templateCreateRequest = new models.TemplateCreateRequest();
-templateCreateRequest.clientId = "37dee8d8440c66d54cfa05d92c160882";
-templateCreateRequest.message = "For your approval";
-templateCreateRequest.subject = "Please sign this document";
-templateCreateRequest.testMode = true;
-templateCreateRequest.title = "Test Template";
-templateCreateRequest.fileUrls = [
-  "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
-];
-templateCreateRequest.ccRoles = [
-  "Manager",
-];
-templateCreateRequest.fieldOptions = fieldOptions;
-templateCreateRequest.signerRoles = signerRoles;
-templateCreateRequest.formFieldsPerDocument = formFieldsPerDocument;
-templateCreateRequest.formFieldGroups = formFieldGroups;
-templateCreateRequest.mergeFields = mergeFields;
+const templateCreateRequest: models.TemplateCreateRequest = {
+  clientId: "37dee8d8440c66d54cfa05d92c160882",
+  message: "For your approval",
+  subject: "Please sign this document",
+  testMode: true,
+  title: "Test Template",
+  fileUrls: [
+    "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
+  ],
+  ccRoles: [
+    "Manager",
+  ],
+  fieldOptions: fieldOptions,
+  signerRoles: signerRoles,
+  formFieldsPerDocument: formFieldsPerDocument,
+  formFieldGroups: formFieldGroups,
+  mergeFields: mergeFields,
+};
 
 apiCaller.templateCreate(
   templateCreateRequest,
diff --git a/sandbox/node/src/TemplateCreateFormFieldRulesExample.ts b/sandbox/node/src/TemplateCreateFormFieldRulesExample.ts
index 31a949aea..e8231cdde 100644
--- a/sandbox/node/src/TemplateCreateFormFieldRulesExample.ts
+++ b/sandbox/node/src/TemplateCreateFormFieldRulesExample.ts
@@ -6,112 +6,123 @@ const apiCaller = new api.TemplateApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const formFieldRules1Triggers1 = new models.SubFormFieldRuleTrigger();
-formFieldRules1Triggers1.id = "uniqueIdHere_1";
-formFieldRules1Triggers1.operator = models.SubFormFieldRuleTrigger.OperatorEnum.Is;
-formFieldRules1Triggers1.value = "foo";
+const formFieldRules1Triggers1: models.SubFormFieldRuleTrigger = {
+  id: "uniqueIdHere_1",
+  operator: models.SubFormFieldRuleTrigger.OperatorEnum.Is,
+  value: "foo",
+};
 
 const formFieldRules1Triggers = [
   formFieldRules1Triggers1,
 ];
 
-const formFieldRules1Actions1 = new models.SubFormFieldRuleAction();
-formFieldRules1Actions1.hidden = true;
-formFieldRules1Actions1.type = models.SubFormFieldRuleAction.TypeEnum.FieldVisibility;
-formFieldRules1Actions1.fieldId = "uniqueIdHere_2";
+const formFieldRules1Actions1: models.SubFormFieldRuleAction = {
+  hidden: true,
+  type: models.SubFormFieldRuleAction.TypeEnum.FieldVisibility,
+  fieldId: "uniqueIdHere_2",
+};
 
 const formFieldRules1Actions = [
   formFieldRules1Actions1,
 ];
 
-const fieldOptions = new models.SubFieldOptions();
-fieldOptions.dateFormat = models.SubFieldOptions.DateFormatEnum.DD_MM_YYYY;
+const fieldOptions: models.SubFieldOptions = {
+  dateFormat: models.SubFieldOptions.DateFormatEnum.DdMmYyyy,
+};
 
-const signerRoles1 = new models.SubTemplateRole();
-signerRoles1.name = "Client";
-signerRoles1.order = 0;
+const signerRoles1: models.SubTemplateRole = {
+  name: "Client",
+  order: 0,
+};
 
-const signerRoles2 = new models.SubTemplateRole();
-signerRoles2.name = "Witness";
-signerRoles2.order = 1;
+const signerRoles2: models.SubTemplateRole = {
+  name: "Witness",
+  order: 1,
+};
 
 const signerRoles = [
   signerRoles1,
   signerRoles2,
 ];
 
-const formFieldsPerDocument1 = new models.SubFormFieldsPerDocumentText();
-formFieldsPerDocument1.documentIndex = 0;
-formFieldsPerDocument1.apiId = "uniqueIdHere_1";
-formFieldsPerDocument1.type = "text";
-formFieldsPerDocument1.required = true;
-formFieldsPerDocument1.signer = "0";
-formFieldsPerDocument1.width = 100;
-formFieldsPerDocument1.height = 16;
-formFieldsPerDocument1.x = 112;
-formFieldsPerDocument1.y = 328;
-formFieldsPerDocument1.name = "";
-formFieldsPerDocument1.page = 1;
-formFieldsPerDocument1.validationType = models.SubFormFieldsPerDocumentText.ValidationTypeEnum.NumbersOnly;
-
-const formFieldsPerDocument2 = new models.SubFormFieldsPerDocumentSignature();
-formFieldsPerDocument2.documentIndex = 0;
-formFieldsPerDocument2.apiId = "uniqueIdHere_2";
-formFieldsPerDocument2.type = "signature";
-formFieldsPerDocument2.required = true;
-formFieldsPerDocument2.signer = "0";
-formFieldsPerDocument2.width = 120;
-formFieldsPerDocument2.height = 30;
-formFieldsPerDocument2.x = 530;
-formFieldsPerDocument2.y = 415;
-formFieldsPerDocument2.name = "";
-formFieldsPerDocument2.page = 1;
+const formFieldsPerDocument1: models.SubFormFieldsPerDocumentText = {
+  documentIndex: 0,
+  apiId: "uniqueIdHere_1",
+  type: "text",
+  required: true,
+  signer: "0",
+  width: 100,
+  height: 16,
+  x: 112,
+  y: 328,
+  name: "",
+  page: 1,
+  validationType: models.SubFormFieldsPerDocumentText.ValidationTypeEnum.NumbersOnly,
+};
+
+const formFieldsPerDocument2: models.SubFormFieldsPerDocumentSignature = {
+  documentIndex: 0,
+  apiId: "uniqueIdHere_2",
+  type: "signature",
+  required: true,
+  signer: "0",
+  width: 120,
+  height: 30,
+  x: 530,
+  y: 415,
+  name: "",
+  page: 1,
+};
 
 const formFieldsPerDocument = [
   formFieldsPerDocument1,
   formFieldsPerDocument2,
 ];
 
-const formFieldRules1 = new models.SubFormFieldRule();
-formFieldRules1.id = "rule_1";
-formFieldRules1.triggerOperator = "AND";
-formFieldRules1.triggers = formFieldRules1Triggers;
-formFieldRules1.actions = formFieldRules1Actions;
+const formFieldRules1: models.SubFormFieldRule = {
+  id: "rule_1",
+  triggerOperator: "AND",
+  triggers: formFieldRules1Triggers,
+  actions: formFieldRules1Actions,
+};
 
 const formFieldRules = [
   formFieldRules1,
 ];
 
-const mergeFields1 = new models.SubMergeField();
-mergeFields1.name = "Full Name";
-mergeFields1.type = models.SubMergeField.TypeEnum.Text;
+const mergeFields1: models.SubMergeField = {
+  name: "Full Name",
+  type: models.SubMergeField.TypeEnum.Text,
+};
 
-const mergeFields2 = new models.SubMergeField();
-mergeFields2.name = "Is Registered?";
-mergeFields2.type = models.SubMergeField.TypeEnum.Checkbox;
+const mergeFields2: models.SubMergeField = {
+  name: "Is Registered?",
+  type: models.SubMergeField.TypeEnum.Checkbox,
+};
 
 const mergeFields = [
   mergeFields1,
   mergeFields2,
 ];
 
-const templateCreateRequest = new models.TemplateCreateRequest();
-templateCreateRequest.clientId = "37dee8d8440c66d54cfa05d92c160882";
-templateCreateRequest.message = "For your approval";
-templateCreateRequest.subject = "Please sign this document";
-templateCreateRequest.testMode = true;
-templateCreateRequest.title = "Test Template";
-templateCreateRequest.fileUrls = [
-  "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
-];
-templateCreateRequest.ccRoles = [
-  "Manager",
-];
-templateCreateRequest.fieldOptions = fieldOptions;
-templateCreateRequest.signerRoles = signerRoles;
-templateCreateRequest.formFieldsPerDocument = formFieldsPerDocument;
-templateCreateRequest.formFieldRules = formFieldRules;
-templateCreateRequest.mergeFields = mergeFields;
+const templateCreateRequest: models.TemplateCreateRequest = {
+  clientId: "37dee8d8440c66d54cfa05d92c160882",
+  message: "For your approval",
+  subject: "Please sign this document",
+  testMode: true,
+  title: "Test Template",
+  fileUrls: [
+    "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
+  ],
+  ccRoles: [
+    "Manager",
+  ],
+  fieldOptions: fieldOptions,
+  signerRoles: signerRoles,
+  formFieldsPerDocument: formFieldsPerDocument,
+  formFieldRules: formFieldRules,
+  mergeFields: mergeFields,
+};
 
 apiCaller.templateCreate(
   templateCreateRequest,
diff --git a/sandbox/node/src/TemplateCreateFormFieldsPerDocumentExample.ts b/sandbox/node/src/TemplateCreateFormFieldsPerDocumentExample.ts
index d580e665b..59890f436 100644
--- a/sandbox/node/src/TemplateCreateFormFieldsPerDocumentExample.ts
+++ b/sandbox/node/src/TemplateCreateFormFieldsPerDocumentExample.ts
@@ -6,84 +6,92 @@ const apiCaller = new api.TemplateApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const fieldOptions = new models.SubFieldOptions();
-fieldOptions.dateFormat = models.SubFieldOptions.DateFormatEnum.DD_MM_YYYY;
+const fieldOptions: models.SubFieldOptions = {
+  dateFormat: models.SubFieldOptions.DateFormatEnum.DdMmYyyy,
+};
 
-const signerRoles1 = new models.SubTemplateRole();
-signerRoles1.name = "Client";
-signerRoles1.order = 0;
+const signerRoles1: models.SubTemplateRole = {
+  name: "Client",
+  order: 0,
+};
 
-const signerRoles2 = new models.SubTemplateRole();
-signerRoles2.name = "Witness";
-signerRoles2.order = 1;
+const signerRoles2: models.SubTemplateRole = {
+  name: "Witness",
+  order: 1,
+};
 
 const signerRoles = [
   signerRoles1,
   signerRoles2,
 ];
 
-const formFieldsPerDocument1 = new models.SubFormFieldsPerDocumentText();
-formFieldsPerDocument1.documentIndex = 0;
-formFieldsPerDocument1.apiId = "uniqueIdHere_1";
-formFieldsPerDocument1.type = "text";
-formFieldsPerDocument1.required = true;
-formFieldsPerDocument1.signer = "1";
-formFieldsPerDocument1.width = 100;
-formFieldsPerDocument1.height = 16;
-formFieldsPerDocument1.x = 112;
-formFieldsPerDocument1.y = 328;
-formFieldsPerDocument1.name = "";
-formFieldsPerDocument1.page = 1;
-formFieldsPerDocument1.placeholder = "";
-formFieldsPerDocument1.validationType = models.SubFormFieldsPerDocumentText.ValidationTypeEnum.NumbersOnly;
+const formFieldsPerDocument1: models.SubFormFieldsPerDocumentText = {
+  documentIndex: 0,
+  apiId: "uniqueIdHere_1",
+  type: "text",
+  required: true,
+  signer: "1",
+  width: 100,
+  height: 16,
+  x: 112,
+  y: 328,
+  name: "",
+  page: 1,
+  placeholder: "",
+  validationType: models.SubFormFieldsPerDocumentText.ValidationTypeEnum.NumbersOnly,
+};
 
-const formFieldsPerDocument2 = new models.SubFormFieldsPerDocumentSignature();
-formFieldsPerDocument2.documentIndex = 0;
-formFieldsPerDocument2.apiId = "uniqueIdHere_2";
-formFieldsPerDocument2.type = "signature";
-formFieldsPerDocument2.required = true;
-formFieldsPerDocument2.signer = "0";
-formFieldsPerDocument2.width = 120;
-formFieldsPerDocument2.height = 30;
-formFieldsPerDocument2.x = 530;
-formFieldsPerDocument2.y = 415;
-formFieldsPerDocument2.name = "";
-formFieldsPerDocument2.page = 1;
+const formFieldsPerDocument2: models.SubFormFieldsPerDocumentSignature = {
+  documentIndex: 0,
+  apiId: "uniqueIdHere_2",
+  type: "signature",
+  required: true,
+  signer: "0",
+  width: 120,
+  height: 30,
+  x: 530,
+  y: 415,
+  name: "",
+  page: 1,
+};
 
 const formFieldsPerDocument = [
   formFieldsPerDocument1,
   formFieldsPerDocument2,
 ];
 
-const mergeFields1 = new models.SubMergeField();
-mergeFields1.name = "Full Name";
-mergeFields1.type = models.SubMergeField.TypeEnum.Text;
+const mergeFields1: models.SubMergeField = {
+  name: "Full Name",
+  type: models.SubMergeField.TypeEnum.Text,
+};
 
-const mergeFields2 = new models.SubMergeField();
-mergeFields2.name = "Is Registered?";
-mergeFields2.type = models.SubMergeField.TypeEnum.Checkbox;
+const mergeFields2: models.SubMergeField = {
+  name: "Is Registered?",
+  type: models.SubMergeField.TypeEnum.Checkbox,
+};
 
 const mergeFields = [
   mergeFields1,
   mergeFields2,
 ];
 
-const templateCreateRequest = new models.TemplateCreateRequest();
-templateCreateRequest.clientId = "37dee8d8440c66d54cfa05d92c160882";
-templateCreateRequest.message = "For your approval";
-templateCreateRequest.subject = "Please sign this document";
-templateCreateRequest.testMode = true;
-templateCreateRequest.title = "Test Template";
-templateCreateRequest.fileUrls = [
-  "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
-];
-templateCreateRequest.ccRoles = [
-  "Manager",
-];
-templateCreateRequest.fieldOptions = fieldOptions;
-templateCreateRequest.signerRoles = signerRoles;
-templateCreateRequest.formFieldsPerDocument = formFieldsPerDocument;
-templateCreateRequest.mergeFields = mergeFields;
+const templateCreateRequest: models.TemplateCreateRequest = {
+  clientId: "37dee8d8440c66d54cfa05d92c160882",
+  message: "For your approval",
+  subject: "Please sign this document",
+  testMode: true,
+  title: "Test Template",
+  fileUrls: [
+    "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
+  ],
+  ccRoles: [
+    "Manager",
+  ],
+  fieldOptions: fieldOptions,
+  signerRoles: signerRoles,
+  formFieldsPerDocument: formFieldsPerDocument,
+  mergeFields: mergeFields,
+};
 
 apiCaller.templateCreate(
   templateCreateRequest,
diff --git a/sandbox/node/src/TemplateRemoveUserExample.ts b/sandbox/node/src/TemplateRemoveUserExample.ts
index f896f81e1..2d40a2f3f 100644
--- a/sandbox/node/src/TemplateRemoveUserExample.ts
+++ b/sandbox/node/src/TemplateRemoveUserExample.ts
@@ -6,8 +6,9 @@ const apiCaller = new api.TemplateApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const templateRemoveUserRequest = new models.TemplateRemoveUserRequest();
-templateRemoveUserRequest.emailAddress = "george@dropboxsign.com";
+const templateRemoveUserRequest: models.TemplateRemoveUserRequest = {
+  emailAddress: "george@dropboxsign.com",
+};
 
 apiCaller.templateRemoveUser(
   "f57db65d3f933b5316d398057a36176831451a35", // templateId
diff --git a/sandbox/node/src/TemplateUpdateFilesExample.ts b/sandbox/node/src/TemplateUpdateFilesExample.ts
index 139a53fff..fe21c563d 100644
--- a/sandbox/node/src/TemplateUpdateFilesExample.ts
+++ b/sandbox/node/src/TemplateUpdateFilesExample.ts
@@ -6,10 +6,11 @@ const apiCaller = new api.TemplateApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const templateUpdateFilesRequest = new models.TemplateUpdateFilesRequest();
-templateUpdateFilesRequest.files = [
-  fs.createReadStream("./example_signature_request.pdf"),
-];
+const templateUpdateFilesRequest: models.TemplateUpdateFilesRequest = {
+  files: [
+    fs.createReadStream("./example_signature_request.pdf"),
+  ],
+};
 
 apiCaller.templateUpdateFiles(
   "f57db65d3f933b5316d398057a36176831451a35", // templateId
diff --git a/sandbox/node/src/UnclaimedDraftCreateEmbeddedExample.ts b/sandbox/node/src/UnclaimedDraftCreateEmbeddedExample.ts
index d17be1564..7b99e7d60 100644
--- a/sandbox/node/src/UnclaimedDraftCreateEmbeddedExample.ts
+++ b/sandbox/node/src/UnclaimedDraftCreateEmbeddedExample.ts
@@ -6,13 +6,14 @@ const apiCaller = new api.UnclaimedDraftApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const unclaimedDraftCreateEmbeddedRequest = new models.UnclaimedDraftCreateEmbeddedRequest();
-unclaimedDraftCreateEmbeddedRequest.clientId = "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a";
-unclaimedDraftCreateEmbeddedRequest.requesterEmailAddress = "jack@dropboxsign.com";
-unclaimedDraftCreateEmbeddedRequest.testMode = true;
-unclaimedDraftCreateEmbeddedRequest.files = [
-  fs.createReadStream("./example_signature_request.pdf"),
-];
+const unclaimedDraftCreateEmbeddedRequest: models.UnclaimedDraftCreateEmbeddedRequest = {
+  clientId: "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a",
+  requesterEmailAddress: "jack@dropboxsign.com",
+  testMode: true,
+  files: [
+    fs.createReadStream("./example_signature_request.pdf"),
+  ],
+};
 
 apiCaller.unclaimedDraftCreateEmbedded(
   unclaimedDraftCreateEmbeddedRequest,
diff --git a/sandbox/node/src/UnclaimedDraftCreateEmbeddedFormFieldGroupsExample.ts b/sandbox/node/src/UnclaimedDraftCreateEmbeddedFormFieldGroupsExample.ts
index bb10352f4..f7953d6c4 100644
--- a/sandbox/node/src/UnclaimedDraftCreateEmbeddedFormFieldGroupsExample.ts
+++ b/sandbox/node/src/UnclaimedDraftCreateEmbeddedFormFieldGroupsExample.ts
@@ -6,59 +6,63 @@ const apiCaller = new api.UnclaimedDraftApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const formFieldGroups1 = new models.SubFormFieldGroup();
-formFieldGroups1.groupId = "RadioItemGroup1";
-formFieldGroups1.groupLabel = "Radio Item Group 1";
-formFieldGroups1.requirement = "require_0-1";
+const formFieldGroups1: models.SubFormFieldGroup = {
+  groupId: "RadioItemGroup1",
+  groupLabel: "Radio Item Group 1",
+  requirement: "require_0-1",
+};
 
 const formFieldGroups = [
   formFieldGroups1,
 ];
 
-const formFieldsPerDocument1 = new models.SubFormFieldsPerDocumentRadio();
-formFieldsPerDocument1.documentIndex = 0;
-formFieldsPerDocument1.apiId = "uniqueIdHere_1";
-formFieldsPerDocument1.type = "radio";
-formFieldsPerDocument1.required = false;
-formFieldsPerDocument1.signer = "0";
-formFieldsPerDocument1.width = 18;
-formFieldsPerDocument1.height = 18;
-formFieldsPerDocument1.x = 112;
-formFieldsPerDocument1.y = 328;
-formFieldsPerDocument1.group = "RadioItemGroup1";
-formFieldsPerDocument1.isChecked = true;
-formFieldsPerDocument1.name = "";
-formFieldsPerDocument1.page = 1;
+const formFieldsPerDocument1: models.SubFormFieldsPerDocumentRadio = {
+  documentIndex: 0,
+  apiId: "uniqueIdHere_1",
+  type: "radio",
+  required: false,
+  signer: "0",
+  width: 18,
+  height: 18,
+  x: 112,
+  y: 328,
+  group: "RadioItemGroup1",
+  isChecked: true,
+  name: "",
+  page: 1,
+};
 
-const formFieldsPerDocument2 = new models.SubFormFieldsPerDocumentRadio();
-formFieldsPerDocument2.documentIndex = 0;
-formFieldsPerDocument2.apiId = "uniqueIdHere_2";
-formFieldsPerDocument2.type = "radio";
-formFieldsPerDocument2.required = false;
-formFieldsPerDocument2.signer = "0";
-formFieldsPerDocument2.width = 18;
-formFieldsPerDocument2.height = 18;
-formFieldsPerDocument2.x = 112;
-formFieldsPerDocument2.y = 370;
-formFieldsPerDocument2.group = "RadioItemGroup1";
-formFieldsPerDocument2.isChecked = false;
-formFieldsPerDocument2.name = "";
-formFieldsPerDocument2.page = 1;
+const formFieldsPerDocument2: models.SubFormFieldsPerDocumentRadio = {
+  documentIndex: 0,
+  apiId: "uniqueIdHere_2",
+  type: "radio",
+  required: false,
+  signer: "0",
+  width: 18,
+  height: 18,
+  x: 112,
+  y: 370,
+  group: "RadioItemGroup1",
+  isChecked: false,
+  name: "",
+  page: 1,
+};
 
 const formFieldsPerDocument = [
   formFieldsPerDocument1,
   formFieldsPerDocument2,
 ];
 
-const unclaimedDraftCreateEmbeddedRequest = new models.UnclaimedDraftCreateEmbeddedRequest();
-unclaimedDraftCreateEmbeddedRequest.clientId = "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a";
-unclaimedDraftCreateEmbeddedRequest.requesterEmailAddress = "jack@dropboxsign.com";
-unclaimedDraftCreateEmbeddedRequest.testMode = false;
-unclaimedDraftCreateEmbeddedRequest.fileUrls = [
-  "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
-];
-unclaimedDraftCreateEmbeddedRequest.formFieldGroups = formFieldGroups;
-unclaimedDraftCreateEmbeddedRequest.formFieldsPerDocument = formFieldsPerDocument;
+const unclaimedDraftCreateEmbeddedRequest: models.UnclaimedDraftCreateEmbeddedRequest = {
+  clientId: "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a",
+  requesterEmailAddress: "jack@dropboxsign.com",
+  testMode: false,
+  fileUrls: [
+    "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
+  ],
+  formFieldGroups: formFieldGroups,
+  formFieldsPerDocument: formFieldsPerDocument,
+};
 
 apiCaller.unclaimedDraftCreateEmbedded(
   unclaimedDraftCreateEmbeddedRequest,
diff --git a/sandbox/node/src/UnclaimedDraftCreateEmbeddedFormFieldRulesExample.ts b/sandbox/node/src/UnclaimedDraftCreateEmbeddedFormFieldRulesExample.ts
index 8223f693e..e7050b603 100644
--- a/sandbox/node/src/UnclaimedDraftCreateEmbeddedFormFieldRulesExample.ts
+++ b/sandbox/node/src/UnclaimedDraftCreateEmbeddedFormFieldRulesExample.ts
@@ -6,75 +6,81 @@ const apiCaller = new api.UnclaimedDraftApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const formFieldRules1Triggers1 = new models.SubFormFieldRuleTrigger();
-formFieldRules1Triggers1.id = "uniqueIdHere_1";
-formFieldRules1Triggers1.operator = models.SubFormFieldRuleTrigger.OperatorEnum.Is;
-formFieldRules1Triggers1.value = "foo";
+const formFieldRules1Triggers1: models.SubFormFieldRuleTrigger = {
+  id: "uniqueIdHere_1",
+  operator: models.SubFormFieldRuleTrigger.OperatorEnum.Is,
+  value: "foo",
+};
 
 const formFieldRules1Triggers = [
   formFieldRules1Triggers1,
 ];
 
-const formFieldRules1Actions1 = new models.SubFormFieldRuleAction();
-formFieldRules1Actions1.hidden = true;
-formFieldRules1Actions1.type = models.SubFormFieldRuleAction.TypeEnum.FieldVisibility;
-formFieldRules1Actions1.fieldId = "uniqueIdHere_2";
+const formFieldRules1Actions1: models.SubFormFieldRuleAction = {
+  hidden: true,
+  type: models.SubFormFieldRuleAction.TypeEnum.FieldVisibility,
+  fieldId: "uniqueIdHere_2",
+};
 
 const formFieldRules1Actions = [
   formFieldRules1Actions1,
 ];
 
-const formFieldRules1 = new models.SubFormFieldRule();
-formFieldRules1.id = "rule_1";
-formFieldRules1.triggerOperator = "AND";
-formFieldRules1.triggers = formFieldRules1Triggers;
-formFieldRules1.actions = formFieldRules1Actions;
+const formFieldRules1: models.SubFormFieldRule = {
+  id: "rule_1",
+  triggerOperator: "AND",
+  triggers: formFieldRules1Triggers,
+  actions: formFieldRules1Actions,
+};
 
 const formFieldRules = [
   formFieldRules1,
 ];
 
-const formFieldsPerDocument1 = new models.SubFormFieldsPerDocumentText();
-formFieldsPerDocument1.documentIndex = 0;
-formFieldsPerDocument1.apiId = "uniqueIdHere_1";
-formFieldsPerDocument1.type = "text";
-formFieldsPerDocument1.required = true;
-formFieldsPerDocument1.signer = "0";
-formFieldsPerDocument1.width = 100;
-formFieldsPerDocument1.height = 16;
-formFieldsPerDocument1.x = 112;
-formFieldsPerDocument1.y = 328;
-formFieldsPerDocument1.name = "";
-formFieldsPerDocument1.page = 1;
-formFieldsPerDocument1.validationType = models.SubFormFieldsPerDocumentText.ValidationTypeEnum.NumbersOnly;
+const formFieldsPerDocument1: models.SubFormFieldsPerDocumentText = {
+  documentIndex: 0,
+  apiId: "uniqueIdHere_1",
+  type: "text",
+  required: true,
+  signer: "0",
+  width: 100,
+  height: 16,
+  x: 112,
+  y: 328,
+  name: "",
+  page: 1,
+  validationType: models.SubFormFieldsPerDocumentText.ValidationTypeEnum.NumbersOnly,
+};
 
-const formFieldsPerDocument2 = new models.SubFormFieldsPerDocumentSignature();
-formFieldsPerDocument2.documentIndex = 0;
-formFieldsPerDocument2.apiId = "uniqueIdHere_2";
-formFieldsPerDocument2.type = "signature";
-formFieldsPerDocument2.required = true;
-formFieldsPerDocument2.signer = "0";
-formFieldsPerDocument2.width = 120;
-formFieldsPerDocument2.height = 30;
-formFieldsPerDocument2.x = 530;
-formFieldsPerDocument2.y = 415;
-formFieldsPerDocument2.name = "";
-formFieldsPerDocument2.page = 1;
+const formFieldsPerDocument2: models.SubFormFieldsPerDocumentSignature = {
+  documentIndex: 0,
+  apiId: "uniqueIdHere_2",
+  type: "signature",
+  required: true,
+  signer: "0",
+  width: 120,
+  height: 30,
+  x: 530,
+  y: 415,
+  name: "",
+  page: 1,
+};
 
 const formFieldsPerDocument = [
   formFieldsPerDocument1,
   formFieldsPerDocument2,
 ];
 
-const unclaimedDraftCreateEmbeddedRequest = new models.UnclaimedDraftCreateEmbeddedRequest();
-unclaimedDraftCreateEmbeddedRequest.clientId = "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a";
-unclaimedDraftCreateEmbeddedRequest.requesterEmailAddress = "jack@dropboxsign.com";
-unclaimedDraftCreateEmbeddedRequest.testMode = false;
-unclaimedDraftCreateEmbeddedRequest.fileUrls = [
-  "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
-];
-unclaimedDraftCreateEmbeddedRequest.formFieldRules = formFieldRules;
-unclaimedDraftCreateEmbeddedRequest.formFieldsPerDocument = formFieldsPerDocument;
+const unclaimedDraftCreateEmbeddedRequest: models.UnclaimedDraftCreateEmbeddedRequest = {
+  clientId: "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a",
+  requesterEmailAddress: "jack@dropboxsign.com",
+  testMode: false,
+  fileUrls: [
+    "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
+  ],
+  formFieldRules: formFieldRules,
+  formFieldsPerDocument: formFieldsPerDocument,
+};
 
 apiCaller.unclaimedDraftCreateEmbedded(
   unclaimedDraftCreateEmbeddedRequest,
diff --git a/sandbox/node/src/UnclaimedDraftCreateEmbeddedFormFieldsPerDocumentExample.ts b/sandbox/node/src/UnclaimedDraftCreateEmbeddedFormFieldsPerDocumentExample.ts
index 66efc0596..dcdee5d3b 100644
--- a/sandbox/node/src/UnclaimedDraftCreateEmbeddedFormFieldsPerDocumentExample.ts
+++ b/sandbox/node/src/UnclaimedDraftCreateEmbeddedFormFieldsPerDocumentExample.ts
@@ -6,47 +6,50 @@ const apiCaller = new api.UnclaimedDraftApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const formFieldsPerDocument1 = new models.SubFormFieldsPerDocumentText();
-formFieldsPerDocument1.documentIndex = 0;
-formFieldsPerDocument1.apiId = "uniqueIdHere_1";
-formFieldsPerDocument1.type = "text";
-formFieldsPerDocument1.required = true;
-formFieldsPerDocument1.signer = "1";
-formFieldsPerDocument1.width = 100;
-formFieldsPerDocument1.height = 16;
-formFieldsPerDocument1.x = 112;
-formFieldsPerDocument1.y = 328;
-formFieldsPerDocument1.name = "";
-formFieldsPerDocument1.page = 1;
-formFieldsPerDocument1.placeholder = "";
-formFieldsPerDocument1.validationType = models.SubFormFieldsPerDocumentText.ValidationTypeEnum.NumbersOnly;
+const formFieldsPerDocument1: models.SubFormFieldsPerDocumentText = {
+  documentIndex: 0,
+  apiId: "uniqueIdHere_1",
+  type: "text",
+  required: true,
+  signer: "1",
+  width: 100,
+  height: 16,
+  x: 112,
+  y: 328,
+  name: "",
+  page: 1,
+  placeholder: "",
+  validationType: models.SubFormFieldsPerDocumentText.ValidationTypeEnum.NumbersOnly,
+};
 
-const formFieldsPerDocument2 = new models.SubFormFieldsPerDocumentSignature();
-formFieldsPerDocument2.documentIndex = 0;
-formFieldsPerDocument2.apiId = "uniqueIdHere_2";
-formFieldsPerDocument2.type = "signature";
-formFieldsPerDocument2.required = true;
-formFieldsPerDocument2.signer = "0";
-formFieldsPerDocument2.width = 120;
-formFieldsPerDocument2.height = 30;
-formFieldsPerDocument2.x = 530;
-formFieldsPerDocument2.y = 415;
-formFieldsPerDocument2.name = "";
-formFieldsPerDocument2.page = 1;
+const formFieldsPerDocument2: models.SubFormFieldsPerDocumentSignature = {
+  documentIndex: 0,
+  apiId: "uniqueIdHere_2",
+  type: "signature",
+  required: true,
+  signer: "0",
+  width: 120,
+  height: 30,
+  x: 530,
+  y: 415,
+  name: "",
+  page: 1,
+};
 
 const formFieldsPerDocument = [
   formFieldsPerDocument1,
   formFieldsPerDocument2,
 ];
 
-const unclaimedDraftCreateEmbeddedRequest = new models.UnclaimedDraftCreateEmbeddedRequest();
-unclaimedDraftCreateEmbeddedRequest.clientId = "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a";
-unclaimedDraftCreateEmbeddedRequest.requesterEmailAddress = "jack@dropboxsign.com";
-unclaimedDraftCreateEmbeddedRequest.testMode = false;
-unclaimedDraftCreateEmbeddedRequest.fileUrls = [
-  "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
-];
-unclaimedDraftCreateEmbeddedRequest.formFieldsPerDocument = formFieldsPerDocument;
+const unclaimedDraftCreateEmbeddedRequest: models.UnclaimedDraftCreateEmbeddedRequest = {
+  clientId: "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a",
+  requesterEmailAddress: "jack@dropboxsign.com",
+  testMode: false,
+  fileUrls: [
+    "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
+  ],
+  formFieldsPerDocument: formFieldsPerDocument,
+};
 
 apiCaller.unclaimedDraftCreateEmbedded(
   unclaimedDraftCreateEmbeddedRequest,
diff --git a/sandbox/node/src/UnclaimedDraftCreateEmbeddedWithTemplateExample.ts b/sandbox/node/src/UnclaimedDraftCreateEmbeddedWithTemplateExample.ts
index 8e78741d8..a326c3679 100644
--- a/sandbox/node/src/UnclaimedDraftCreateEmbeddedWithTemplateExample.ts
+++ b/sandbox/node/src/UnclaimedDraftCreateEmbeddedWithTemplateExample.ts
@@ -6,32 +6,35 @@ const apiCaller = new api.UnclaimedDraftApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const ccs1 = new models.SubCC();
-ccs1.role = "Accounting";
-ccs1.emailAddress = "accounting@dropboxsign.com";
+const ccs1: models.SubCC = {
+  role: "Accounting",
+  emailAddress: "accounting@dropboxsign.com",
+};
 
 const ccs = [
   ccs1,
 ];
 
-const signers1 = new models.SubUnclaimedDraftTemplateSigner();
-signers1.role = "Client";
-signers1.name = "George";
-signers1.emailAddress = "george@example.com";
+const signers1: models.SubUnclaimedDraftTemplateSigner = {
+  role: "Client",
+  name: "George",
+  emailAddress: "george@example.com",
+};
 
 const signers = [
   signers1,
 ];
 
-const unclaimedDraftCreateEmbeddedWithTemplateRequest = new models.UnclaimedDraftCreateEmbeddedWithTemplateRequest();
-unclaimedDraftCreateEmbeddedWithTemplateRequest.clientId = "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a";
-unclaimedDraftCreateEmbeddedWithTemplateRequest.requesterEmailAddress = "jack@dropboxsign.com";
-unclaimedDraftCreateEmbeddedWithTemplateRequest.templateIds = [
-  "61a832ff0d8423f91d503e76bfbcc750f7417c78",
-];
-unclaimedDraftCreateEmbeddedWithTemplateRequest.testMode = false;
-unclaimedDraftCreateEmbeddedWithTemplateRequest.ccs = ccs;
-unclaimedDraftCreateEmbeddedWithTemplateRequest.signers = signers;
+const unclaimedDraftCreateEmbeddedWithTemplateRequest: models.UnclaimedDraftCreateEmbeddedWithTemplateRequest = {
+  clientId: "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a",
+  requesterEmailAddress: "jack@dropboxsign.com",
+  templateIds: [
+    "61a832ff0d8423f91d503e76bfbcc750f7417c78",
+  ],
+  testMode: false,
+  ccs: ccs,
+  signers: signers,
+};
 
 apiCaller.unclaimedDraftCreateEmbeddedWithTemplate(
   unclaimedDraftCreateEmbeddedWithTemplateRequest,
diff --git a/sandbox/node/src/UnclaimedDraftCreateExample.ts b/sandbox/node/src/UnclaimedDraftCreateExample.ts
index dc23f50d2..aa94b5d77 100644
--- a/sandbox/node/src/UnclaimedDraftCreateExample.ts
+++ b/sandbox/node/src/UnclaimedDraftCreateExample.ts
@@ -6,22 +6,24 @@ const apiCaller = new api.UnclaimedDraftApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const signers1 = new models.SubUnclaimedDraftSigner();
-signers1.name = "Jack";
-signers1.emailAddress = "jack@example.com";
-signers1.order = 0;
+const signers1: models.SubUnclaimedDraftSigner = {
+  name: "Jack",
+  emailAddress: "jack@example.com",
+  order: 0,
+};
 
 const signers = [
   signers1,
 ];
 
-const unclaimedDraftCreateRequest = new models.UnclaimedDraftCreateRequest();
-unclaimedDraftCreateRequest.type = models.UnclaimedDraftCreateRequest.TypeEnum.RequestSignature;
-unclaimedDraftCreateRequest.testMode = true;
-unclaimedDraftCreateRequest.files = [
-  fs.createReadStream("./example_signature_request.pdf"),
-];
-unclaimedDraftCreateRequest.signers = signers;
+const unclaimedDraftCreateRequest: models.UnclaimedDraftCreateRequest = {
+  type: models.UnclaimedDraftCreateRequest.TypeEnum.RequestSignature,
+  testMode: true,
+  files: [
+    fs.createReadStream("./example_signature_request.pdf"),
+  ],
+  signers: signers,
+};
 
 apiCaller.unclaimedDraftCreate(
   unclaimedDraftCreateRequest,
diff --git a/sandbox/node/src/UnclaimedDraftCreateFormFieldGroupsExample.ts b/sandbox/node/src/UnclaimedDraftCreateFormFieldGroupsExample.ts
index f3e47da2c..f6e079f42 100644
--- a/sandbox/node/src/UnclaimedDraftCreateFormFieldGroupsExample.ts
+++ b/sandbox/node/src/UnclaimedDraftCreateFormFieldGroupsExample.ts
@@ -6,58 +6,62 @@ const apiCaller = new api.UnclaimedDraftApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const formFieldGroups1 = new models.SubFormFieldGroup();
-formFieldGroups1.groupId = "RadioItemGroup1";
-formFieldGroups1.groupLabel = "Radio Item Group 1";
-formFieldGroups1.requirement = "require_0-1";
+const formFieldGroups1: models.SubFormFieldGroup = {
+  groupId: "RadioItemGroup1",
+  groupLabel: "Radio Item Group 1",
+  requirement: "require_0-1",
+};
 
 const formFieldGroups = [
   formFieldGroups1,
 ];
 
-const formFieldsPerDocument1 = new models.SubFormFieldsPerDocumentRadio();
-formFieldsPerDocument1.documentIndex = 0;
-formFieldsPerDocument1.apiId = "uniqueIdHere_1";
-formFieldsPerDocument1.type = "radio";
-formFieldsPerDocument1.required = false;
-formFieldsPerDocument1.signer = "0";
-formFieldsPerDocument1.width = 18;
-formFieldsPerDocument1.height = 18;
-formFieldsPerDocument1.x = 112;
-formFieldsPerDocument1.y = 328;
-formFieldsPerDocument1.group = "RadioItemGroup1";
-formFieldsPerDocument1.isChecked = true;
-formFieldsPerDocument1.name = "";
-formFieldsPerDocument1.page = 1;
+const formFieldsPerDocument1: models.SubFormFieldsPerDocumentRadio = {
+  documentIndex: 0,
+  apiId: "uniqueIdHere_1",
+  type: "radio",
+  required: false,
+  signer: "0",
+  width: 18,
+  height: 18,
+  x: 112,
+  y: 328,
+  group: "RadioItemGroup1",
+  isChecked: true,
+  name: "",
+  page: 1,
+};
 
-const formFieldsPerDocument2 = new models.SubFormFieldsPerDocumentRadio();
-formFieldsPerDocument2.documentIndex = 0;
-formFieldsPerDocument2.apiId = "uniqueIdHere_2";
-formFieldsPerDocument2.type = "radio";
-formFieldsPerDocument2.required = false;
-formFieldsPerDocument2.signer = "0";
-formFieldsPerDocument2.width = 18;
-formFieldsPerDocument2.height = 18;
-formFieldsPerDocument2.x = 112;
-formFieldsPerDocument2.y = 370;
-formFieldsPerDocument2.group = "RadioItemGroup1";
-formFieldsPerDocument2.isChecked = false;
-formFieldsPerDocument2.name = "";
-formFieldsPerDocument2.page = 1;
+const formFieldsPerDocument2: models.SubFormFieldsPerDocumentRadio = {
+  documentIndex: 0,
+  apiId: "uniqueIdHere_2",
+  type: "radio",
+  required: false,
+  signer: "0",
+  width: 18,
+  height: 18,
+  x: 112,
+  y: 370,
+  group: "RadioItemGroup1",
+  isChecked: false,
+  name: "",
+  page: 1,
+};
 
 const formFieldsPerDocument = [
   formFieldsPerDocument1,
   formFieldsPerDocument2,
 ];
 
-const unclaimedDraftCreateRequest = new models.UnclaimedDraftCreateRequest();
-unclaimedDraftCreateRequest.type = models.UnclaimedDraftCreateRequest.TypeEnum.RequestSignature;
-unclaimedDraftCreateRequest.testMode = false;
-unclaimedDraftCreateRequest.fileUrls = [
-  "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
-];
-unclaimedDraftCreateRequest.formFieldGroups = formFieldGroups;
-unclaimedDraftCreateRequest.formFieldsPerDocument = formFieldsPerDocument;
+const unclaimedDraftCreateRequest: models.UnclaimedDraftCreateRequest = {
+  type: models.UnclaimedDraftCreateRequest.TypeEnum.RequestSignature,
+  testMode: false,
+  fileUrls: [
+    "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
+  ],
+  formFieldGroups: formFieldGroups,
+  formFieldsPerDocument: formFieldsPerDocument,
+};
 
 apiCaller.unclaimedDraftCreate(
   unclaimedDraftCreateRequest,
diff --git a/sandbox/node/src/UnclaimedDraftCreateFormFieldRulesExample.ts b/sandbox/node/src/UnclaimedDraftCreateFormFieldRulesExample.ts
index c4abba3b1..8b41bbd5a 100644
--- a/sandbox/node/src/UnclaimedDraftCreateFormFieldRulesExample.ts
+++ b/sandbox/node/src/UnclaimedDraftCreateFormFieldRulesExample.ts
@@ -6,74 +6,80 @@ const apiCaller = new api.UnclaimedDraftApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const formFieldRules1Triggers1 = new models.SubFormFieldRuleTrigger();
-formFieldRules1Triggers1.id = "uniqueIdHere_1";
-formFieldRules1Triggers1.operator = models.SubFormFieldRuleTrigger.OperatorEnum.Is;
-formFieldRules1Triggers1.value = "foo";
+const formFieldRules1Triggers1: models.SubFormFieldRuleTrigger = {
+  id: "uniqueIdHere_1",
+  operator: models.SubFormFieldRuleTrigger.OperatorEnum.Is,
+  value: "foo",
+};
 
 const formFieldRules1Triggers = [
   formFieldRules1Triggers1,
 ];
 
-const formFieldRules1Actions1 = new models.SubFormFieldRuleAction();
-formFieldRules1Actions1.hidden = true;
-formFieldRules1Actions1.type = models.SubFormFieldRuleAction.TypeEnum.FieldVisibility;
-formFieldRules1Actions1.fieldId = "uniqueIdHere_2";
+const formFieldRules1Actions1: models.SubFormFieldRuleAction = {
+  hidden: true,
+  type: models.SubFormFieldRuleAction.TypeEnum.FieldVisibility,
+  fieldId: "uniqueIdHere_2",
+};
 
 const formFieldRules1Actions = [
   formFieldRules1Actions1,
 ];
 
-const formFieldRules1 = new models.SubFormFieldRule();
-formFieldRules1.id = "rule_1";
-formFieldRules1.triggerOperator = "AND";
-formFieldRules1.triggers = formFieldRules1Triggers;
-formFieldRules1.actions = formFieldRules1Actions;
+const formFieldRules1: models.SubFormFieldRule = {
+  id: "rule_1",
+  triggerOperator: "AND",
+  triggers: formFieldRules1Triggers,
+  actions: formFieldRules1Actions,
+};
 
 const formFieldRules = [
   formFieldRules1,
 ];
 
-const formFieldsPerDocument1 = new models.SubFormFieldsPerDocumentText();
-formFieldsPerDocument1.documentIndex = 0;
-formFieldsPerDocument1.apiId = "uniqueIdHere_1";
-formFieldsPerDocument1.type = "text";
-formFieldsPerDocument1.required = true;
-formFieldsPerDocument1.signer = "0";
-formFieldsPerDocument1.width = 100;
-formFieldsPerDocument1.height = 16;
-formFieldsPerDocument1.x = 112;
-formFieldsPerDocument1.y = 328;
-formFieldsPerDocument1.name = "";
-formFieldsPerDocument1.page = 1;
-formFieldsPerDocument1.validationType = models.SubFormFieldsPerDocumentText.ValidationTypeEnum.NumbersOnly;
+const formFieldsPerDocument1: models.SubFormFieldsPerDocumentText = {
+  documentIndex: 0,
+  apiId: "uniqueIdHere_1",
+  type: "text",
+  required: true,
+  signer: "0",
+  width: 100,
+  height: 16,
+  x: 112,
+  y: 328,
+  name: "",
+  page: 1,
+  validationType: models.SubFormFieldsPerDocumentText.ValidationTypeEnum.NumbersOnly,
+};
 
-const formFieldsPerDocument2 = new models.SubFormFieldsPerDocumentSignature();
-formFieldsPerDocument2.documentIndex = 0;
-formFieldsPerDocument2.apiId = "uniqueIdHere_2";
-formFieldsPerDocument2.type = "signature";
-formFieldsPerDocument2.required = true;
-formFieldsPerDocument2.signer = "0";
-formFieldsPerDocument2.width = 120;
-formFieldsPerDocument2.height = 30;
-formFieldsPerDocument2.x = 530;
-formFieldsPerDocument2.y = 415;
-formFieldsPerDocument2.name = "";
-formFieldsPerDocument2.page = 1;
+const formFieldsPerDocument2: models.SubFormFieldsPerDocumentSignature = {
+  documentIndex: 0,
+  apiId: "uniqueIdHere_2",
+  type: "signature",
+  required: true,
+  signer: "0",
+  width: 120,
+  height: 30,
+  x: 530,
+  y: 415,
+  name: "",
+  page: 1,
+};
 
 const formFieldsPerDocument = [
   formFieldsPerDocument1,
   formFieldsPerDocument2,
 ];
 
-const unclaimedDraftCreateRequest = new models.UnclaimedDraftCreateRequest();
-unclaimedDraftCreateRequest.type = models.UnclaimedDraftCreateRequest.TypeEnum.RequestSignature;
-unclaimedDraftCreateRequest.testMode = false;
-unclaimedDraftCreateRequest.fileUrls = [
-  "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
-];
-unclaimedDraftCreateRequest.formFieldRules = formFieldRules;
-unclaimedDraftCreateRequest.formFieldsPerDocument = formFieldsPerDocument;
+const unclaimedDraftCreateRequest: models.UnclaimedDraftCreateRequest = {
+  type: models.UnclaimedDraftCreateRequest.TypeEnum.RequestSignature,
+  testMode: false,
+  fileUrls: [
+    "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
+  ],
+  formFieldRules: formFieldRules,
+  formFieldsPerDocument: formFieldsPerDocument,
+};
 
 apiCaller.unclaimedDraftCreate(
   unclaimedDraftCreateRequest,
diff --git a/sandbox/node/src/UnclaimedDraftCreateFormFieldsPerDocumentExample.ts b/sandbox/node/src/UnclaimedDraftCreateFormFieldsPerDocumentExample.ts
index b5e61ab5a..d010996de 100644
--- a/sandbox/node/src/UnclaimedDraftCreateFormFieldsPerDocumentExample.ts
+++ b/sandbox/node/src/UnclaimedDraftCreateFormFieldsPerDocumentExample.ts
@@ -6,46 +6,49 @@ const apiCaller = new api.UnclaimedDraftApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const formFieldsPerDocument1 = new models.SubFormFieldsPerDocumentText();
-formFieldsPerDocument1.documentIndex = 0;
-formFieldsPerDocument1.apiId = "uniqueIdHere_1";
-formFieldsPerDocument1.type = "text";
-formFieldsPerDocument1.required = true;
-formFieldsPerDocument1.signer = "1";
-formFieldsPerDocument1.width = 100;
-formFieldsPerDocument1.height = 16;
-formFieldsPerDocument1.x = 112;
-formFieldsPerDocument1.y = 328;
-formFieldsPerDocument1.name = "";
-formFieldsPerDocument1.page = 1;
-formFieldsPerDocument1.placeholder = "";
-formFieldsPerDocument1.validationType = models.SubFormFieldsPerDocumentText.ValidationTypeEnum.NumbersOnly;
+const formFieldsPerDocument1: models.SubFormFieldsPerDocumentText = {
+  documentIndex: 0,
+  apiId: "uniqueIdHere_1",
+  type: "text",
+  required: true,
+  signer: "1",
+  width: 100,
+  height: 16,
+  x: 112,
+  y: 328,
+  name: "",
+  page: 1,
+  placeholder: "",
+  validationType: models.SubFormFieldsPerDocumentText.ValidationTypeEnum.NumbersOnly,
+};
 
-const formFieldsPerDocument2 = new models.SubFormFieldsPerDocumentSignature();
-formFieldsPerDocument2.documentIndex = 0;
-formFieldsPerDocument2.apiId = "uniqueIdHere_2";
-formFieldsPerDocument2.type = "signature";
-formFieldsPerDocument2.required = true;
-formFieldsPerDocument2.signer = "0";
-formFieldsPerDocument2.width = 120;
-formFieldsPerDocument2.height = 30;
-formFieldsPerDocument2.x = 530;
-formFieldsPerDocument2.y = 415;
-formFieldsPerDocument2.name = "";
-formFieldsPerDocument2.page = 1;
+const formFieldsPerDocument2: models.SubFormFieldsPerDocumentSignature = {
+  documentIndex: 0,
+  apiId: "uniqueIdHere_2",
+  type: "signature",
+  required: true,
+  signer: "0",
+  width: 120,
+  height: 30,
+  x: 530,
+  y: 415,
+  name: "",
+  page: 1,
+};
 
 const formFieldsPerDocument = [
   formFieldsPerDocument1,
   formFieldsPerDocument2,
 ];
 
-const unclaimedDraftCreateRequest = new models.UnclaimedDraftCreateRequest();
-unclaimedDraftCreateRequest.type = models.UnclaimedDraftCreateRequest.TypeEnum.RequestSignature;
-unclaimedDraftCreateRequest.testMode = false;
-unclaimedDraftCreateRequest.fileUrls = [
-  "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
-];
-unclaimedDraftCreateRequest.formFieldsPerDocument = formFieldsPerDocument;
+const unclaimedDraftCreateRequest: models.UnclaimedDraftCreateRequest = {
+  type: models.UnclaimedDraftCreateRequest.TypeEnum.RequestSignature,
+  testMode: false,
+  fileUrls: [
+    "https://www.dropbox.com/s/ad9qnhbrjjn64tu/mutual-NDA-example.pdf?dl=1",
+  ],
+  formFieldsPerDocument: formFieldsPerDocument,
+};
 
 apiCaller.unclaimedDraftCreate(
   unclaimedDraftCreateRequest,
diff --git a/sandbox/node/src/UnclaimedDraftEditAndResendExample.ts b/sandbox/node/src/UnclaimedDraftEditAndResendExample.ts
index 16a998390..04a04f15f 100644
--- a/sandbox/node/src/UnclaimedDraftEditAndResendExample.ts
+++ b/sandbox/node/src/UnclaimedDraftEditAndResendExample.ts
@@ -6,9 +6,10 @@ const apiCaller = new api.UnclaimedDraftApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const unclaimedDraftEditAndResendRequest = new models.UnclaimedDraftEditAndResendRequest();
-unclaimedDraftEditAndResendRequest.clientId = "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a";
-unclaimedDraftEditAndResendRequest.testMode = false;
+const unclaimedDraftEditAndResendRequest: models.UnclaimedDraftEditAndResendRequest = {
+  clientId: "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a",
+  testMode: false,
+};
 
 apiCaller.unclaimedDraftEditAndResend(
   "fa5c8a0b0f492d768749333ad6fcc214c111e967", // signatureRequestId
diff --git a/sandbox/php/src/FaxLineAreaCodeGetExample.php b/sandbox/php/src/FaxLineAreaCodeGetExample.php
index dfd46d313..f8d4e717c 100644
--- a/sandbox/php/src/FaxLineAreaCodeGetExample.php
+++ b/sandbox/php/src/FaxLineAreaCodeGetExample.php
@@ -13,9 +13,6 @@
 try {
     $response = (new Dropbox\Sign\Api\FaxLineApi(config: $config))->faxLineAreaCodeGet(
         country: "US",
-        state: null,
-        province: null,
-        city: null,
     );
 
     print_r($response);
diff --git a/sandbox/php/src/FaxLineListExample.php b/sandbox/php/src/FaxLineListExample.php
index 995c0d949..c759934e9 100644
--- a/sandbox/php/src/FaxLineListExample.php
+++ b/sandbox/php/src/FaxLineListExample.php
@@ -15,7 +15,6 @@
         account_id: "ab55cd14a97219e36b5ff5fe23f2f9329b0c1e97",
         page: 1,
         page_size: 20,
-        show_team_lines: null,
     );
 
     print_r($response);
diff --git a/sandbox/php/src/SignatureRequestEditWithTemplateExample.php b/sandbox/php/src/SignatureRequestEditWithTemplateExample.php
index aa8391c3e..a6f2c9f10 100644
--- a/sandbox/php/src/SignatureRequestEditWithTemplateExample.php
+++ b/sandbox/php/src/SignatureRequestEditWithTemplateExample.php
@@ -39,7 +39,7 @@
     ->setName("Cost")
     ->setEditor("Client")
     ->setRequired(true)
-    ->setValue('$20,000');
+    ->setValue("\$20,000");
 
 $custom_fields = [
     $custom_fields_1,
diff --git a/sandbox/php/src/SignatureRequestListExample.php b/sandbox/php/src/SignatureRequestListExample.php
index c11043fcf..9cf737c26 100644
--- a/sandbox/php/src/SignatureRequestListExample.php
+++ b/sandbox/php/src/SignatureRequestListExample.php
@@ -13,10 +13,8 @@
 
 try {
     $response = (new Dropbox\Sign\Api\SignatureRequestApi(config: $config))->signatureRequestList(
-        account_id: null,
         page: 1,
         page_size: 20,
-        query: null,
     );
 
     print_r($response);
diff --git a/sandbox/php/src/SignatureRequestSendWithTemplateExample.php b/sandbox/php/src/SignatureRequestSendWithTemplateExample.php
index 7c9963cf3..d68205392 100644
--- a/sandbox/php/src/SignatureRequestSendWithTemplateExample.php
+++ b/sandbox/php/src/SignatureRequestSendWithTemplateExample.php
@@ -39,7 +39,7 @@
     ->setName("Cost")
     ->setEditor("Client")
     ->setRequired(true)
-    ->setValue('$20,000');
+    ->setValue("\$20,000");
 
 $custom_fields = [
     $custom_fields_1,
diff --git a/sandbox/php/src/TemplateFilesExample.php b/sandbox/php/src/TemplateFilesExample.php
index c9d7d5307..2e2f46f74 100644
--- a/sandbox/php/src/TemplateFilesExample.php
+++ b/sandbox/php/src/TemplateFilesExample.php
@@ -14,7 +14,6 @@
 try {
     $response = (new Dropbox\Sign\Api\TemplateApi(config: $config))->templateFiles(
         template_id: "f57db65d3f933b5316d398057a36176831451a35",
-        file_type: null,
     );
 
     copy($response->getRealPath(), __DIR__ . '/file_response');
diff --git a/sandbox/php/src/TemplateListExample.php b/sandbox/php/src/TemplateListExample.php
index 536c2a630..eafde32da 100644
--- a/sandbox/php/src/TemplateListExample.php
+++ b/sandbox/php/src/TemplateListExample.php
@@ -13,10 +13,8 @@
 
 try {
     $response = (new Dropbox\Sign\Api\TemplateApi(config: $config))->templateList(
-        account_id: null,
         page: 1,
         page_size: 20,
-        query: null,
     );
 
     print_r($response);
diff --git a/sandbox/python/src/FaxLineAreaCodeGetExample.py b/sandbox/python/src/FaxLineAreaCodeGetExample.py
index a2752d8d6..52310c75a 100644
--- a/sandbox/python/src/FaxLineAreaCodeGetExample.py
+++ b/sandbox/python/src/FaxLineAreaCodeGetExample.py
@@ -12,9 +12,6 @@
     try:
         response = api.FaxLineApi(api_client).fax_line_area_code_get(
             country="US",
-            state=None,
-            province=None,
-            city=None,
         )
 
         pprint(response)
diff --git a/sandbox/python/src/FaxLineListExample.py b/sandbox/python/src/FaxLineListExample.py
index 4af3f4a56..5e3822e75 100644
--- a/sandbox/python/src/FaxLineListExample.py
+++ b/sandbox/python/src/FaxLineListExample.py
@@ -14,7 +14,6 @@
             account_id="ab55cd14a97219e36b5ff5fe23f2f9329b0c1e97",
             page=1,
             page_size=20,
-            show_team_lines=None,
         )
 
         pprint(response)
diff --git a/sandbox/python/src/SignatureRequestListExample.py b/sandbox/python/src/SignatureRequestListExample.py
index 6d3db2fe3..3255d2cc6 100644
--- a/sandbox/python/src/SignatureRequestListExample.py
+++ b/sandbox/python/src/SignatureRequestListExample.py
@@ -12,10 +12,8 @@
 with ApiClient(configuration) as api_client:
     try:
         response = api.SignatureRequestApi(api_client).signature_request_list(
-            account_id=None,
             page=1,
             page_size=20,
-            query=None,
         )
 
         pprint(response)
diff --git a/sandbox/python/src/TemplateFilesExample.py b/sandbox/python/src/TemplateFilesExample.py
index 712642766..d1f056a90 100644
--- a/sandbox/python/src/TemplateFilesExample.py
+++ b/sandbox/python/src/TemplateFilesExample.py
@@ -13,7 +13,6 @@
     try:
         response = api.TemplateApi(api_client).template_files(
             template_id="f57db65d3f933b5316d398057a36176831451a35",
-            file_type=None,
         )
 
         open("./file_response", "wb").write(response.read())
diff --git a/sandbox/python/src/TemplateListExample.py b/sandbox/python/src/TemplateListExample.py
index 6b96ea19c..429531ec6 100644
--- a/sandbox/python/src/TemplateListExample.py
+++ b/sandbox/python/src/TemplateListExample.py
@@ -12,10 +12,8 @@
 with ApiClient(configuration) as api_client:
     try:
         response = api.TemplateApi(api_client).template_list(
-            account_id=None,
             page=1,
             page_size=20,
-            query=None,
         )
 
         pprint(response)
diff --git a/sdks/dotnet/docs/FaxLineApi.md b/sdks/dotnet/docs/FaxLineApi.md
index 0b7ea70a4..42ebfe88b 100644
--- a/sdks/dotnet/docs/FaxLineApi.md
+++ b/sdks/dotnet/docs/FaxLineApi.md
@@ -143,10 +143,7 @@ public class FaxLineAreaCodeGetExample
         try
         {
             var response = new FaxLineApi(config).FaxLineAreaCodeGet(
-                country: "US",
-                state: null,
-                province: null,
-                city: null
+                country: "US"
             );
 
             Console.WriteLine(response);
@@ -535,8 +532,7 @@ public class FaxLineListExample
             var response = new FaxLineApi(config).FaxLineList(
                 accountId: "ab55cd14a97219e36b5ff5fe23f2f9329b0c1e97",
                 page: 1,
-                pageSize: 20,
-                showTeamLines: null
+                pageSize: 20
             );
 
             Console.WriteLine(response);
diff --git a/sdks/dotnet/docs/SignatureRequestApi.md b/sdks/dotnet/docs/SignatureRequestApi.md
index 9e7f7669d..a3061633d 100644
--- a/sdks/dotnet/docs/SignatureRequestApi.md
+++ b/sdks/dotnet/docs/SignatureRequestApi.md
@@ -1743,10 +1743,8 @@ public class SignatureRequestListExample
         try
         {
             var response = new SignatureRequestApi(config).SignatureRequestList(
-                accountId: null,
                 page: 1,
-                pageSize: 20,
-                query: null
+                pageSize: 20
             );
 
             Console.WriteLine(response);
diff --git a/sdks/dotnet/docs/TemplateApi.md b/sdks/dotnet/docs/TemplateApi.md
index 69707eaac..f9c66e11c 100644
--- a/sdks/dotnet/docs/TemplateApi.md
+++ b/sdks/dotnet/docs/TemplateApi.md
@@ -584,8 +584,7 @@ public class TemplateFilesExample
         try
         {
             var response = new TemplateApi(config).TemplateFiles(
-                templateId: "f57db65d3f933b5316d398057a36176831451a35",
-                fileType: null
+                templateId: "f57db65d3f933b5316d398057a36176831451a35"
             );
             var fileStream = File.Create("./file_response");
             response.Seek(0, SeekOrigin.Begin);
@@ -974,10 +973,8 @@ public class TemplateListExample
         try
         {
             var response = new TemplateApi(config).TemplateList(
-                accountId: null,
                 page: 1,
-                pageSize: 20,
-                query: null
+                pageSize: 20
             );
 
             Console.WriteLine(response);
diff --git a/sdks/java-v1/README.md b/sdks/java-v1/README.md
index a59c05565..addfdd702 100644
--- a/sdks/java-v1/README.md
+++ b/sdks/java-v1/README.md
@@ -104,6 +104,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -115,8 +116,8 @@ public class AccountCreateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var accountCreateRequest = new AccountCreateRequest();
         accountCreateRequest.emailAddress("newuser@dropboxsign.com");
diff --git a/sdks/java-v1/docs/AccountApi.md b/sdks/java-v1/docs/AccountApi.md
index cd7c9244f..e638f559d 100644
--- a/sdks/java-v1/docs/AccountApi.md
+++ b/sdks/java-v1/docs/AccountApi.md
@@ -32,6 +32,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -43,8 +44,8 @@ public class AccountCreateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var accountCreateRequest = new AccountCreateRequest();
         accountCreateRequest.emailAddress("newuser@dropboxsign.com");
@@ -116,6 +117,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -127,12 +129,15 @@ public class AccountGetExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
-            var response = new AccountApi(config).accountGet();
+            var response = new AccountApi(config).accountGet(
+                null, // accountId
+                null // emailAddress
+            );
 
             System.out.println(response);
         } catch (ApiException e) {
@@ -196,6 +201,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -207,8 +213,8 @@ public class AccountUpdateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var accountUpdateRequest = new AccountUpdateRequest();
         accountUpdateRequest.callbackUrl("https://www.example.com/callback");
@@ -281,6 +287,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -292,8 +299,8 @@ public class AccountVerifyExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var accountVerifyRequest = new AccountVerifyRequest();
         accountVerifyRequest.emailAddress("some_user@dropboxsign.com");
diff --git a/sdks/java-v1/docs/ApiAppApi.md b/sdks/java-v1/docs/ApiAppApi.md
index 672878e86..c9e5fd615 100644
--- a/sdks/java-v1/docs/ApiAppApi.md
+++ b/sdks/java-v1/docs/ApiAppApi.md
@@ -33,6 +33,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -44,8 +45,8 @@ public class ApiAppCreateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var oauth = new SubOAuth();
         oauth.callbackUrl("https://example.com/oauth");
@@ -134,6 +135,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -145,8 +147,8 @@ public class ApiAppDeleteExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
@@ -213,6 +215,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -224,8 +227,8 @@ public class ApiAppGetExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
@@ -294,6 +297,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -305,8 +309,8 @@ public class ApiAppListExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
@@ -377,6 +381,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -388,8 +393,8 @@ public class ApiAppUpdateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var oauth = new SubOAuth();
         oauth.callbackUrl("https://example.com/oauth");
diff --git a/sdks/java-v1/docs/BulkSendJobApi.md b/sdks/java-v1/docs/BulkSendJobApi.md
index 742d55134..a4b8a3460 100644
--- a/sdks/java-v1/docs/BulkSendJobApi.md
+++ b/sdks/java-v1/docs/BulkSendJobApi.md
@@ -30,6 +30,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -41,8 +42,8 @@ public class BulkSendJobGetExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
@@ -115,6 +116,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -126,8 +128,8 @@ public class BulkSendJobListExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
diff --git a/sdks/java-v1/docs/EmbeddedApi.md b/sdks/java-v1/docs/EmbeddedApi.md
index 04700004d..416c319ee 100644
--- a/sdks/java-v1/docs/EmbeddedApi.md
+++ b/sdks/java-v1/docs/EmbeddedApi.md
@@ -30,6 +30,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -41,8 +42,8 @@ public class EmbeddedEditUrlExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var mergeFields = new ArrayList<SubMergeField>(List.of ());
 
@@ -121,6 +122,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -132,8 +134,8 @@ public class EmbeddedSignUrlExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
diff --git a/sdks/java-v1/docs/FaxApi.md b/sdks/java-v1/docs/FaxApi.md
index b092573e7..7ee47ff0e 100644
--- a/sdks/java-v1/docs/FaxApi.md
+++ b/sdks/java-v1/docs/FaxApi.md
@@ -33,6 +33,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -44,7 +45,7 @@ public class FaxDeleteExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
 
         try
         {
@@ -111,6 +112,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -122,7 +124,7 @@ public class FaxFilesExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
 
         try
         {
@@ -190,6 +192,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -201,7 +204,7 @@ public class FaxGetExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
 
         try
         {
@@ -270,6 +273,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -281,7 +285,7 @@ public class FaxListExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
 
         try
         {
@@ -352,6 +356,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -363,7 +368,7 @@ public class FaxSendExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
 
         var faxSendRequest = new FaxSendRequest();
         faxSendRequest.recipient("16690000001");
diff --git a/sdks/java-v1/docs/FaxLineApi.md b/sdks/java-v1/docs/FaxLineApi.md
index d1aafb013..79ccf8b93 100644
--- a/sdks/java-v1/docs/FaxLineApi.md
+++ b/sdks/java-v1/docs/FaxLineApi.md
@@ -35,6 +35,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -46,7 +47,7 @@ public class FaxLineAddUserExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
 
         var faxLineAddUserRequest = new FaxLineAddUserRequest();
         faxLineAddUserRequest.number("[FAX_NUMBER]");
@@ -119,6 +120,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -130,7 +132,7 @@ public class FaxLineAreaCodeGetExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
 
         try
         {
@@ -205,6 +207,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -216,7 +219,7 @@ public class FaxLineCreateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
 
         var faxLineCreateRequest = new FaxLineCreateRequest();
         faxLineCreateRequest.areaCode(209);
@@ -289,6 +292,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -300,7 +304,7 @@ public class FaxLineDeleteExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
 
         var faxLineDeleteRequest = new FaxLineDeleteRequest();
         faxLineDeleteRequest.number("[FAX_NUMBER]");
@@ -370,6 +374,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -381,7 +386,7 @@ public class FaxLineGetExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
 
         try
         {
@@ -450,6 +455,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -461,7 +467,7 @@ public class FaxLineListExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
 
         try
         {
@@ -536,6 +542,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -547,7 +554,7 @@ public class FaxLineRemoveUserExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
 
         var faxLineRemoveUserRequest = new FaxLineRemoveUserRequest();
         faxLineRemoveUserRequest.number("[FAX_NUMBER]");
diff --git a/sdks/java-v1/docs/OAuthApi.md b/sdks/java-v1/docs/OAuthApi.md
index ed9b039c2..aab2b9456 100644
--- a/sdks/java-v1/docs/OAuthApi.md
+++ b/sdks/java-v1/docs/OAuthApi.md
@@ -30,6 +30,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -116,6 +117,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
diff --git a/sdks/java-v1/docs/ReportApi.md b/sdks/java-v1/docs/ReportApi.md
index 1ef6af025..cadac49ae 100644
--- a/sdks/java-v1/docs/ReportApi.md
+++ b/sdks/java-v1/docs/ReportApi.md
@@ -31,6 +31,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -42,7 +43,7 @@ public class ReportCreateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
 
         var reportCreateRequest = new ReportCreateRequest();
         reportCreateRequest.startDate("09/01/2020");
diff --git a/sdks/java-v1/docs/SignatureRequestApi.md b/sdks/java-v1/docs/SignatureRequestApi.md
index 9c22f6611..96034a20b 100644
--- a/sdks/java-v1/docs/SignatureRequestApi.md
+++ b/sdks/java-v1/docs/SignatureRequestApi.md
@@ -50,6 +50,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -61,7 +62,7 @@ public class SignatureRequestBulkCreateEmbeddedWithTemplateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
 
         var signerList2CustomFields1 = new SubBulkSignerListCustomField();
         signerList2CustomFields1.name("company");
@@ -200,6 +201,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -211,8 +213,8 @@ public class SignatureRequestBulkSendWithTemplateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var signerList2CustomFields1 = new SubBulkSignerListCustomField();
         signerList2CustomFields1.name("company");
@@ -356,6 +358,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -367,8 +370,8 @@ public class SignatureRequestCancelExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
@@ -435,6 +438,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -446,8 +450,8 @@ public class SignatureRequestCreateEmbeddedExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var signingOptions = new SubSigningOptions();
         signingOptions.defaultType(SubSigningOptions.DefaultTypeEnum.DRAW);
@@ -554,6 +558,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -565,8 +570,8 @@ public class SignatureRequestCreateEmbeddedWithTemplateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var signingOptions = new SubSigningOptions();
         signingOptions.defaultType(SubSigningOptions.DefaultTypeEnum.DRAW);
@@ -664,6 +669,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -675,8 +681,8 @@ public class SignatureRequestEditExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var fieldOptions = new SubFieldOptions();
         fieldOptions.dateFormat(SubFieldOptions.DateFormatEnum.DD_MM_YYYY);
@@ -794,6 +800,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -805,8 +812,8 @@ public class SignatureRequestEditEmbeddedExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var signingOptions = new SubSigningOptions();
         signingOptions.defaultType(SubSigningOptions.DefaultTypeEnum.DRAW);
@@ -915,6 +922,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -926,8 +934,8 @@ public class SignatureRequestEditEmbeddedWithTemplateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var signingOptions = new SubSigningOptions();
         signingOptions.defaultType(SubSigningOptions.DefaultTypeEnum.DRAW);
@@ -1027,6 +1035,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -1038,8 +1047,8 @@ public class SignatureRequestEditWithTemplateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var signingOptions = new SubSigningOptions();
         signingOptions.defaultType(SubSigningOptions.DefaultTypeEnum.DRAW);
@@ -1158,6 +1167,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -1169,8 +1179,8 @@ public class SignatureRequestFilesExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
@@ -1242,6 +1252,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -1253,8 +1264,8 @@ public class SignatureRequestFilesAsDataUriExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
@@ -1325,6 +1336,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -1336,8 +1348,8 @@ public class SignatureRequestFilesAsFileUrlExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
@@ -1408,6 +1420,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -1419,8 +1432,8 @@ public class SignatureRequestGetExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
@@ -1491,6 +1504,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -1502,8 +1516,8 @@ public class SignatureRequestListExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
@@ -1578,6 +1592,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -1589,8 +1604,8 @@ public class SignatureRequestReleaseHoldExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
@@ -1661,6 +1676,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -1672,8 +1688,8 @@ public class SignatureRequestRemindExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var signatureRequestRemindRequest = new SignatureRequestRemindRequest();
         signatureRequestRemindRequest.emailAddress("john@example.com");
@@ -1751,6 +1767,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -1762,7 +1779,7 @@ public class SignatureRequestRemoveExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
 
         try
         {
@@ -1829,6 +1846,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -1840,8 +1858,8 @@ public class SignatureRequestSendExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var fieldOptions = new SubFieldOptions();
         fieldOptions.dateFormat(SubFieldOptions.DateFormatEnum.DD_MM_YYYY);
@@ -1957,6 +1975,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -1968,8 +1987,8 @@ public class SignatureRequestSendWithTemplateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var signingOptions = new SubSigningOptions();
         signingOptions.defaultType(SubSigningOptions.DefaultTypeEnum.DRAW);
@@ -2088,6 +2107,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -2099,8 +2119,8 @@ public class SignatureRequestUpdateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var signatureRequestUpdateRequest = new SignatureRequestUpdateRequest();
         signatureRequestUpdateRequest.signatureId("2f9781e1a8e2045224d808c153c2e1d3df6f8f2f");
diff --git a/sdks/java-v1/docs/TeamApi.md b/sdks/java-v1/docs/TeamApi.md
index 3e57e0451..abb3f1ee0 100644
--- a/sdks/java-v1/docs/TeamApi.md
+++ b/sdks/java-v1/docs/TeamApi.md
@@ -38,6 +38,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -49,8 +50,8 @@ public class TeamAddMemberExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var teamAddMemberRequest = new TeamAddMemberRequest();
         teamAddMemberRequest.emailAddress("george@example.com");
@@ -124,6 +125,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -135,8 +137,8 @@ public class TeamCreateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var teamCreateRequest = new TeamCreateRequest();
         teamCreateRequest.name("New Team Name");
@@ -208,6 +210,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -219,8 +222,8 @@ public class TeamDeleteExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
@@ -282,6 +285,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -293,8 +297,8 @@ public class TeamGetExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
@@ -358,6 +362,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -369,8 +374,8 @@ public class TeamInfoExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
@@ -439,6 +444,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -450,12 +456,14 @@ public class TeamInvitesExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
-            var response = new TeamApi(config).teamInvites();
+            var response = new TeamApi(config).teamInvites(
+                null // emailAddress
+            );
 
             System.out.println(response);
         } catch (ApiException e) {
@@ -518,6 +526,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -529,8 +538,8 @@ public class TeamMembersExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
@@ -603,6 +612,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -614,8 +624,8 @@ public class TeamRemoveMemberExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var teamRemoveMemberRequest = new TeamRemoveMemberRequest();
         teamRemoveMemberRequest.emailAddress("teammate@dropboxsign.com");
@@ -688,6 +698,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -699,8 +710,8 @@ public class TeamSubTeamsExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
@@ -773,6 +784,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -784,8 +796,8 @@ public class TeamUpdateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var teamUpdateRequest = new TeamUpdateRequest();
         teamUpdateRequest.name("New Team Name");
diff --git a/sdks/java-v1/docs/TemplateApi.md b/sdks/java-v1/docs/TemplateApi.md
index f9de1a96a..dd470487b 100644
--- a/sdks/java-v1/docs/TemplateApi.md
+++ b/sdks/java-v1/docs/TemplateApi.md
@@ -39,6 +39,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -50,8 +51,8 @@ public class TemplateAddUserExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var templateAddUserRequest = new TemplateAddUserRequest();
         templateAddUserRequest.emailAddress("george@dropboxsign.com");
@@ -125,6 +126,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -136,8 +138,8 @@ public class TemplateCreateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var fieldOptions = new SubFieldOptions();
         fieldOptions.dateFormat(SubFieldOptions.DateFormatEnum.DD_MM_YYYY);
@@ -285,6 +287,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -296,8 +299,8 @@ public class TemplateCreateEmbeddedDraftExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var fieldOptions = new SubFieldOptions();
         fieldOptions.dateFormat(SubFieldOptions.DateFormatEnum.DD_MM_YYYY);
@@ -411,6 +414,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -422,8 +426,8 @@ public class TemplateDeleteExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
@@ -492,6 +496,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -503,8 +508,8 @@ public class TemplateFilesExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
@@ -576,6 +581,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -587,8 +593,8 @@ public class TemplateFilesAsDataUriExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
@@ -659,6 +665,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -670,8 +677,8 @@ public class TemplateFilesAsFileUrlExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
@@ -742,6 +749,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -753,8 +761,8 @@ public class TemplateGetExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
@@ -825,6 +833,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -836,8 +845,8 @@ public class TemplateListExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
@@ -912,6 +921,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -923,8 +933,8 @@ public class TemplateRemoveUserExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var templateRemoveUserRequest = new TemplateRemoveUserRequest();
         templateRemoveUserRequest.emailAddress("george@dropboxsign.com");
@@ -1009,6 +1019,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -1020,8 +1031,8 @@ public class TemplateUpdateFilesExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var templateUpdateFilesRequest = new TemplateUpdateFilesRequest();
         templateUpdateFilesRequest.files(List.of (
diff --git a/sdks/java-v1/docs/UnclaimedDraftApi.md b/sdks/java-v1/docs/UnclaimedDraftApi.md
index 59ad0d2fd..3f4dadabd 100644
--- a/sdks/java-v1/docs/UnclaimedDraftApi.md
+++ b/sdks/java-v1/docs/UnclaimedDraftApi.md
@@ -32,6 +32,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -43,8 +44,8 @@ public class UnclaimedDraftCreateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var signers1 = new SubUnclaimedDraftSigner();
         signers1.name("Jack");
@@ -132,6 +133,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -143,8 +145,8 @@ public class UnclaimedDraftCreateEmbeddedExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var unclaimedDraftCreateEmbeddedRequest = new UnclaimedDraftCreateEmbeddedRequest();
         unclaimedDraftCreateEmbeddedRequest.clientId("b6b8e7deaf8f0b95c029dca049356d4a2cf9710a");
@@ -223,6 +225,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -234,8 +237,8 @@ public class UnclaimedDraftCreateEmbeddedWithTemplateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var ccs1 = new SubCC();
         ccs1.role("Accounting");
@@ -333,6 +336,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -344,8 +348,8 @@ public class UnclaimedDraftEditAndResendExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var unclaimedDraftEditAndResendRequest = new UnclaimedDraftEditAndResendRequest();
         unclaimedDraftEditAndResendRequest.clientId("b6b8e7deaf8f0b95c029dca049356d4a2cf9710a");
diff --git a/sdks/java-v2/README.md b/sdks/java-v2/README.md
index 483d9ef97..afe94ce5f 100644
--- a/sdks/java-v2/README.md
+++ b/sdks/java-v2/README.md
@@ -105,6 +105,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -116,8 +117,8 @@ public class AccountCreateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var accountCreateRequest = new AccountCreateRequest();
         accountCreateRequest.emailAddress("newuser@dropboxsign.com");
diff --git a/sdks/java-v2/docs/AccountApi.md b/sdks/java-v2/docs/AccountApi.md
index cd7c9244f..e638f559d 100644
--- a/sdks/java-v2/docs/AccountApi.md
+++ b/sdks/java-v2/docs/AccountApi.md
@@ -32,6 +32,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -43,8 +44,8 @@ public class AccountCreateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var accountCreateRequest = new AccountCreateRequest();
         accountCreateRequest.emailAddress("newuser@dropboxsign.com");
@@ -116,6 +117,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -127,12 +129,15 @@ public class AccountGetExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
-            var response = new AccountApi(config).accountGet();
+            var response = new AccountApi(config).accountGet(
+                null, // accountId
+                null // emailAddress
+            );
 
             System.out.println(response);
         } catch (ApiException e) {
@@ -196,6 +201,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -207,8 +213,8 @@ public class AccountUpdateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var accountUpdateRequest = new AccountUpdateRequest();
         accountUpdateRequest.callbackUrl("https://www.example.com/callback");
@@ -281,6 +287,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -292,8 +299,8 @@ public class AccountVerifyExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var accountVerifyRequest = new AccountVerifyRequest();
         accountVerifyRequest.emailAddress("some_user@dropboxsign.com");
diff --git a/sdks/java-v2/docs/ApiAppApi.md b/sdks/java-v2/docs/ApiAppApi.md
index 672878e86..c9e5fd615 100644
--- a/sdks/java-v2/docs/ApiAppApi.md
+++ b/sdks/java-v2/docs/ApiAppApi.md
@@ -33,6 +33,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -44,8 +45,8 @@ public class ApiAppCreateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var oauth = new SubOAuth();
         oauth.callbackUrl("https://example.com/oauth");
@@ -134,6 +135,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -145,8 +147,8 @@ public class ApiAppDeleteExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
@@ -213,6 +215,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -224,8 +227,8 @@ public class ApiAppGetExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
@@ -294,6 +297,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -305,8 +309,8 @@ public class ApiAppListExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
@@ -377,6 +381,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -388,8 +393,8 @@ public class ApiAppUpdateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var oauth = new SubOAuth();
         oauth.callbackUrl("https://example.com/oauth");
diff --git a/sdks/java-v2/docs/BulkSendJobApi.md b/sdks/java-v2/docs/BulkSendJobApi.md
index 742d55134..a4b8a3460 100644
--- a/sdks/java-v2/docs/BulkSendJobApi.md
+++ b/sdks/java-v2/docs/BulkSendJobApi.md
@@ -30,6 +30,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -41,8 +42,8 @@ public class BulkSendJobGetExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
@@ -115,6 +116,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -126,8 +128,8 @@ public class BulkSendJobListExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
diff --git a/sdks/java-v2/docs/EmbeddedApi.md b/sdks/java-v2/docs/EmbeddedApi.md
index 04700004d..416c319ee 100644
--- a/sdks/java-v2/docs/EmbeddedApi.md
+++ b/sdks/java-v2/docs/EmbeddedApi.md
@@ -30,6 +30,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -41,8 +42,8 @@ public class EmbeddedEditUrlExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var mergeFields = new ArrayList<SubMergeField>(List.of ());
 
@@ -121,6 +122,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -132,8 +134,8 @@ public class EmbeddedSignUrlExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
diff --git a/sdks/java-v2/docs/FaxApi.md b/sdks/java-v2/docs/FaxApi.md
index b092573e7..7ee47ff0e 100644
--- a/sdks/java-v2/docs/FaxApi.md
+++ b/sdks/java-v2/docs/FaxApi.md
@@ -33,6 +33,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -44,7 +45,7 @@ public class FaxDeleteExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
 
         try
         {
@@ -111,6 +112,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -122,7 +124,7 @@ public class FaxFilesExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
 
         try
         {
@@ -190,6 +192,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -201,7 +204,7 @@ public class FaxGetExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
 
         try
         {
@@ -270,6 +273,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -281,7 +285,7 @@ public class FaxListExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
 
         try
         {
@@ -352,6 +356,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -363,7 +368,7 @@ public class FaxSendExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
 
         var faxSendRequest = new FaxSendRequest();
         faxSendRequest.recipient("16690000001");
diff --git a/sdks/java-v2/docs/FaxLineApi.md b/sdks/java-v2/docs/FaxLineApi.md
index d1aafb013..79ccf8b93 100644
--- a/sdks/java-v2/docs/FaxLineApi.md
+++ b/sdks/java-v2/docs/FaxLineApi.md
@@ -35,6 +35,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -46,7 +47,7 @@ public class FaxLineAddUserExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
 
         var faxLineAddUserRequest = new FaxLineAddUserRequest();
         faxLineAddUserRequest.number("[FAX_NUMBER]");
@@ -119,6 +120,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -130,7 +132,7 @@ public class FaxLineAreaCodeGetExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
 
         try
         {
@@ -205,6 +207,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -216,7 +219,7 @@ public class FaxLineCreateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
 
         var faxLineCreateRequest = new FaxLineCreateRequest();
         faxLineCreateRequest.areaCode(209);
@@ -289,6 +292,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -300,7 +304,7 @@ public class FaxLineDeleteExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
 
         var faxLineDeleteRequest = new FaxLineDeleteRequest();
         faxLineDeleteRequest.number("[FAX_NUMBER]");
@@ -370,6 +374,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -381,7 +386,7 @@ public class FaxLineGetExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
 
         try
         {
@@ -450,6 +455,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -461,7 +467,7 @@ public class FaxLineListExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
 
         try
         {
@@ -536,6 +542,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -547,7 +554,7 @@ public class FaxLineRemoveUserExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
 
         var faxLineRemoveUserRequest = new FaxLineRemoveUserRequest();
         faxLineRemoveUserRequest.number("[FAX_NUMBER]");
diff --git a/sdks/java-v2/docs/OAuthApi.md b/sdks/java-v2/docs/OAuthApi.md
index ed9b039c2..aab2b9456 100644
--- a/sdks/java-v2/docs/OAuthApi.md
+++ b/sdks/java-v2/docs/OAuthApi.md
@@ -30,6 +30,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -116,6 +117,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
diff --git a/sdks/java-v2/docs/ReportApi.md b/sdks/java-v2/docs/ReportApi.md
index 1ef6af025..cadac49ae 100644
--- a/sdks/java-v2/docs/ReportApi.md
+++ b/sdks/java-v2/docs/ReportApi.md
@@ -31,6 +31,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -42,7 +43,7 @@ public class ReportCreateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
 
         var reportCreateRequest = new ReportCreateRequest();
         reportCreateRequest.startDate("09/01/2020");
diff --git a/sdks/java-v2/docs/SignatureRequestApi.md b/sdks/java-v2/docs/SignatureRequestApi.md
index 9c22f6611..96034a20b 100644
--- a/sdks/java-v2/docs/SignatureRequestApi.md
+++ b/sdks/java-v2/docs/SignatureRequestApi.md
@@ -50,6 +50,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -61,7 +62,7 @@ public class SignatureRequestBulkCreateEmbeddedWithTemplateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
 
         var signerList2CustomFields1 = new SubBulkSignerListCustomField();
         signerList2CustomFields1.name("company");
@@ -200,6 +201,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -211,8 +213,8 @@ public class SignatureRequestBulkSendWithTemplateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var signerList2CustomFields1 = new SubBulkSignerListCustomField();
         signerList2CustomFields1.name("company");
@@ -356,6 +358,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -367,8 +370,8 @@ public class SignatureRequestCancelExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
@@ -435,6 +438,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -446,8 +450,8 @@ public class SignatureRequestCreateEmbeddedExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var signingOptions = new SubSigningOptions();
         signingOptions.defaultType(SubSigningOptions.DefaultTypeEnum.DRAW);
@@ -554,6 +558,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -565,8 +570,8 @@ public class SignatureRequestCreateEmbeddedWithTemplateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var signingOptions = new SubSigningOptions();
         signingOptions.defaultType(SubSigningOptions.DefaultTypeEnum.DRAW);
@@ -664,6 +669,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -675,8 +681,8 @@ public class SignatureRequestEditExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var fieldOptions = new SubFieldOptions();
         fieldOptions.dateFormat(SubFieldOptions.DateFormatEnum.DD_MM_YYYY);
@@ -794,6 +800,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -805,8 +812,8 @@ public class SignatureRequestEditEmbeddedExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var signingOptions = new SubSigningOptions();
         signingOptions.defaultType(SubSigningOptions.DefaultTypeEnum.DRAW);
@@ -915,6 +922,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -926,8 +934,8 @@ public class SignatureRequestEditEmbeddedWithTemplateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var signingOptions = new SubSigningOptions();
         signingOptions.defaultType(SubSigningOptions.DefaultTypeEnum.DRAW);
@@ -1027,6 +1035,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -1038,8 +1047,8 @@ public class SignatureRequestEditWithTemplateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var signingOptions = new SubSigningOptions();
         signingOptions.defaultType(SubSigningOptions.DefaultTypeEnum.DRAW);
@@ -1158,6 +1167,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -1169,8 +1179,8 @@ public class SignatureRequestFilesExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
@@ -1242,6 +1252,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -1253,8 +1264,8 @@ public class SignatureRequestFilesAsDataUriExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
@@ -1325,6 +1336,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -1336,8 +1348,8 @@ public class SignatureRequestFilesAsFileUrlExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
@@ -1408,6 +1420,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -1419,8 +1432,8 @@ public class SignatureRequestGetExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
@@ -1491,6 +1504,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -1502,8 +1516,8 @@ public class SignatureRequestListExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
@@ -1578,6 +1592,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -1589,8 +1604,8 @@ public class SignatureRequestReleaseHoldExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
@@ -1661,6 +1676,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -1672,8 +1688,8 @@ public class SignatureRequestRemindExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var signatureRequestRemindRequest = new SignatureRequestRemindRequest();
         signatureRequestRemindRequest.emailAddress("john@example.com");
@@ -1751,6 +1767,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -1762,7 +1779,7 @@ public class SignatureRequestRemoveExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
 
         try
         {
@@ -1829,6 +1846,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -1840,8 +1858,8 @@ public class SignatureRequestSendExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var fieldOptions = new SubFieldOptions();
         fieldOptions.dateFormat(SubFieldOptions.DateFormatEnum.DD_MM_YYYY);
@@ -1957,6 +1975,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -1968,8 +1987,8 @@ public class SignatureRequestSendWithTemplateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var signingOptions = new SubSigningOptions();
         signingOptions.defaultType(SubSigningOptions.DefaultTypeEnum.DRAW);
@@ -2088,6 +2107,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -2099,8 +2119,8 @@ public class SignatureRequestUpdateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var signatureRequestUpdateRequest = new SignatureRequestUpdateRequest();
         signatureRequestUpdateRequest.signatureId("2f9781e1a8e2045224d808c153c2e1d3df6f8f2f");
diff --git a/sdks/java-v2/docs/TeamApi.md b/sdks/java-v2/docs/TeamApi.md
index 3e57e0451..abb3f1ee0 100644
--- a/sdks/java-v2/docs/TeamApi.md
+++ b/sdks/java-v2/docs/TeamApi.md
@@ -38,6 +38,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -49,8 +50,8 @@ public class TeamAddMemberExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var teamAddMemberRequest = new TeamAddMemberRequest();
         teamAddMemberRequest.emailAddress("george@example.com");
@@ -124,6 +125,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -135,8 +137,8 @@ public class TeamCreateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var teamCreateRequest = new TeamCreateRequest();
         teamCreateRequest.name("New Team Name");
@@ -208,6 +210,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -219,8 +222,8 @@ public class TeamDeleteExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
@@ -282,6 +285,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -293,8 +297,8 @@ public class TeamGetExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
@@ -358,6 +362,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -369,8 +374,8 @@ public class TeamInfoExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
@@ -439,6 +444,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -450,12 +456,14 @@ public class TeamInvitesExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
-            var response = new TeamApi(config).teamInvites();
+            var response = new TeamApi(config).teamInvites(
+                null // emailAddress
+            );
 
             System.out.println(response);
         } catch (ApiException e) {
@@ -518,6 +526,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -529,8 +538,8 @@ public class TeamMembersExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
@@ -603,6 +612,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -614,8 +624,8 @@ public class TeamRemoveMemberExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var teamRemoveMemberRequest = new TeamRemoveMemberRequest();
         teamRemoveMemberRequest.emailAddress("teammate@dropboxsign.com");
@@ -688,6 +698,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -699,8 +710,8 @@ public class TeamSubTeamsExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
@@ -773,6 +784,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -784,8 +796,8 @@ public class TeamUpdateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var teamUpdateRequest = new TeamUpdateRequest();
         teamUpdateRequest.name("New Team Name");
diff --git a/sdks/java-v2/docs/TemplateApi.md b/sdks/java-v2/docs/TemplateApi.md
index f9de1a96a..dd470487b 100644
--- a/sdks/java-v2/docs/TemplateApi.md
+++ b/sdks/java-v2/docs/TemplateApi.md
@@ -39,6 +39,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -50,8 +51,8 @@ public class TemplateAddUserExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var templateAddUserRequest = new TemplateAddUserRequest();
         templateAddUserRequest.emailAddress("george@dropboxsign.com");
@@ -125,6 +126,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -136,8 +138,8 @@ public class TemplateCreateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var fieldOptions = new SubFieldOptions();
         fieldOptions.dateFormat(SubFieldOptions.DateFormatEnum.DD_MM_YYYY);
@@ -285,6 +287,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -296,8 +299,8 @@ public class TemplateCreateEmbeddedDraftExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var fieldOptions = new SubFieldOptions();
         fieldOptions.dateFormat(SubFieldOptions.DateFormatEnum.DD_MM_YYYY);
@@ -411,6 +414,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -422,8 +426,8 @@ public class TemplateDeleteExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
@@ -492,6 +496,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -503,8 +508,8 @@ public class TemplateFilesExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
@@ -576,6 +581,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -587,8 +593,8 @@ public class TemplateFilesAsDataUriExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
@@ -659,6 +665,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -670,8 +677,8 @@ public class TemplateFilesAsFileUrlExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
@@ -742,6 +749,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -753,8 +761,8 @@ public class TemplateGetExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
@@ -825,6 +833,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -836,8 +845,8 @@ public class TemplateListExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         try
         {
@@ -912,6 +921,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -923,8 +933,8 @@ public class TemplateRemoveUserExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var templateRemoveUserRequest = new TemplateRemoveUserRequest();
         templateRemoveUserRequest.emailAddress("george@dropboxsign.com");
@@ -1009,6 +1019,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -1020,8 +1031,8 @@ public class TemplateUpdateFilesExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var templateUpdateFilesRequest = new TemplateUpdateFilesRequest();
         templateUpdateFilesRequest.files(List.of (
diff --git a/sdks/java-v2/docs/UnclaimedDraftApi.md b/sdks/java-v2/docs/UnclaimedDraftApi.md
index 59ad0d2fd..3f4dadabd 100644
--- a/sdks/java-v2/docs/UnclaimedDraftApi.md
+++ b/sdks/java-v2/docs/UnclaimedDraftApi.md
@@ -32,6 +32,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -43,8 +44,8 @@ public class UnclaimedDraftCreateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var signers1 = new SubUnclaimedDraftSigner();
         signers1.name("Jack");
@@ -132,6 +133,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -143,8 +145,8 @@ public class UnclaimedDraftCreateEmbeddedExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var unclaimedDraftCreateEmbeddedRequest = new UnclaimedDraftCreateEmbeddedRequest();
         unclaimedDraftCreateEmbeddedRequest.clientId("b6b8e7deaf8f0b95c029dca049356d4a2cf9710a");
@@ -223,6 +225,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -234,8 +237,8 @@ public class UnclaimedDraftCreateEmbeddedWithTemplateExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var ccs1 = new SubCC();
         ccs1.role("Accounting");
@@ -333,6 +336,7 @@ import com.dropbox.sign.JSON;
 import com.dropbox.sign.model.*;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -344,8 +348,8 @@ public class UnclaimedDraftEditAndResendExample
     public static void main(String[] args)
     {
         var config = Configuration.getDefaultApiClient();
-        config.setUsername("YOUR_API_KEY");
-        // config.setAccessToken("YOUR_ACCESS_TOKEN");
+        ((HttpBasicAuth) config.getAuthentication("api_key")).setUsername("YOUR_API_KEY");
+        // ((HttpBearerAuth) config.getAuthentication("oauth2")).setBearerToken("YOUR_ACCESS_TOKEN");
 
         var unclaimedDraftEditAndResendRequest = new UnclaimedDraftEditAndResendRequest();
         unclaimedDraftEditAndResendRequest.clientId("b6b8e7deaf8f0b95c029dca049356d4a2cf9710a");
diff --git a/sdks/node/README.md b/sdks/node/README.md
index 38fb80120..93d2bfdfd 100644
--- a/sdks/node/README.md
+++ b/sdks/node/README.md
@@ -55,8 +55,9 @@ const apiCaller = new api.AccountApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const accountCreateRequest = new models.AccountCreateRequest();
-accountCreateRequest.emailAddress = "newuser@dropboxsign.com";
+const accountCreateRequest: models.AccountCreateRequest = {
+  emailAddress: "newuser@dropboxsign.com",
+};
 
 apiCaller.accountCreate(
   accountCreateRequest,
diff --git a/sdks/node/docs/api/AccountApi.md b/sdks/node/docs/api/AccountApi.md
index fefcb3540..cb57cf6ee 100644
--- a/sdks/node/docs/api/AccountApi.md
+++ b/sdks/node/docs/api/AccountApi.md
@@ -31,8 +31,9 @@ const apiCaller = new api.AccountApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const accountCreateRequest = new models.AccountCreateRequest();
-accountCreateRequest.emailAddress = "newuser@dropboxsign.com";
+const accountCreateRequest: models.AccountCreateRequest = {
+  emailAddress: "newuser@dropboxsign.com",
+};
 
 apiCaller.accountCreate(
   accountCreateRequest,
@@ -143,9 +144,10 @@ const apiCaller = new api.AccountApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const accountUpdateRequest = new models.AccountUpdateRequest();
-accountUpdateRequest.callbackUrl = "https://www.example.com/callback";
-accountUpdateRequest.locale = "en-US";
+const accountUpdateRequest: models.AccountUpdateRequest = {
+  callbackUrl: "https://www.example.com/callback",
+  locale: "en-US",
+};
 
 apiCaller.accountUpdate(
   accountUpdateRequest,
@@ -202,8 +204,9 @@ const apiCaller = new api.AccountApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const accountVerifyRequest = new models.AccountVerifyRequest();
-accountVerifyRequest.emailAddress = "some_user@dropboxsign.com";
+const accountVerifyRequest: models.AccountVerifyRequest = {
+  emailAddress: "some_user@dropboxsign.com",
+};
 
 apiCaller.accountVerify(
   accountVerifyRequest,
diff --git a/sdks/node/docs/api/ApiAppApi.md b/sdks/node/docs/api/ApiAppApi.md
index e7dd67b58..8494edaf2 100644
--- a/sdks/node/docs/api/ApiAppApi.md
+++ b/sdks/node/docs/api/ApiAppApi.md
@@ -32,25 +32,28 @@ const apiCaller = new api.ApiAppApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const oauth = new models.SubOAuth();
-oauth.callbackUrl = "https://example.com/oauth";
-oauth.scopes = [
-  models.SubOAuth.ScopesEnum.BasicAccountInfo,
-  models.SubOAuth.ScopesEnum.RequestSignature,
-];
-
-const whiteLabelingOptions = new models.SubWhiteLabelingOptions();
-whiteLabelingOptions.primaryButtonColor = "#00b3e6";
-whiteLabelingOptions.primaryButtonTextColor = "#ffffff";
-
-const apiAppCreateRequest = new models.ApiAppCreateRequest();
-apiAppCreateRequest.name = "My Production App";
-apiAppCreateRequest.domains = [
-  "example.com",
-];
-apiAppCreateRequest.customLogoFile = fs.createReadStream("CustomLogoFile.png");
-apiAppCreateRequest.oauth = oauth;
-apiAppCreateRequest.whiteLabelingOptions = whiteLabelingOptions;
+const oauth: models.SubOAuth = {
+  callbackUrl: "https://example.com/oauth",
+  scopes: [
+    models.SubOAuth.ScopesEnum.BasicAccountInfo,
+    models.SubOAuth.ScopesEnum.RequestSignature,
+  ],
+};
+
+const whiteLabelingOptions: models.SubWhiteLabelingOptions = {
+  primaryButtonColor: "#00b3e6",
+  primaryButtonTextColor: "#ffffff",
+};
+
+const apiAppCreateRequest: models.ApiAppCreateRequest = {
+  name: "My Production App",
+  domains: [
+    "example.com",
+  ],
+  customLogoFile: fs.createReadStream("CustomLogoFile.png"),
+  oauth: oauth,
+  whiteLabelingOptions: whiteLabelingOptions,
+};
 
 apiCaller.apiAppCreate(
   apiAppCreateRequest,
@@ -272,26 +275,29 @@ const apiCaller = new api.ApiAppApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const oauth = new models.SubOAuth();
-oauth.callbackUrl = "https://example.com/oauth";
-oauth.scopes = [
-  models.SubOAuth.ScopesEnum.BasicAccountInfo,
-  models.SubOAuth.ScopesEnum.RequestSignature,
-];
-
-const whiteLabelingOptions = new models.SubWhiteLabelingOptions();
-whiteLabelingOptions.primaryButtonColor = "#00b3e6";
-whiteLabelingOptions.primaryButtonTextColor = "#ffffff";
-
-const apiAppUpdateRequest = new models.ApiAppUpdateRequest();
-apiAppUpdateRequest.callbackUrl = "https://example.com/dropboxsign";
-apiAppUpdateRequest.name = "New Name";
-apiAppUpdateRequest.domains = [
-  "example.com",
-];
-apiAppUpdateRequest.customLogoFile = fs.createReadStream("CustomLogoFile.png");
-apiAppUpdateRequest.oauth = oauth;
-apiAppUpdateRequest.whiteLabelingOptions = whiteLabelingOptions;
+const oauth: models.SubOAuth = {
+  callbackUrl: "https://example.com/oauth",
+  scopes: [
+    models.SubOAuth.ScopesEnum.BasicAccountInfo,
+    models.SubOAuth.ScopesEnum.RequestSignature,
+  ],
+};
+
+const whiteLabelingOptions: models.SubWhiteLabelingOptions = {
+  primaryButtonColor: "#00b3e6",
+  primaryButtonTextColor: "#ffffff",
+};
+
+const apiAppUpdateRequest: models.ApiAppUpdateRequest = {
+  callbackUrl: "https://example.com/dropboxsign",
+  name: "New Name",
+  domains: [
+    "example.com",
+  ],
+  customLogoFile: fs.createReadStream("CustomLogoFile.png"),
+  oauth: oauth,
+  whiteLabelingOptions: whiteLabelingOptions,
+};
 
 apiCaller.apiAppUpdate(
   "0dd3b823a682527788c4e40cb7b6f7e9", // clientId
diff --git a/sdks/node/docs/api/EmbeddedApi.md b/sdks/node/docs/api/EmbeddedApi.md
index 107b4f15c..2937ac3ef 100644
--- a/sdks/node/docs/api/EmbeddedApi.md
+++ b/sdks/node/docs/api/EmbeddedApi.md
@@ -32,11 +32,12 @@ apiCaller.username = "YOUR_API_KEY";
 const mergeFields = [
 ];
 
-const embeddedEditUrlRequest = new models.EmbeddedEditUrlRequest();
-embeddedEditUrlRequest.ccRoles = [
-  "",
-];
-embeddedEditUrlRequest.mergeFields = mergeFields;
+const embeddedEditUrlRequest: models.EmbeddedEditUrlRequest = {
+  ccRoles: [
+    "",
+  ],
+  mergeFields: mergeFields,
+};
 
 apiCaller.embeddedEditUrl(
   "f57db65d3f933b5316d398057a36176831451a35", // templateId
diff --git a/sdks/node/docs/api/FaxApi.md b/sdks/node/docs/api/FaxApi.md
index 98a4ae276..efc84eea6 100644
--- a/sdks/node/docs/api/FaxApi.md
+++ b/sdks/node/docs/api/FaxApi.md
@@ -247,17 +247,18 @@ import models from "@dropbox/sign"
 const apiCaller = new api.FaxApi();
 apiCaller.username = "YOUR_API_KEY";
 
-const faxSendRequest = new models.FaxSendRequest();
-faxSendRequest.recipient = "16690000001";
-faxSendRequest.sender = "16690000000";
-faxSendRequest.testMode = true;
-faxSendRequest.coverPageTo = "Jill Fax";
-faxSendRequest.coverPageFrom = "Faxer Faxerson";
-faxSendRequest.coverPageMessage = "I'm sending you a fax!";
-faxSendRequest.title = "This is what the fax is about!";
-faxSendRequest.files = [
-  fs.createReadStream("./example_fax.pdf"),
-];
+const faxSendRequest: models.FaxSendRequest = {
+  recipient: "16690000001",
+  sender: "16690000000",
+  testMode: true,
+  coverPageTo: "Jill Fax",
+  coverPageFrom: "Faxer Faxerson",
+  coverPageMessage: "I'm sending you a fax!",
+  title: "This is what the fax is about!",
+  files: [
+    fs.createReadStream("./example_fax.pdf"),
+  ],
+};
 
 apiCaller.faxSend(
   faxSendRequest,
diff --git a/sdks/node/docs/api/FaxLineApi.md b/sdks/node/docs/api/FaxLineApi.md
index d0d6e8b5f..5c00c74cf 100644
--- a/sdks/node/docs/api/FaxLineApi.md
+++ b/sdks/node/docs/api/FaxLineApi.md
@@ -33,9 +33,10 @@ import models from "@dropbox/sign"
 const apiCaller = new api.FaxLineApi();
 apiCaller.username = "YOUR_API_KEY";
 
-const faxLineAddUserRequest = new models.FaxLineAddUserRequest();
-faxLineAddUserRequest.number = "[FAX_NUMBER]";
-faxLineAddUserRequest.emailAddress = "member@dropboxsign.com";
+const faxLineAddUserRequest: models.FaxLineAddUserRequest = {
+  number: "[FAX_NUMBER]",
+  emailAddress: "member@dropboxsign.com",
+};
 
 apiCaller.faxLineAddUser(
   faxLineAddUserRequest,
@@ -151,9 +152,10 @@ import models from "@dropbox/sign"
 const apiCaller = new api.FaxLineApi();
 apiCaller.username = "YOUR_API_KEY";
 
-const faxLineCreateRequest = new models.FaxLineCreateRequest();
-faxLineCreateRequest.areaCode = 209;
-faxLineCreateRequest.country = models.FaxLineCreateRequest.CountryEnum.Us;
+const faxLineCreateRequest: models.FaxLineCreateRequest = {
+  areaCode: 209,
+  country: models.FaxLineCreateRequest.CountryEnum.Us,
+};
 
 apiCaller.faxLineCreate(
   faxLineCreateRequest,
@@ -209,8 +211,9 @@ import models from "@dropbox/sign"
 const apiCaller = new api.FaxLineApi();
 apiCaller.username = "YOUR_API_KEY";
 
-const faxLineDeleteRequest = new models.FaxLineDeleteRequest();
-faxLineDeleteRequest.number = "[FAX_NUMBER]";
+const faxLineDeleteRequest: models.FaxLineDeleteRequest = {
+  number: "[FAX_NUMBER]",
+};
 
 apiCaller.faxLineDelete(
   faxLineDeleteRequest,
@@ -378,9 +381,10 @@ import models from "@dropbox/sign"
 const apiCaller = new api.FaxLineApi();
 apiCaller.username = "YOUR_API_KEY";
 
-const faxLineRemoveUserRequest = new models.FaxLineRemoveUserRequest();
-faxLineRemoveUserRequest.number = "[FAX_NUMBER]";
-faxLineRemoveUserRequest.emailAddress = "member@dropboxsign.com";
+const faxLineRemoveUserRequest: models.FaxLineRemoveUserRequest = {
+  number: "[FAX_NUMBER]",
+  emailAddress: "member@dropboxsign.com",
+};
 
 apiCaller.faxLineRemoveUser(
   faxLineRemoveUserRequest,
diff --git a/sdks/node/docs/api/OAuthApi.md b/sdks/node/docs/api/OAuthApi.md
index ef2ac543d..6746ebc21 100644
--- a/sdks/node/docs/api/OAuthApi.md
+++ b/sdks/node/docs/api/OAuthApi.md
@@ -27,12 +27,13 @@ import models from "@dropbox/sign"
 
 const apiCaller = new api.OAuthApi();
 
-const oAuthTokenGenerateRequest = new models.OAuthTokenGenerateRequest();
-oAuthTokenGenerateRequest.clientId = "cc91c61d00f8bb2ece1428035716b";
-oAuthTokenGenerateRequest.clientSecret = "1d14434088507ffa390e6f5528465";
-oAuthTokenGenerateRequest.code = "1b0d28d90c86c141";
-oAuthTokenGenerateRequest.state = "900e06e2";
-oAuthTokenGenerateRequest.grantType = "authorization_code";
+const oAuthTokenGenerateRequest: models.OAuthTokenGenerateRequest = {
+  clientId: "cc91c61d00f8bb2ece1428035716b",
+  clientSecret: "1d14434088507ffa390e6f5528465",
+  code: "1b0d28d90c86c141",
+  state: "900e06e2",
+  grantType: "authorization_code",
+};
 
 apiCaller.oauthTokenGenerate(
   oAuthTokenGenerateRequest,
@@ -87,9 +88,10 @@ import models from "@dropbox/sign"
 
 const apiCaller = new api.OAuthApi();
 
-const oAuthTokenRefreshRequest = new models.OAuthTokenRefreshRequest();
-oAuthTokenRefreshRequest.grantType = "refresh_token";
-oAuthTokenRefreshRequest.refreshToken = "hNTI2MTFmM2VmZDQxZTZjOWRmZmFjZmVmMGMyNGFjMzI2MGI5YzgzNmE3";
+const oAuthTokenRefreshRequest: models.OAuthTokenRefreshRequest = {
+  grantType: "refresh_token",
+  refreshToken: "hNTI2MTFmM2VmZDQxZTZjOWRmZmFjZmVmMGMyNGFjMzI2MGI5YzgzNmE3",
+};
 
 apiCaller.oauthTokenRefresh(
   oAuthTokenRefreshRequest,
diff --git a/sdks/node/docs/api/ReportApi.md b/sdks/node/docs/api/ReportApi.md
index 3a5678885..005e83c85 100644
--- a/sdks/node/docs/api/ReportApi.md
+++ b/sdks/node/docs/api/ReportApi.md
@@ -27,13 +27,14 @@ import models from "@dropbox/sign"
 const apiCaller = new api.ReportApi();
 apiCaller.username = "YOUR_API_KEY";
 
-const reportCreateRequest = new models.ReportCreateRequest();
-reportCreateRequest.startDate = "09/01/2020";
-reportCreateRequest.endDate = "09/01/2020";
-reportCreateRequest.reportType = [
-  models.ReportCreateRequest.ReportTypeEnum.UserActivity,
-  models.ReportCreateRequest.ReportTypeEnum.DocumentStatus,
-];
+const reportCreateRequest: models.ReportCreateRequest = {
+  startDate: "09/01/2020",
+  endDate: "09/01/2020",
+  reportType: [
+    models.ReportCreateRequest.ReportTypeEnum.UserActivity,
+    models.ReportCreateRequest.ReportTypeEnum.DocumentStatus,
+  ],
+};
 
 apiCaller.reportCreate(
   reportCreateRequest,
diff --git a/sdks/node/docs/api/SignatureRequestApi.md b/sdks/node/docs/api/SignatureRequestApi.md
index 4ee77ab2f..2590d0d8c 100644
--- a/sdks/node/docs/api/SignatureRequestApi.md
+++ b/sdks/node/docs/api/SignatureRequestApi.md
@@ -46,73 +46,81 @@ import models from "@dropbox/sign"
 const apiCaller = new api.SignatureRequestApi();
 apiCaller.username = "YOUR_API_KEY";
 
-const signerList2CustomFields1 = new models.SubBulkSignerListCustomField();
-signerList2CustomFields1.name = "company";
-signerList2CustomFields1.value = "123 LLC";
+const signerList2CustomFields1: models.SubBulkSignerListCustomField = {
+  name: "company",
+  value: "123 LLC",
+};
 
 const signerList2CustomFields = [
   signerList2CustomFields1,
 ];
 
-const signerList2Signers1 = new models.SubSignatureRequestTemplateSigner();
-signerList2Signers1.role = "Client";
-signerList2Signers1.name = "Mary";
-signerList2Signers1.emailAddress = "mary@example.com";
-signerList2Signers1.pin = "gd9as5b";
+const signerList2Signers1: models.SubSignatureRequestTemplateSigner = {
+  role: "Client",
+  name: "Mary",
+  emailAddress: "mary@example.com",
+  pin: "gd9as5b",
+};
 
 const signerList2Signers = [
   signerList2Signers1,
 ];
 
-const signerList1CustomFields1 = new models.SubBulkSignerListCustomField();
-signerList1CustomFields1.name = "company";
-signerList1CustomFields1.value = "ABC Corp";
+const signerList1CustomFields1: models.SubBulkSignerListCustomField = {
+  name: "company",
+  value: "ABC Corp",
+};
 
 const signerList1CustomFields = [
   signerList1CustomFields1,
 ];
 
-const signerList1Signers1 = new models.SubSignatureRequestTemplateSigner();
-signerList1Signers1.role = "Client";
-signerList1Signers1.name = "George";
-signerList1Signers1.emailAddress = "george@example.com";
-signerList1Signers1.pin = "d79a3td";
+const signerList1Signers1: models.SubSignatureRequestTemplateSigner = {
+  role: "Client",
+  name: "George",
+  emailAddress: "george@example.com",
+  pin: "d79a3td",
+};
 
 const signerList1Signers = [
   signerList1Signers1,
 ];
 
-const signerList1 = new models.SubBulkSignerList();
-signerList1.customFields = signerList1CustomFields;
-signerList1.signers = signerList1Signers;
+const signerList1: models.SubBulkSignerList = {
+  customFields: signerList1CustomFields,
+  signers: signerList1Signers,
+};
 
-const signerList2 = new models.SubBulkSignerList();
-signerList2.customFields = signerList2CustomFields;
-signerList2.signers = signerList2Signers;
+const signerList2: models.SubBulkSignerList = {
+  customFields: signerList2CustomFields,
+  signers: signerList2Signers,
+};
 
 const signerList = [
   signerList1,
   signerList2,
 ];
 
-const ccs1 = new models.SubCC();
-ccs1.role = "Accounting";
-ccs1.emailAddress = "accounting@example.com";
+const ccs1: models.SubCC = {
+  role: "Accounting",
+  emailAddress: "accounting@example.com",
+};
 
 const ccs = [
   ccs1,
 ];
 
-const signatureRequestBulkCreateEmbeddedWithTemplateRequest = new models.SignatureRequestBulkCreateEmbeddedWithTemplateRequest();
-signatureRequestBulkCreateEmbeddedWithTemplateRequest.clientId = "1a659d9ad95bccd307ecad78d72192f8";
-signatureRequestBulkCreateEmbeddedWithTemplateRequest.templateIds = [
-  "c26b8a16784a872da37ea946b9ddec7c1e11dff6",
-];
-signatureRequestBulkCreateEmbeddedWithTemplateRequest.message = "Glad we could come to an agreement.";
-signatureRequestBulkCreateEmbeddedWithTemplateRequest.subject = "Purchase Order";
-signatureRequestBulkCreateEmbeddedWithTemplateRequest.testMode = true;
-signatureRequestBulkCreateEmbeddedWithTemplateRequest.signerList = signerList;
-signatureRequestBulkCreateEmbeddedWithTemplateRequest.ccs = ccs;
+const signatureRequestBulkCreateEmbeddedWithTemplateRequest: models.SignatureRequestBulkCreateEmbeddedWithTemplateRequest = {
+  clientId: "1a659d9ad95bccd307ecad78d72192f8",
+  templateIds: [
+    "c26b8a16784a872da37ea946b9ddec7c1e11dff6",
+  ],
+  message: "Glad we could come to an agreement.",
+  subject: "Purchase Order",
+  testMode: true,
+  signerList: signerList,
+  ccs: ccs,
+};
 
 apiCaller.signatureRequestBulkCreateEmbeddedWithTemplate(
   signatureRequestBulkCreateEmbeddedWithTemplateRequest,
@@ -169,72 +177,80 @@ const apiCaller = new api.SignatureRequestApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const signerList2CustomFields1 = new models.SubBulkSignerListCustomField();
-signerList2CustomFields1.name = "company";
-signerList2CustomFields1.value = "123 LLC";
+const signerList2CustomFields1: models.SubBulkSignerListCustomField = {
+  name: "company",
+  value: "123 LLC",
+};
 
 const signerList2CustomFields = [
   signerList2CustomFields1,
 ];
 
-const signerList2Signers1 = new models.SubSignatureRequestTemplateSigner();
-signerList2Signers1.role = "Client";
-signerList2Signers1.name = "Mary";
-signerList2Signers1.emailAddress = "mary@example.com";
-signerList2Signers1.pin = "gd9as5b";
+const signerList2Signers1: models.SubSignatureRequestTemplateSigner = {
+  role: "Client",
+  name: "Mary",
+  emailAddress: "mary@example.com",
+  pin: "gd9as5b",
+};
 
 const signerList2Signers = [
   signerList2Signers1,
 ];
 
-const signerList1CustomFields1 = new models.SubBulkSignerListCustomField();
-signerList1CustomFields1.name = "company";
-signerList1CustomFields1.value = "ABC Corp";
+const signerList1CustomFields1: models.SubBulkSignerListCustomField = {
+  name: "company",
+  value: "ABC Corp",
+};
 
 const signerList1CustomFields = [
   signerList1CustomFields1,
 ];
 
-const signerList1Signers1 = new models.SubSignatureRequestTemplateSigner();
-signerList1Signers1.role = "Client";
-signerList1Signers1.name = "George";
-signerList1Signers1.emailAddress = "george@example.com";
-signerList1Signers1.pin = "d79a3td";
+const signerList1Signers1: models.SubSignatureRequestTemplateSigner = {
+  role: "Client",
+  name: "George",
+  emailAddress: "george@example.com",
+  pin: "d79a3td",
+};
 
 const signerList1Signers = [
   signerList1Signers1,
 ];
 
-const signerList1 = new models.SubBulkSignerList();
-signerList1.customFields = signerList1CustomFields;
-signerList1.signers = signerList1Signers;
+const signerList1: models.SubBulkSignerList = {
+  customFields: signerList1CustomFields,
+  signers: signerList1Signers,
+};
 
-const signerList2 = new models.SubBulkSignerList();
-signerList2.customFields = signerList2CustomFields;
-signerList2.signers = signerList2Signers;
+const signerList2: models.SubBulkSignerList = {
+  customFields: signerList2CustomFields,
+  signers: signerList2Signers,
+};
 
 const signerList = [
   signerList1,
   signerList2,
 ];
 
-const ccs1 = new models.SubCC();
-ccs1.role = "Accounting";
-ccs1.emailAddress = "accounting@example.com";
+const ccs1: models.SubCC = {
+  role: "Accounting",
+  emailAddress: "accounting@example.com",
+};
 
 const ccs = [
   ccs1,
 ];
 
-const signatureRequestBulkSendWithTemplateRequest = new models.SignatureRequestBulkSendWithTemplateRequest();
-signatureRequestBulkSendWithTemplateRequest.templateIds = [
-  "c26b8a16784a872da37ea946b9ddec7c1e11dff6",
-];
-signatureRequestBulkSendWithTemplateRequest.message = "Glad we could come to an agreement.";
-signatureRequestBulkSendWithTemplateRequest.subject = "Purchase Order";
-signatureRequestBulkSendWithTemplateRequest.testMode = true;
-signatureRequestBulkSendWithTemplateRequest.signerList = signerList;
-signatureRequestBulkSendWithTemplateRequest.ccs = ccs;
+const signatureRequestBulkSendWithTemplateRequest: models.SignatureRequestBulkSendWithTemplateRequest = {
+  templateIds: [
+    "c26b8a16784a872da37ea946b9ddec7c1e11dff6",
+  ],
+  message: "Glad we could come to an agreement.",
+  subject: "Purchase Order",
+  testMode: true,
+  signerList: signerList,
+  ccs: ccs,
+};
 
 apiCaller.signatureRequestBulkSendWithTemplate(
   signatureRequestBulkSendWithTemplateRequest,
@@ -344,43 +360,47 @@ const apiCaller = new api.SignatureRequestApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const signingOptions = new models.SubSigningOptions();
-signingOptions.defaultType = models.SubSigningOptions.DefaultTypeEnum.Draw;
-signingOptions.draw = true;
-signingOptions.phone = false;
-signingOptions.type = true;
-signingOptions.upload = true;
+const signingOptions: models.SubSigningOptions = {
+  defaultType: models.SubSigningOptions.DefaultTypeEnum.Draw,
+  draw: true,
+  phone: false,
+  type: true,
+  upload: true,
+};
 
-const signers1 = new models.SubSignatureRequestSigner();
-signers1.name = "Jack";
-signers1.emailAddress = "jack@example.com";
-signers1.order = 0;
+const signers1: models.SubSignatureRequestSigner = {
+  name: "Jack",
+  emailAddress: "jack@example.com",
+  order: 0,
+};
 
-const signers2 = new models.SubSignatureRequestSigner();
-signers2.name = "Jill";
-signers2.emailAddress = "jill@example.com";
-signers2.order = 1;
+const signers2: models.SubSignatureRequestSigner = {
+  name: "Jill",
+  emailAddress: "jill@example.com",
+  order: 1,
+};
 
 const signers = [
   signers1,
   signers2,
 ];
 
-const signatureRequestCreateEmbeddedRequest = new models.SignatureRequestCreateEmbeddedRequest();
-signatureRequestCreateEmbeddedRequest.clientId = "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a";
-signatureRequestCreateEmbeddedRequest.message = "Please sign this NDA and then we can discuss more. Let me know if you\nhave any questions.";
-signatureRequestCreateEmbeddedRequest.subject = "The NDA we talked about";
-signatureRequestCreateEmbeddedRequest.testMode = true;
-signatureRequestCreateEmbeddedRequest.title = "NDA with Acme Co.";
-signatureRequestCreateEmbeddedRequest.ccEmailAddresses = [
-  "lawyer1@dropboxsign.com",
-  "lawyer2@dropboxsign.com",
-];
-signatureRequestCreateEmbeddedRequest.files = [
-  fs.createReadStream("./example_signature_request.pdf"),
-];
-signatureRequestCreateEmbeddedRequest.signingOptions = signingOptions;
-signatureRequestCreateEmbeddedRequest.signers = signers;
+const signatureRequestCreateEmbeddedRequest: models.SignatureRequestCreateEmbeddedRequest = {
+  clientId: "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a",
+  message: "Please sign this NDA and then we can discuss more. Let me know if you\nhave any questions.",
+  subject: "The NDA we talked about",
+  testMode: true,
+  title: "NDA with Acme Co.",
+  ccEmailAddresses: [
+    "lawyer1@dropboxsign.com",
+    "lawyer2@dropboxsign.com",
+  ],
+  files: [
+    fs.createReadStream("./example_signature_request.pdf"),
+  ],
+  signingOptions: signingOptions,
+  signers: signers,
+};
 
 apiCaller.signatureRequestCreateEmbedded(
   signatureRequestCreateEmbeddedRequest,
@@ -437,32 +457,35 @@ const apiCaller = new api.SignatureRequestApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const signingOptions = new models.SubSigningOptions();
-signingOptions.defaultType = models.SubSigningOptions.DefaultTypeEnum.Draw;
-signingOptions.draw = true;
-signingOptions.phone = false;
-signingOptions.type = true;
-signingOptions.upload = true;
+const signingOptions: models.SubSigningOptions = {
+  defaultType: models.SubSigningOptions.DefaultTypeEnum.Draw,
+  draw: true,
+  phone: false,
+  type: true,
+  upload: true,
+};
 
-const signers1 = new models.SubSignatureRequestTemplateSigner();
-signers1.role = "Client";
-signers1.name = "George";
-signers1.emailAddress = "george@example.com";
+const signers1: models.SubSignatureRequestTemplateSigner = {
+  role: "Client",
+  name: "George",
+  emailAddress: "george@example.com",
+};
 
 const signers = [
   signers1,
 ];
 
-const signatureRequestCreateEmbeddedWithTemplateRequest = new models.SignatureRequestCreateEmbeddedWithTemplateRequest();
-signatureRequestCreateEmbeddedWithTemplateRequest.clientId = "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a";
-signatureRequestCreateEmbeddedWithTemplateRequest.templateIds = [
-  "c26b8a16784a872da37ea946b9ddec7c1e11dff6",
-];
-signatureRequestCreateEmbeddedWithTemplateRequest.message = "Glad we could come to an agreement.";
-signatureRequestCreateEmbeddedWithTemplateRequest.subject = "Purchase Order";
-signatureRequestCreateEmbeddedWithTemplateRequest.testMode = true;
-signatureRequestCreateEmbeddedWithTemplateRequest.signingOptions = signingOptions;
-signatureRequestCreateEmbeddedWithTemplateRequest.signers = signers;
+const signatureRequestCreateEmbeddedWithTemplateRequest: models.SignatureRequestCreateEmbeddedWithTemplateRequest = {
+  clientId: "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a",
+  templateIds: [
+    "c26b8a16784a872da37ea946b9ddec7c1e11dff6",
+  ],
+  message: "Glad we could come to an agreement.",
+  subject: "Purchase Order",
+  testMode: true,
+  signingOptions: signingOptions,
+  signers: signers,
+};
 
 apiCaller.signatureRequestCreateEmbeddedWithTemplate(
   signatureRequestCreateEmbeddedWithTemplateRequest,
@@ -519,50 +542,55 @@ const apiCaller = new api.SignatureRequestApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const fieldOptions = new models.SubFieldOptions();
-fieldOptions.dateFormat = models.SubFieldOptions.DateFormatEnum.DD_MM_YYYY;
+const fieldOptions: models.SubFieldOptions = {
+  dateFormat: models.SubFieldOptions.DateFormatEnum.DdMmYyyy,
+};
 
-const signingOptions = new models.SubSigningOptions();
-signingOptions.defaultType = models.SubSigningOptions.DefaultTypeEnum.Draw;
-signingOptions.draw = true;
-signingOptions.phone = false;
-signingOptions.type = true;
-signingOptions.upload = true;
+const signingOptions: models.SubSigningOptions = {
+  defaultType: models.SubSigningOptions.DefaultTypeEnum.Draw,
+  draw: true,
+  phone: false,
+  type: true,
+  upload: true,
+};
 
-const signers1 = new models.SubSignatureRequestSigner();
-signers1.name = "Jack";
-signers1.emailAddress = "jack@example.com";
-signers1.order = 0;
+const signers1: models.SubSignatureRequestSigner = {
+  name: "Jack",
+  emailAddress: "jack@example.com",
+  order: 0,
+};
 
-const signers2 = new models.SubSignatureRequestSigner();
-signers2.name = "Jill";
-signers2.emailAddress = "jill@example.com";
-signers2.order = 1;
+const signers2: models.SubSignatureRequestSigner = {
+  name: "Jill",
+  emailAddress: "jill@example.com",
+  order: 1,
+};
 
 const signers = [
   signers1,
   signers2,
 ];
 
-const signatureRequestEditRequest = new models.SignatureRequestEditRequest();
-signatureRequestEditRequest.message = "Please sign this NDA and then we can discuss more. Let me know if you\nhave any questions.";
-signatureRequestEditRequest.subject = "The NDA we talked about";
-signatureRequestEditRequest.testMode = true;
-signatureRequestEditRequest.title = "NDA with Acme Co.";
-signatureRequestEditRequest.ccEmailAddresses = [
-  "lawyer1@dropboxsign.com",
-  "lawyer2@dropboxsign.com",
-];
-signatureRequestEditRequest.files = [
-  fs.createReadStream("./example_signature_request.pdf"),
-];
-signatureRequestEditRequest.metadata =   {
-  "custom_id": 1234,
-  "custom_text": "NDA #9"
+const signatureRequestEditRequest: models.SignatureRequestEditRequest = {
+  message: "Please sign this NDA and then we can discuss more. Let me know if you\nhave any questions.",
+  subject: "The NDA we talked about",
+  testMode: true,
+  title: "NDA with Acme Co.",
+  ccEmailAddresses: [
+    "lawyer1@dropboxsign.com",
+    "lawyer2@dropboxsign.com",
+  ],
+  files: [
+    fs.createReadStream("./example_signature_request.pdf"),
+  ],
+  metadata: {
+    "custom_id": 1234,
+    "custom_text": "NDA #9"
+  },
+  fieldOptions: fieldOptions,
+  signingOptions: signingOptions,
+  signers: signers,
 };
-signatureRequestEditRequest.fieldOptions = fieldOptions;
-signatureRequestEditRequest.signingOptions = signingOptions;
-signatureRequestEditRequest.signers = signers;
 
 apiCaller.signatureRequestEdit(
   "fa5c8a0b0f492d768749333ad6fcc214c111e967", // signatureRequestId
@@ -621,43 +649,47 @@ const apiCaller = new api.SignatureRequestApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const signingOptions = new models.SubSigningOptions();
-signingOptions.defaultType = models.SubSigningOptions.DefaultTypeEnum.Draw;
-signingOptions.draw = true;
-signingOptions.phone = false;
-signingOptions.type = true;
-signingOptions.upload = true;
+const signingOptions: models.SubSigningOptions = {
+  defaultType: models.SubSigningOptions.DefaultTypeEnum.Draw,
+  draw: true,
+  phone: false,
+  type: true,
+  upload: true,
+};
 
-const signers1 = new models.SubSignatureRequestSigner();
-signers1.name = "Jack";
-signers1.emailAddress = "jack@example.com";
-signers1.order = 0;
+const signers1: models.SubSignatureRequestSigner = {
+  name: "Jack",
+  emailAddress: "jack@example.com",
+  order: 0,
+};
 
-const signers2 = new models.SubSignatureRequestSigner();
-signers2.name = "Jill";
-signers2.emailAddress = "jill@example.com";
-signers2.order = 1;
+const signers2: models.SubSignatureRequestSigner = {
+  name: "Jill",
+  emailAddress: "jill@example.com",
+  order: 1,
+};
 
 const signers = [
   signers1,
   signers2,
 ];
 
-const signatureRequestEditEmbeddedRequest = new models.SignatureRequestEditEmbeddedRequest();
-signatureRequestEditEmbeddedRequest.clientId = "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a";
-signatureRequestEditEmbeddedRequest.message = "Please sign this NDA and then we can discuss more. Let me know if you\nhave any questions.";
-signatureRequestEditEmbeddedRequest.subject = "The NDA we talked about";
-signatureRequestEditEmbeddedRequest.testMode = true;
-signatureRequestEditEmbeddedRequest.title = "NDA with Acme Co.";
-signatureRequestEditEmbeddedRequest.ccEmailAddresses = [
-  "lawyer1@dropboxsign.com",
-  "lawyer2@dropboxsign.com",
-];
-signatureRequestEditEmbeddedRequest.files = [
-  fs.createReadStream("./example_signature_request.pdf"),
-];
-signatureRequestEditEmbeddedRequest.signingOptions = signingOptions;
-signatureRequestEditEmbeddedRequest.signers = signers;
+const signatureRequestEditEmbeddedRequest: models.SignatureRequestEditEmbeddedRequest = {
+  clientId: "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a",
+  message: "Please sign this NDA and then we can discuss more. Let me know if you\nhave any questions.",
+  subject: "The NDA we talked about",
+  testMode: true,
+  title: "NDA with Acme Co.",
+  ccEmailAddresses: [
+    "lawyer1@dropboxsign.com",
+    "lawyer2@dropboxsign.com",
+  ],
+  files: [
+    fs.createReadStream("./example_signature_request.pdf"),
+  ],
+  signingOptions: signingOptions,
+  signers: signers,
+};
 
 apiCaller.signatureRequestEditEmbedded(
   "fa5c8a0b0f492d768749333ad6fcc214c111e967", // signatureRequestId
@@ -716,32 +748,35 @@ const apiCaller = new api.SignatureRequestApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const signingOptions = new models.SubSigningOptions();
-signingOptions.defaultType = models.SubSigningOptions.DefaultTypeEnum.Draw;
-signingOptions.draw = true;
-signingOptions.phone = false;
-signingOptions.type = true;
-signingOptions.upload = true;
+const signingOptions: models.SubSigningOptions = {
+  defaultType: models.SubSigningOptions.DefaultTypeEnum.Draw,
+  draw: true,
+  phone: false,
+  type: true,
+  upload: true,
+};
 
-const signers1 = new models.SubSignatureRequestTemplateSigner();
-signers1.role = "Client";
-signers1.name = "George";
-signers1.emailAddress = "george@example.com";
+const signers1: models.SubSignatureRequestTemplateSigner = {
+  role: "Client",
+  name: "George",
+  emailAddress: "george@example.com",
+};
 
 const signers = [
   signers1,
 ];
 
-const signatureRequestEditEmbeddedWithTemplateRequest = new models.SignatureRequestEditEmbeddedWithTemplateRequest();
-signatureRequestEditEmbeddedWithTemplateRequest.clientId = "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a";
-signatureRequestEditEmbeddedWithTemplateRequest.templateIds = [
-  "c26b8a16784a872da37ea946b9ddec7c1e11dff6",
-];
-signatureRequestEditEmbeddedWithTemplateRequest.message = "Glad we could come to an agreement.";
-signatureRequestEditEmbeddedWithTemplateRequest.subject = "Purchase Order";
-signatureRequestEditEmbeddedWithTemplateRequest.testMode = true;
-signatureRequestEditEmbeddedWithTemplateRequest.signingOptions = signingOptions;
-signatureRequestEditEmbeddedWithTemplateRequest.signers = signers;
+const signatureRequestEditEmbeddedWithTemplateRequest: models.SignatureRequestEditEmbeddedWithTemplateRequest = {
+  clientId: "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a",
+  templateIds: [
+    "c26b8a16784a872da37ea946b9ddec7c1e11dff6",
+  ],
+  message: "Glad we could come to an agreement.",
+  subject: "Purchase Order",
+  testMode: true,
+  signingOptions: signingOptions,
+  signers: signers,
+};
 
 apiCaller.signatureRequestEditEmbeddedWithTemplate(
   "fa5c8a0b0f492d768749333ad6fcc214c111e967", // signatureRequestId
@@ -800,51 +835,56 @@ const apiCaller = new api.SignatureRequestApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const signingOptions = new models.SubSigningOptions();
-signingOptions.defaultType = models.SubSigningOptions.DefaultTypeEnum.Draw;
-signingOptions.draw = true;
-signingOptions.phone = false;
-signingOptions.type = true;
-signingOptions.upload = true;
+const signingOptions: models.SubSigningOptions = {
+  defaultType: models.SubSigningOptions.DefaultTypeEnum.Draw,
+  draw: true,
+  phone: false,
+  type: true,
+  upload: true,
+};
 
-const signers1 = new models.SubSignatureRequestTemplateSigner();
-signers1.role = "Client";
-signers1.name = "George";
-signers1.emailAddress = "george@example.com";
+const signers1: models.SubSignatureRequestTemplateSigner = {
+  role: "Client",
+  name: "George",
+  emailAddress: "george@example.com",
+};
 
 const signers = [
   signers1,
 ];
 
-const ccs1 = new models.SubCC();
-ccs1.role = "Accounting";
-ccs1.emailAddress = "accounting@example.com";
+const ccs1: models.SubCC = {
+  role: "Accounting",
+  emailAddress: "accounting@example.com",
+};
 
 const ccs = [
   ccs1,
 ];
 
-const customFields1 = new models.SubCustomField();
-customFields1.name = "Cost";
-customFields1.editor = "Client";
-customFields1.required = true;
-customFields1.value = "$20,000";
+const customFields1: models.SubCustomField = {
+  name: "Cost",
+  editor: "Client",
+  required: true,
+  value: "$20,000",
+};
 
 const customFields = [
   customFields1,
 ];
 
-const signatureRequestEditWithTemplateRequest = new models.SignatureRequestEditWithTemplateRequest();
-signatureRequestEditWithTemplateRequest.templateIds = [
-  "61a832ff0d8423f91d503e76bfbcc750f7417c78",
-];
-signatureRequestEditWithTemplateRequest.message = "Glad we could come to an agreement.";
-signatureRequestEditWithTemplateRequest.subject = "Purchase Order";
-signatureRequestEditWithTemplateRequest.testMode = true;
-signatureRequestEditWithTemplateRequest.signingOptions = signingOptions;
-signatureRequestEditWithTemplateRequest.signers = signers;
-signatureRequestEditWithTemplateRequest.ccs = ccs;
-signatureRequestEditWithTemplateRequest.customFields = customFields;
+const signatureRequestEditWithTemplateRequest: models.SignatureRequestEditWithTemplateRequest = {
+  templateIds: [
+    "61a832ff0d8423f91d503e76bfbcc750f7417c78",
+  ],
+  message: "Glad we could come to an agreement.",
+  subject: "Purchase Order",
+  testMode: true,
+  signingOptions: signingOptions,
+  signers: signers,
+  ccs: ccs,
+  customFields: customFields,
+};
 
 apiCaller.signatureRequestEditWithTemplate(
   "fa5c8a0b0f492d768749333ad6fcc214c111e967", // signatureRequestId
@@ -1243,8 +1283,9 @@ const apiCaller = new api.SignatureRequestApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const signatureRequestRemindRequest = new models.SignatureRequestRemindRequest();
-signatureRequestRemindRequest.emailAddress = "john@example.com";
+const signatureRequestRemindRequest: models.SignatureRequestRemindRequest = {
+  emailAddress: "john@example.com",
+};
 
 apiCaller.signatureRequestRemind(
   "fa5c8a0b0f492d768749333ad6fcc214c111e967", // signatureRequestId
@@ -1355,50 +1396,55 @@ const apiCaller = new api.SignatureRequestApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const fieldOptions = new models.SubFieldOptions();
-fieldOptions.dateFormat = models.SubFieldOptions.DateFormatEnum.DD_MM_YYYY;
+const fieldOptions: models.SubFieldOptions = {
+  dateFormat: models.SubFieldOptions.DateFormatEnum.DdMmYyyy,
+};
 
-const signingOptions = new models.SubSigningOptions();
-signingOptions.defaultType = models.SubSigningOptions.DefaultTypeEnum.Draw;
-signingOptions.draw = true;
-signingOptions.phone = false;
-signingOptions.type = true;
-signingOptions.upload = true;
+const signingOptions: models.SubSigningOptions = {
+  defaultType: models.SubSigningOptions.DefaultTypeEnum.Draw,
+  draw: true,
+  phone: false,
+  type: true,
+  upload: true,
+};
 
-const signers1 = new models.SubSignatureRequestSigner();
-signers1.name = "Jack";
-signers1.emailAddress = "jack@example.com";
-signers1.order = 0;
+const signers1: models.SubSignatureRequestSigner = {
+  name: "Jack",
+  emailAddress: "jack@example.com",
+  order: 0,
+};
 
-const signers2 = new models.SubSignatureRequestSigner();
-signers2.name = "Jill";
-signers2.emailAddress = "jill@example.com";
-signers2.order = 1;
+const signers2: models.SubSignatureRequestSigner = {
+  name: "Jill",
+  emailAddress: "jill@example.com",
+  order: 1,
+};
 
 const signers = [
   signers1,
   signers2,
 ];
 
-const signatureRequestSendRequest = new models.SignatureRequestSendRequest();
-signatureRequestSendRequest.message = "Please sign this NDA and then we can discuss more. Let me know if you\nhave any questions.";
-signatureRequestSendRequest.subject = "The NDA we talked about";
-signatureRequestSendRequest.testMode = true;
-signatureRequestSendRequest.title = "NDA with Acme Co.";
-signatureRequestSendRequest.ccEmailAddresses = [
-  "lawyer1@dropboxsign.com",
-  "lawyer2@dropboxsign.com",
-];
-signatureRequestSendRequest.files = [
-  fs.createReadStream("./example_signature_request.pdf"),
-];
-signatureRequestSendRequest.metadata =   {
-  "custom_id": 1234,
-  "custom_text": "NDA #9"
+const signatureRequestSendRequest: models.SignatureRequestSendRequest = {
+  message: "Please sign this NDA and then we can discuss more. Let me know if you\nhave any questions.",
+  subject: "The NDA we talked about",
+  testMode: true,
+  title: "NDA with Acme Co.",
+  ccEmailAddresses: [
+    "lawyer1@dropboxsign.com",
+    "lawyer2@dropboxsign.com",
+  ],
+  files: [
+    fs.createReadStream("./example_signature_request.pdf"),
+  ],
+  metadata: {
+    "custom_id": 1234,
+    "custom_text": "NDA #9"
+  },
+  fieldOptions: fieldOptions,
+  signingOptions: signingOptions,
+  signers: signers,
 };
-signatureRequestSendRequest.fieldOptions = fieldOptions;
-signatureRequestSendRequest.signingOptions = signingOptions;
-signatureRequestSendRequest.signers = signers;
 
 apiCaller.signatureRequestSend(
   signatureRequestSendRequest,
@@ -1455,51 +1501,56 @@ const apiCaller = new api.SignatureRequestApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const signingOptions = new models.SubSigningOptions();
-signingOptions.defaultType = models.SubSigningOptions.DefaultTypeEnum.Draw;
-signingOptions.draw = true;
-signingOptions.phone = false;
-signingOptions.type = true;
-signingOptions.upload = true;
+const signingOptions: models.SubSigningOptions = {
+  defaultType: models.SubSigningOptions.DefaultTypeEnum.Draw,
+  draw: true,
+  phone: false,
+  type: true,
+  upload: true,
+};
 
-const signers1 = new models.SubSignatureRequestTemplateSigner();
-signers1.role = "Client";
-signers1.name = "George";
-signers1.emailAddress = "george@example.com";
+const signers1: models.SubSignatureRequestTemplateSigner = {
+  role: "Client",
+  name: "George",
+  emailAddress: "george@example.com",
+};
 
 const signers = [
   signers1,
 ];
 
-const ccs1 = new models.SubCC();
-ccs1.role = "Accounting";
-ccs1.emailAddress = "accounting@example.com";
+const ccs1: models.SubCC = {
+  role: "Accounting",
+  emailAddress: "accounting@example.com",
+};
 
 const ccs = [
   ccs1,
 ];
 
-const customFields1 = new models.SubCustomField();
-customFields1.name = "Cost";
-customFields1.editor = "Client";
-customFields1.required = true;
-customFields1.value = "$20,000";
+const customFields1: models.SubCustomField = {
+  name: "Cost",
+  editor: "Client",
+  required: true,
+  value: "$20,000",
+};
 
 const customFields = [
   customFields1,
 ];
 
-const signatureRequestSendWithTemplateRequest = new models.SignatureRequestSendWithTemplateRequest();
-signatureRequestSendWithTemplateRequest.templateIds = [
-  "61a832ff0d8423f91d503e76bfbcc750f7417c78",
-];
-signatureRequestSendWithTemplateRequest.message = "Glad we could come to an agreement.";
-signatureRequestSendWithTemplateRequest.subject = "Purchase Order";
-signatureRequestSendWithTemplateRequest.testMode = true;
-signatureRequestSendWithTemplateRequest.signingOptions = signingOptions;
-signatureRequestSendWithTemplateRequest.signers = signers;
-signatureRequestSendWithTemplateRequest.ccs = ccs;
-signatureRequestSendWithTemplateRequest.customFields = customFields;
+const signatureRequestSendWithTemplateRequest: models.SignatureRequestSendWithTemplateRequest = {
+  templateIds: [
+    "61a832ff0d8423f91d503e76bfbcc750f7417c78",
+  ],
+  message: "Glad we could come to an agreement.",
+  subject: "Purchase Order",
+  testMode: true,
+  signingOptions: signingOptions,
+  signers: signers,
+  ccs: ccs,
+  customFields: customFields,
+};
 
 apiCaller.signatureRequestSendWithTemplate(
   signatureRequestSendWithTemplateRequest,
@@ -1556,9 +1607,10 @@ const apiCaller = new api.SignatureRequestApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const signatureRequestUpdateRequest = new models.SignatureRequestUpdateRequest();
-signatureRequestUpdateRequest.signatureId = "2f9781e1a8e2045224d808c153c2e1d3df6f8f2f";
-signatureRequestUpdateRequest.emailAddress = "john@example.com";
+const signatureRequestUpdateRequest: models.SignatureRequestUpdateRequest = {
+  signatureId: "2f9781e1a8e2045224d808c153c2e1d3df6f8f2f",
+  emailAddress: "john@example.com",
+};
 
 apiCaller.signatureRequestUpdate(
   "fa5c8a0b0f492d768749333ad6fcc214c111e967", // signatureRequestId
diff --git a/sdks/node/docs/api/TeamApi.md b/sdks/node/docs/api/TeamApi.md
index 944e03b99..959d4cc46 100644
--- a/sdks/node/docs/api/TeamApi.md
+++ b/sdks/node/docs/api/TeamApi.md
@@ -37,8 +37,9 @@ const apiCaller = new api.TeamApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const teamAddMemberRequest = new models.TeamAddMemberRequest();
-teamAddMemberRequest.emailAddress = "george@example.com";
+const teamAddMemberRequest: models.TeamAddMemberRequest = {
+  emailAddress: "george@example.com",
+};
 
 apiCaller.teamAddMember(
   teamAddMemberRequest,
@@ -97,8 +98,9 @@ const apiCaller = new api.TeamApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const teamCreateRequest = new models.TeamCreateRequest();
-teamCreateRequest.name = "New Team Name";
+const teamCreateRequest: models.TeamCreateRequest = {
+  name: "New Team Name",
+};
 
 apiCaller.teamCreate(
   teamCreateRequest,
@@ -422,9 +424,10 @@ const apiCaller = new api.TeamApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const teamRemoveMemberRequest = new models.TeamRemoveMemberRequest();
-teamRemoveMemberRequest.emailAddress = "teammate@dropboxsign.com";
-teamRemoveMemberRequest.newOwnerEmailAddress = "new_teammate@dropboxsign.com";
+const teamRemoveMemberRequest: models.TeamRemoveMemberRequest = {
+  emailAddress: "teammate@dropboxsign.com",
+  newOwnerEmailAddress: "new_teammate@dropboxsign.com",
+};
 
 apiCaller.teamRemoveMember(
   teamRemoveMemberRequest,
@@ -540,8 +543,9 @@ const apiCaller = new api.TeamApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const teamUpdateRequest = new models.TeamUpdateRequest();
-teamUpdateRequest.name = "New Team Name";
+const teamUpdateRequest: models.TeamUpdateRequest = {
+  name: "New Team Name",
+};
 
 apiCaller.teamUpdate(
   teamUpdateRequest,
diff --git a/sdks/node/docs/api/TemplateApi.md b/sdks/node/docs/api/TemplateApi.md
index 1ad876d80..d86551c72 100644
--- a/sdks/node/docs/api/TemplateApi.md
+++ b/sdks/node/docs/api/TemplateApi.md
@@ -38,8 +38,9 @@ const apiCaller = new api.TemplateApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const templateAddUserRequest = new models.TemplateAddUserRequest();
-templateAddUserRequest.emailAddress = "george@dropboxsign.com";
+const templateAddUserRequest: models.TemplateAddUserRequest = {
+  emailAddress: "george@dropboxsign.com",
+};
 
 apiCaller.templateAddUser(
   "f57db65d3f933b5316d398057a36176831451a35", // templateId
@@ -98,84 +99,92 @@ const apiCaller = new api.TemplateApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const fieldOptions = new models.SubFieldOptions();
-fieldOptions.dateFormat = models.SubFieldOptions.DateFormatEnum.DD_MM_YYYY;
+const fieldOptions: models.SubFieldOptions = {
+  dateFormat: models.SubFieldOptions.DateFormatEnum.DdMmYyyy,
+};
 
-const signerRoles1 = new models.SubTemplateRole();
-signerRoles1.name = "Client";
-signerRoles1.order = 0;
+const signerRoles1: models.SubTemplateRole = {
+  name: "Client",
+  order: 0,
+};
 
-const signerRoles2 = new models.SubTemplateRole();
-signerRoles2.name = "Witness";
-signerRoles2.order = 1;
+const signerRoles2: models.SubTemplateRole = {
+  name: "Witness",
+  order: 1,
+};
 
 const signerRoles = [
   signerRoles1,
   signerRoles2,
 ];
 
-const formFieldsPerDocument1 = new models.SubFormFieldsPerDocumentText();
-formFieldsPerDocument1.documentIndex = 0;
-formFieldsPerDocument1.apiId = "uniqueIdHere_1";
-formFieldsPerDocument1.type = "text";
-formFieldsPerDocument1.required = true;
-formFieldsPerDocument1.signer = "1";
-formFieldsPerDocument1.width = 100;
-formFieldsPerDocument1.height = 16;
-formFieldsPerDocument1.x = 112;
-formFieldsPerDocument1.y = 328;
-formFieldsPerDocument1.name = "";
-formFieldsPerDocument1.page = 1;
-formFieldsPerDocument1.placeholder = "";
-formFieldsPerDocument1.validationType = models.SubFormFieldsPerDocumentText.ValidationTypeEnum.NumbersOnly;
-
-const formFieldsPerDocument2 = new models.SubFormFieldsPerDocumentSignature();
-formFieldsPerDocument2.documentIndex = 0;
-formFieldsPerDocument2.apiId = "uniqueIdHere_2";
-formFieldsPerDocument2.type = "signature";
-formFieldsPerDocument2.required = true;
-formFieldsPerDocument2.signer = "0";
-formFieldsPerDocument2.width = 120;
-formFieldsPerDocument2.height = 30;
-formFieldsPerDocument2.x = 530;
-formFieldsPerDocument2.y = 415;
-formFieldsPerDocument2.name = "";
-formFieldsPerDocument2.page = 1;
+const formFieldsPerDocument1: models.SubFormFieldsPerDocumentText = {
+  documentIndex: 0,
+  apiId: "uniqueIdHere_1",
+  type: "text",
+  required: true,
+  signer: "1",
+  width: 100,
+  height: 16,
+  x: 112,
+  y: 328,
+  name: "",
+  page: 1,
+  placeholder: "",
+  validationType: models.SubFormFieldsPerDocumentText.ValidationTypeEnum.NumbersOnly,
+};
+
+const formFieldsPerDocument2: models.SubFormFieldsPerDocumentSignature = {
+  documentIndex: 0,
+  apiId: "uniqueIdHere_2",
+  type: "signature",
+  required: true,
+  signer: "0",
+  width: 120,
+  height: 30,
+  x: 530,
+  y: 415,
+  name: "",
+  page: 1,
+};
 
 const formFieldsPerDocument = [
   formFieldsPerDocument1,
   formFieldsPerDocument2,
 ];
 
-const mergeFields1 = new models.SubMergeField();
-mergeFields1.name = "Full Name";
-mergeFields1.type = models.SubMergeField.TypeEnum.Text;
+const mergeFields1: models.SubMergeField = {
+  name: "Full Name",
+  type: models.SubMergeField.TypeEnum.Text,
+};
 
-const mergeFields2 = new models.SubMergeField();
-mergeFields2.name = "Is Registered?";
-mergeFields2.type = models.SubMergeField.TypeEnum.Checkbox;
+const mergeFields2: models.SubMergeField = {
+  name: "Is Registered?",
+  type: models.SubMergeField.TypeEnum.Checkbox,
+};
 
 const mergeFields = [
   mergeFields1,
   mergeFields2,
 ];
 
-const templateCreateRequest = new models.TemplateCreateRequest();
-templateCreateRequest.clientId = "37dee8d8440c66d54cfa05d92c160882";
-templateCreateRequest.message = "For your approval";
-templateCreateRequest.subject = "Please sign this document";
-templateCreateRequest.testMode = true;
-templateCreateRequest.title = "Test Template";
-templateCreateRequest.ccRoles = [
-  "Manager",
-];
-templateCreateRequest.files = [
-  fs.createReadStream("./example_signature_request.pdf"),
-];
-templateCreateRequest.fieldOptions = fieldOptions;
-templateCreateRequest.signerRoles = signerRoles;
-templateCreateRequest.formFieldsPerDocument = formFieldsPerDocument;
-templateCreateRequest.mergeFields = mergeFields;
+const templateCreateRequest: models.TemplateCreateRequest = {
+  clientId: "37dee8d8440c66d54cfa05d92c160882",
+  message: "For your approval",
+  subject: "Please sign this document",
+  testMode: true,
+  title: "Test Template",
+  ccRoles: [
+    "Manager",
+  ],
+  files: [
+    fs.createReadStream("./example_signature_request.pdf"),
+  ],
+  fieldOptions: fieldOptions,
+  signerRoles: signerRoles,
+  formFieldsPerDocument: formFieldsPerDocument,
+  mergeFields: mergeFields,
+};
 
 apiCaller.templateCreate(
   templateCreateRequest,
@@ -232,50 +241,56 @@ const apiCaller = new api.TemplateApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const fieldOptions = new models.SubFieldOptions();
-fieldOptions.dateFormat = models.SubFieldOptions.DateFormatEnum.DD_MM_YYYY;
+const fieldOptions: models.SubFieldOptions = {
+  dateFormat: models.SubFieldOptions.DateFormatEnum.DdMmYyyy,
+};
 
-const mergeFields1 = new models.SubMergeField();
-mergeFields1.name = "Full Name";
-mergeFields1.type = models.SubMergeField.TypeEnum.Text;
+const mergeFields1: models.SubMergeField = {
+  name: "Full Name",
+  type: models.SubMergeField.TypeEnum.Text,
+};
 
-const mergeFields2 = new models.SubMergeField();
-mergeFields2.name = "Is Registered?";
-mergeFields2.type = models.SubMergeField.TypeEnum.Checkbox;
+const mergeFields2: models.SubMergeField = {
+  name: "Is Registered?",
+  type: models.SubMergeField.TypeEnum.Checkbox,
+};
 
 const mergeFields = [
   mergeFields1,
   mergeFields2,
 ];
 
-const signerRoles1 = new models.SubTemplateRole();
-signerRoles1.name = "Client";
-signerRoles1.order = 0;
+const signerRoles1: models.SubTemplateRole = {
+  name: "Client",
+  order: 0,
+};
 
-const signerRoles2 = new models.SubTemplateRole();
-signerRoles2.name = "Witness";
-signerRoles2.order = 1;
+const signerRoles2: models.SubTemplateRole = {
+  name: "Witness",
+  order: 1,
+};
 
 const signerRoles = [
   signerRoles1,
   signerRoles2,
 ];
 
-const templateCreateEmbeddedDraftRequest = new models.TemplateCreateEmbeddedDraftRequest();
-templateCreateEmbeddedDraftRequest.clientId = "37dee8d8440c66d54cfa05d92c160882";
-templateCreateEmbeddedDraftRequest.message = "For your approval";
-templateCreateEmbeddedDraftRequest.subject = "Please sign this document";
-templateCreateEmbeddedDraftRequest.testMode = true;
-templateCreateEmbeddedDraftRequest.title = "Test Template";
-templateCreateEmbeddedDraftRequest.ccRoles = [
-  "Manager",
-];
-templateCreateEmbeddedDraftRequest.files = [
-  fs.createReadStream("./example_signature_request.pdf"),
-];
-templateCreateEmbeddedDraftRequest.fieldOptions = fieldOptions;
-templateCreateEmbeddedDraftRequest.mergeFields = mergeFields;
-templateCreateEmbeddedDraftRequest.signerRoles = signerRoles;
+const templateCreateEmbeddedDraftRequest: models.TemplateCreateEmbeddedDraftRequest = {
+  clientId: "37dee8d8440c66d54cfa05d92c160882",
+  message: "For your approval",
+  subject: "Please sign this document",
+  testMode: true,
+  title: "Test Template",
+  ccRoles: [
+    "Manager",
+  ],
+  files: [
+    fs.createReadStream("./example_signature_request.pdf"),
+  ],
+  fieldOptions: fieldOptions,
+  mergeFields: mergeFields,
+  signerRoles: signerRoles,
+};
 
 apiCaller.templateCreateEmbeddedDraft(
   templateCreateEmbeddedDraftRequest,
@@ -670,8 +685,9 @@ const apiCaller = new api.TemplateApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const templateRemoveUserRequest = new models.TemplateRemoveUserRequest();
-templateRemoveUserRequest.emailAddress = "george@dropboxsign.com";
+const templateRemoveUserRequest: models.TemplateRemoveUserRequest = {
+  emailAddress: "george@dropboxsign.com",
+};
 
 apiCaller.templateRemoveUser(
   "f57db65d3f933b5316d398057a36176831451a35", // templateId
@@ -730,10 +746,11 @@ const apiCaller = new api.TemplateApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const templateUpdateFilesRequest = new models.TemplateUpdateFilesRequest();
-templateUpdateFilesRequest.files = [
-  fs.createReadStream("./example_signature_request.pdf"),
-];
+const templateUpdateFilesRequest: models.TemplateUpdateFilesRequest = {
+  files: [
+    fs.createReadStream("./example_signature_request.pdf"),
+  ],
+};
 
 apiCaller.templateUpdateFiles(
   "f57db65d3f933b5316d398057a36176831451a35", // templateId
diff --git a/sdks/node/docs/api/UnclaimedDraftApi.md b/sdks/node/docs/api/UnclaimedDraftApi.md
index 330f6f4fa..ef4bb1104 100644
--- a/sdks/node/docs/api/UnclaimedDraftApi.md
+++ b/sdks/node/docs/api/UnclaimedDraftApi.md
@@ -31,22 +31,24 @@ const apiCaller = new api.UnclaimedDraftApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const signers1 = new models.SubUnclaimedDraftSigner();
-signers1.name = "Jack";
-signers1.emailAddress = "jack@example.com";
-signers1.order = 0;
+const signers1: models.SubUnclaimedDraftSigner = {
+  name: "Jack",
+  emailAddress: "jack@example.com",
+  order: 0,
+};
 
 const signers = [
   signers1,
 ];
 
-const unclaimedDraftCreateRequest = new models.UnclaimedDraftCreateRequest();
-unclaimedDraftCreateRequest.type = models.UnclaimedDraftCreateRequest.TypeEnum.RequestSignature;
-unclaimedDraftCreateRequest.testMode = true;
-unclaimedDraftCreateRequest.files = [
-  fs.createReadStream("./example_signature_request.pdf"),
-];
-unclaimedDraftCreateRequest.signers = signers;
+const unclaimedDraftCreateRequest: models.UnclaimedDraftCreateRequest = {
+  type: models.UnclaimedDraftCreateRequest.TypeEnum.RequestSignature,
+  testMode: true,
+  files: [
+    fs.createReadStream("./example_signature_request.pdf"),
+  ],
+  signers: signers,
+};
 
 apiCaller.unclaimedDraftCreate(
   unclaimedDraftCreateRequest,
@@ -103,13 +105,14 @@ const apiCaller = new api.UnclaimedDraftApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const unclaimedDraftCreateEmbeddedRequest = new models.UnclaimedDraftCreateEmbeddedRequest();
-unclaimedDraftCreateEmbeddedRequest.clientId = "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a";
-unclaimedDraftCreateEmbeddedRequest.requesterEmailAddress = "jack@dropboxsign.com";
-unclaimedDraftCreateEmbeddedRequest.testMode = true;
-unclaimedDraftCreateEmbeddedRequest.files = [
-  fs.createReadStream("./example_signature_request.pdf"),
-];
+const unclaimedDraftCreateEmbeddedRequest: models.UnclaimedDraftCreateEmbeddedRequest = {
+  clientId: "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a",
+  requesterEmailAddress: "jack@dropboxsign.com",
+  testMode: true,
+  files: [
+    fs.createReadStream("./example_signature_request.pdf"),
+  ],
+};
 
 apiCaller.unclaimedDraftCreateEmbedded(
   unclaimedDraftCreateEmbeddedRequest,
@@ -166,32 +169,35 @@ const apiCaller = new api.UnclaimedDraftApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const ccs1 = new models.SubCC();
-ccs1.role = "Accounting";
-ccs1.emailAddress = "accounting@dropboxsign.com";
+const ccs1: models.SubCC = {
+  role: "Accounting",
+  emailAddress: "accounting@dropboxsign.com",
+};
 
 const ccs = [
   ccs1,
 ];
 
-const signers1 = new models.SubUnclaimedDraftTemplateSigner();
-signers1.role = "Client";
-signers1.name = "George";
-signers1.emailAddress = "george@example.com";
+const signers1: models.SubUnclaimedDraftTemplateSigner = {
+  role: "Client",
+  name: "George",
+  emailAddress: "george@example.com",
+};
 
 const signers = [
   signers1,
 ];
 
-const unclaimedDraftCreateEmbeddedWithTemplateRequest = new models.UnclaimedDraftCreateEmbeddedWithTemplateRequest();
-unclaimedDraftCreateEmbeddedWithTemplateRequest.clientId = "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a";
-unclaimedDraftCreateEmbeddedWithTemplateRequest.requesterEmailAddress = "jack@dropboxsign.com";
-unclaimedDraftCreateEmbeddedWithTemplateRequest.templateIds = [
-  "61a832ff0d8423f91d503e76bfbcc750f7417c78",
-];
-unclaimedDraftCreateEmbeddedWithTemplateRequest.testMode = false;
-unclaimedDraftCreateEmbeddedWithTemplateRequest.ccs = ccs;
-unclaimedDraftCreateEmbeddedWithTemplateRequest.signers = signers;
+const unclaimedDraftCreateEmbeddedWithTemplateRequest: models.UnclaimedDraftCreateEmbeddedWithTemplateRequest = {
+  clientId: "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a",
+  requesterEmailAddress: "jack@dropboxsign.com",
+  templateIds: [
+    "61a832ff0d8423f91d503e76bfbcc750f7417c78",
+  ],
+  testMode: false,
+  ccs: ccs,
+  signers: signers,
+};
 
 apiCaller.unclaimedDraftCreateEmbeddedWithTemplate(
   unclaimedDraftCreateEmbeddedWithTemplateRequest,
@@ -248,9 +254,10 @@ const apiCaller = new api.UnclaimedDraftApi();
 apiCaller.username = "YOUR_API_KEY";
 // apiCaller.accessToken = "YOUR_ACCESS_TOKEN";
 
-const unclaimedDraftEditAndResendRequest = new models.UnclaimedDraftEditAndResendRequest();
-unclaimedDraftEditAndResendRequest.clientId = "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a";
-unclaimedDraftEditAndResendRequest.testMode = false;
+const unclaimedDraftEditAndResendRequest: models.UnclaimedDraftEditAndResendRequest = {
+  clientId: "b6b8e7deaf8f0b95c029dca049356d4a2cf9710a",
+  testMode: false,
+};
 
 apiCaller.unclaimedDraftEditAndResend(
   "fa5c8a0b0f492d768749333ad6fcc214c111e967", // signatureRequestId
diff --git a/sdks/php/docs/Api/FaxLineApi.md b/sdks/php/docs/Api/FaxLineApi.md
index 234a18e69..123fd3c96 100644
--- a/sdks/php/docs/Api/FaxLineApi.md
+++ b/sdks/php/docs/Api/FaxLineApi.md
@@ -103,9 +103,6 @@ $config->setUsername("YOUR_API_KEY");
 try {
     $response = (new Dropbox\Sign\Api\FaxLineApi(config: $config))->faxLineAreaCodeGet(
         country: "US",
-        state: null,
-        province: null,
-        city: null,
     );
 
     print_r($response);
@@ -352,7 +349,6 @@ try {
         account_id: "ab55cd14a97219e36b5ff5fe23f2f9329b0c1e97",
         page: 1,
         page_size: 20,
-        show_team_lines: null,
     );
 
     print_r($response);
diff --git a/sdks/php/docs/Api/SignatureRequestApi.md b/sdks/php/docs/Api/SignatureRequestApi.md
index 7f1c6ec49..72acdccb9 100644
--- a/sdks/php/docs/Api/SignatureRequestApi.md
+++ b/sdks/php/docs/Api/SignatureRequestApi.md
@@ -871,7 +871,7 @@ $custom_fields_1 = (new Dropbox\Sign\Model\SubCustomField())
     ->setName("Cost")
     ->setEditor("Client")
     ->setRequired(true)
-    ->setValue('$20,000');
+    ->setValue("\$20,000");
 
 $custom_fields = [
     $custom_fields_1,
@@ -1197,10 +1197,8 @@ $config->setUsername("YOUR_API_KEY");
 
 try {
     $response = (new Dropbox\Sign\Api\SignatureRequestApi(config: $config))->signatureRequestList(
-        account_id: null,
         page: 1,
         page_size: 20,
-        query: null,
     );
 
     print_r($response);
@@ -1577,7 +1575,7 @@ $custom_fields_1 = (new Dropbox\Sign\Model\SubCustomField())
     ->setName("Cost")
     ->setEditor("Client")
     ->setRequired(true)
-    ->setValue('$20,000');
+    ->setValue("\$20,000");
 
 $custom_fields = [
     $custom_fields_1,
diff --git a/sdks/php/docs/Api/TemplateApi.md b/sdks/php/docs/Api/TemplateApi.md
index 296d8394f..23d1d5a98 100644
--- a/sdks/php/docs/Api/TemplateApi.md
+++ b/sdks/php/docs/Api/TemplateApi.md
@@ -410,7 +410,6 @@ $config->setUsername("YOUR_API_KEY");
 try {
     $response = (new Dropbox\Sign\Api\TemplateApi(config: $config))->templateFiles(
         template_id: "f57db65d3f933b5316d398057a36176831451a35",
-        file_type: null,
     );
 
     copy($response->getRealPath(), __DIR__ . '/file_response');
@@ -653,10 +652,8 @@ $config->setUsername("YOUR_API_KEY");
 
 try {
     $response = (new Dropbox\Sign\Api\TemplateApi(config: $config))->templateList(
-        account_id: null,
         page: 1,
         page_size: 20,
-        query: null,
     );
 
     print_r($response);
diff --git a/sdks/python/docs/FaxLineApi.md b/sdks/python/docs/FaxLineApi.md
index e83991cd2..4f1b2a4a4 100644
--- a/sdks/python/docs/FaxLineApi.md
+++ b/sdks/python/docs/FaxLineApi.md
@@ -106,9 +106,6 @@ with ApiClient(configuration) as api_client:
     try:
         response = api.FaxLineApi(api_client).fax_line_area_code_get(
             country="US",
-            state=None,
-            province=None,
-            city=None,
         )
 
         pprint(response)
@@ -369,7 +366,6 @@ with ApiClient(configuration) as api_client:
             account_id="ab55cd14a97219e36b5ff5fe23f2f9329b0c1e97",
             page=1,
             page_size=20,
-            show_team_lines=None,
         )
 
         pprint(response)
diff --git a/sdks/python/docs/SignatureRequestApi.md b/sdks/python/docs/SignatureRequestApi.md
index 764ba2adf..5bae70801 100644
--- a/sdks/python/docs/SignatureRequestApi.md
+++ b/sdks/python/docs/SignatureRequestApi.md
@@ -1381,10 +1381,8 @@ configuration = Configuration(
 with ApiClient(configuration) as api_client:
     try:
         response = api.SignatureRequestApi(api_client).signature_request_list(
-            account_id=None,
             page=1,
             page_size=20,
-            query=None,
         )
 
         pprint(response)
diff --git a/sdks/python/docs/TemplateApi.md b/sdks/python/docs/TemplateApi.md
index a36ef9c8a..5ff5a44c8 100644
--- a/sdks/python/docs/TemplateApi.md
+++ b/sdks/python/docs/TemplateApi.md
@@ -448,7 +448,6 @@ with ApiClient(configuration) as api_client:
     try:
         response = api.TemplateApi(api_client).template_files(
             template_id="f57db65d3f933b5316d398057a36176831451a35",
-            file_type=None,
         )
 
         open("./file_response", "wb").write(response.read())
@@ -713,10 +712,8 @@ configuration = Configuration(
 with ApiClient(configuration) as api_client:
     try:
         response = api.TemplateApi(api_client).template_list(
-            account_id=None,
             page=1,
             page_size=20,
-            query=None,
         )
 
         pprint(response)